mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-11-06 10:16:44 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
390a784086
|
|
@ -5144,6 +5144,12 @@
|
|||
githubId = 117874;
|
||||
name = "Jeroen de Haas";
|
||||
};
|
||||
jdreaver = {
|
||||
email = "johndreaver@gmail.com";
|
||||
github = "jdreaver";
|
||||
githubId = 1253071;
|
||||
name = "David Reaver";
|
||||
};
|
||||
jduan = {
|
||||
name = "Jingjing Duan";
|
||||
email = "duanjingjing@gmail.com";
|
||||
|
|
|
|||
|
|
@ -269,6 +269,14 @@
|
|||
<link linkend="opt-services.postfixadmin.enable">postfixadmin</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://wiki.servarr.com/prowlarr">prowlarr</link>,
|
||||
an indexer manager/proxy built on the popular arr .net/reactjs
|
||||
base stack
|
||||
<link linkend="opt-services.prowlarr.enable">services.prowlarr</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://sr.ht/~emersion/soju">soju</link>, a
|
||||
|
|
|
|||
|
|
@ -82,6 +82,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- [postfixadmin](https://postfixadmin.sourceforge.io/), a web based virtual user administration interface for Postfix mail servers. Available as [postfixadmin](#opt-services.postfixadmin.enable).
|
||||
|
||||
- [prowlarr](https://wiki.servarr.com/prowlarr), an indexer manager/proxy built on the popular arr .net/reactjs base stack [services.prowlarr](#opt-services.prowlarr.enable).
|
||||
|
||||
- [soju](https://sr.ht/~emersion/soju), a user-friendly IRC bouncer. Available as [services.soju](options.html#opt-services.soju.enable).
|
||||
|
||||
- [nats](https://nats.io/), a high performance cloud and edge messaging system. Available as [services.nats](#opt-services.nats.enable).
|
||||
|
|
|
|||
|
|
@ -571,6 +571,7 @@
|
|||
./services/misc/plex.nix
|
||||
./services/misc/plikd.nix
|
||||
./services/misc/podgrab.nix
|
||||
./services/misc/prowlarr.nix
|
||||
./services/misc/tautulli.nix
|
||||
./services/misc/pinnwand.nix
|
||||
./services/misc/pykms.nix
|
||||
|
|
|
|||
|
|
@ -79,6 +79,7 @@ with lib;
|
|||
The hidepid module was removed, since the underlying machinery
|
||||
is broken when using cgroups-v2.
|
||||
'')
|
||||
(mkRemovedOptionModule ["services" "wakeonlan"] "This module was removed in favor of enabling it with networking.interfaces.<name>.wakeOnLan")
|
||||
|
||||
# Do NOT add any option renames here, see top of the file
|
||||
];
|
||||
|
|
|
|||
41
nixos/modules/services/misc/prowlarr.nix
Normal file
41
nixos/modules/services/misc/prowlarr.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prowlarr;
|
||||
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.prowlarr = {
|
||||
enable = mkEnableOption "Prowlarr";
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Open ports in the firewall for the Prowlarr web interface.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.prowlarr = {
|
||||
description = "Prowlarr";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
DynamicUser = true;
|
||||
StateDirectory = "prowlarr";
|
||||
ExecStart = "${pkgs.prowlarr}/bin/Prowlarr -nobrowser -data=/var/lib/prowlarr";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ 9696 ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -375,6 +375,7 @@ in
|
|||
prosody = handleTest ./xmpp/prosody.nix {};
|
||||
prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {};
|
||||
proxy = handleTest ./proxy.nix {};
|
||||
prowlarr = handleTest ./prowlarr.nix {};
|
||||
pt2-clone = handleTest ./pt2-clone.nix {};
|
||||
qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {};
|
||||
quorum = handleTest ./quorum.nix {};
|
||||
|
|
|
|||
18
nixos/tests/prowlarr.nix
Normal file
18
nixos/tests/prowlarr.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
import ./make-test-python.nix ({ lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
name = "prowlarr";
|
||||
meta.maintainers = with maintainers; [ jdreaver ];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{ services.prowlarr.enable = true; };
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("prowlarr.service")
|
||||
machine.wait_for_open_port("9696")
|
||||
machine.succeed("curl --fail http://localhost:9696/")
|
||||
'';
|
||||
})
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version;
|
||||
version = "1.14.3";
|
||||
version = "1.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dogecoin";
|
||||
repo = "dogecoin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kozUnIislQDtgjeesYHKu4sB1j9juqaWvyax+Lb/0pc=";
|
||||
sha256 = "sha256-uITX5DSyC/m0ynwCkkbGgUj8kMuNgnsNo8H8RQSGPEA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -31,22 +31,22 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "96.0.4655.0",
|
||||
"sha256": "00gax7xqi1n4jiqwpff43c43mpqb5jakckwdfbgwhrp6h35xxdv1",
|
||||
"sha256bin64": "1xyyz6p4qllzyd6wbdbhs6kp062dz40i03wrlsggb919bgp7ivnw",
|
||||
"version": "96.0.4662.6",
|
||||
"sha256": "14vr0nlp195h0hwfsd43fifl9r3qr875fw2da3gi9l5yi0pxns2q",
|
||||
"sha256bin64": "1lq114rsgxqrdh18f2x3i0iwdn5ijxw3jb6nrxjxx0c3bvlzhsw8",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-09-13",
|
||||
"version": "2021-09-24",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "de86ec4176235871a7cb335756987e41246dae4a",
|
||||
"sha256": "0mlnsqcj06azz5cpwlafi5gg6pvf2s6x9qq02zl1sm2h288y152g"
|
||||
"rev": "0153d369bbccc908f4da4993b1ba82728055926a",
|
||||
"sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "94.0.4606.71",
|
||||
"sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya",
|
||||
"sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4",
|
||||
"version": "94.0.4606.81",
|
||||
"sha256": "16755mfqxxmvslm9ix060safrnml91ckj5p85960jj5g5hmslwbh",
|
||||
"sha256bin64": "1d3z5np6b6jax7afak7f0yh76kmmdggdjlrzwyhy8hgrv7c7rsdz",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-08-11",
|
||||
|
|
@ -55,8 +55,8 @@
|
|||
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "94.0.4606.71-1",
|
||||
"sha256": "12p39ay8lmdni6gnmw3w67pg4w3nrphhgn6bmz3cr6cy7nx4kiv2"
|
||||
"rev": "94.0.4606.81-1",
|
||||
"sha256": "113abybh8kkw9a92lj6jww6dl6rc1sv5x7a7a1gjwsihzd2r0cik"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2021.9.1";
|
||||
version = "2021.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
sha256 = "sha256-VekJq7d80hD8AybkpLq4+9yeeBkeLATr2iG5OFU/TFs=";
|
||||
sha256 = "sha256-UAx3DY8d3I1g7DuNmBu4w+3NGUQqDdcScXdtq/VkpJ8=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hackrf";
|
||||
version = "2018.01.1";
|
||||
version = "2021.03.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mossmann";
|
||||
owner = "greatscottgadgets";
|
||||
repo = "hackrf";
|
||||
rev = "v${version}";
|
||||
sha256 = "0idh983xh6gndk9kdgx5nzz76x3mxb42b02c5xvdqahadsfx3b9w";
|
||||
sha256 = "sha256-2kEfTco95I9YLz/18nfjJSd7U/HE5sBCEioWL2t804k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
|
|||
cd host
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace host/cmake/modules/FindFFTW.cmake \
|
||||
--replace "find_library (FFTW_LIBRARIES NAMES fftw3)" "find_library (FFTW_LIBRARIES NAMES fftw3f)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source SDR platform";
|
||||
homepage = "https://greatscottgadgets.com/hackrf/";
|
||||
|
|
|
|||
36
pkgs/development/libraries/libjaylink/default.nix
Normal file
36
pkgs/development/libraries/libjaylink/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ fetchFromGitLab, lib, stdenv
|
||||
, autoreconfHook, pkg-config
|
||||
, libusb1
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libjaylink";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.zapb.de";
|
||||
owner = "libjaylink";
|
||||
repo = "libjaylink";
|
||||
rev = version;
|
||||
sha256 = "0ndyfh51hiqyv2yscpj6qd091w7myxxjid3a6rx8f6k233vy826q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs autogen.sh
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 contrib/99-libjaylink.rules $out/lib/udev/rules.d/libjaylink.rules
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.zapb.de/libjaylink/libjaylink";
|
||||
description = "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices.";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ felixsinger ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spdk";
|
||||
version = "21.04";
|
||||
version = "21.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spdk";
|
||||
repo = "spdk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Xmmgojgtt1HwTqG/1ZOJVo1BcdAH0sheu40d73OJ68w=";
|
||||
sha256 = "sha256-/hynuYVdzIfiHUUfuuOY8SBJ18DqJr2Fos2JjQQVvbg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
2
pkgs/development/node-packages/node-packages.nix
generated
2
pkgs/development/node-packages/node-packages.nix
generated
|
|
@ -122512,7 +122512,7 @@ in
|
|||
"vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage {
|
||||
name = "vscode-lldb";
|
||||
packageName = "vscode-lldb";
|
||||
version = "1.6.7";
|
||||
version = "1.6.8";
|
||||
src = ../../misc/vscode-extensions/vscode-lldb/build-deps;
|
||||
dependencies = [
|
||||
sources."@discoveryjs/json-ext-0.5.5"
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
|
||||
let
|
||||
pname = "composer";
|
||||
version = "2.1.8";
|
||||
version = "2.1.9";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://getcomposer.org/download/${version}/composer.phar";
|
||||
sha256 = "141myfivdjnkx8myvkgl2sclhvx9z1c6a1my4xzscx0injhsrf3p";
|
||||
sha256 = "1fj8sq21qdsdidj5zh8s3c12pmf9nkmj36igmmixc5vc2h7bf02d";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-dynamic-preferences";
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e4b2bb7b2563c5064ba56dd76441c77e06b850ff1466a386a1cd308909a6c7de";
|
||||
sha256 = "f214c938b5872a17647e2b2ccfd9ad00a90a3c6c4aa83fa65d3c5c446e7a66c7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six django persisting-theory ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-JWT-Extended";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6e2b40d548b9dfc6051740c4552c097ac38e514e500c16c682d9a533d17ca418";
|
||||
sha256 = "ad6977b07c54e51c13b5981afc246868b9901a46715d9b9827898bfd916aae88";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "furo";
|
||||
version = "2021.9.22";
|
||||
version = "2021.10.9";
|
||||
format = "flit";
|
||||
disable = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-749l6cXyGbIarXXJmiCU0DsWQwrvH1dobOGePyT5VK8=";
|
||||
sha256 = "sha256-K6pCoi7ePm6Vxhgqs2S6wuwVt5vH+cp/sJ/ZrsSzVAw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.0.7";
|
||||
version = "4.0.8";
|
||||
pname = "icalendar";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fc18d87f66e0b5da84fa731389496cfe18e4c21304e8f6713556b2e8724a7a4";
|
||||
sha256 = "7508a92b4e36049777640b0ae393e7219a16488d852841a0e57b44fe51d9f848";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools ];
|
||||
|
|
|
|||
43
pkgs/development/python-modules/limiter/default.nix
Normal file
43
pkgs/development/python-modules/limiter/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, token-bucket
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "limiter";
|
||||
version = "0.1.2";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexdelorenzo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0cdqw08qw3cid1yjknlh4hqfl46xh4madkjrl7sxk2c1pbwils8r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
token-bucket
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "token-bucket==0.2.0" "token-bucket>=0.2.0"
|
||||
'';
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"limiter"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python rate-limiting, thread-safe and asynchronous decorators and context managers";
|
||||
homepage = "https://github.com/alexdelorenzo/limiter";
|
||||
license = with licenses; [ agpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.18.57";
|
||||
version = "1.18.58";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c157008c4111bb18be21428cd1e35a3265fffc58ebcda4a0019120a5e10add89";
|
||||
sha256 = "3e96a40314cd8c61b833f2f198179fb1056935c5349c5b4369432788a30ed098";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nunavut";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7238780e42a8d6b7fd3296273c76d35dbebb4520d6778472d556b68b77e2aade";
|
||||
sha256 = "d0a7cfbb34dd93aff299a5a357f6f259a0a407c0e9136bab8e495a36e3f0846d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyTelegramBotAPI";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c84218af7e08e859e07cfe5645d9586ceaad51c24f0f4529a9ed0adafd5aa0bf";
|
||||
sha256 = "cc8011ca05301653f2e5c2d02eadff0e882b611841a76f9e5b911994899df49e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
|||
50
pkgs/development/python-modules/spyse-python/default.nix
Normal file
50
pkgs/development/python-modules/spyse-python/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, dataclasses-json
|
||||
, fetchFromGitHub
|
||||
, limiter
|
||||
, pythonOlder
|
||||
, requests
|
||||
, responses
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spyse-python";
|
||||
version = "2.2.3";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spyse-com";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "041k0037anwaxp2mh7mdk8rdsw9hdr3arigyyqfxfn35x8j41c3k";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
dataclasses-json
|
||||
responses
|
||||
limiter
|
||||
];
|
||||
|
||||
# Tests requires an API token
|
||||
doCheck = false;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'dataclasses~=0.6'," "" \
|
||||
--replace "responses~=0.13.3" "responses>=0.13.3"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"spyse"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for spyse.com API";
|
||||
homepage = "https://github.com/spyse-com/spyse-python";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "youless-api";
|
||||
version = "0.13";
|
||||
version = "0.14";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "jongsoftdev";
|
||||
repo = "youless-python-bridge";
|
||||
rev = version;
|
||||
sha256 = "sha256-Vywzd8wZG4eI/U69fPYuLpF54zAeuCv3Q81z5UcMGjc=";
|
||||
sha256 = "sha256-ZHDQ+4Urv0ZxKFASsgDG12mpfRiCN2DwU6Rgc9ye5qY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,88 +1,33 @@
|
|||
{ lib, stdenvNoCC, fetchurl, fetchgit,
|
||||
gnumake, patch, zlib, git, bison,
|
||||
flex, gnat11, curl, perl
|
||||
{ callPackage, fetchgit, lib, stdenvNoCC
|
||||
, bison, curl, git, perl
|
||||
, flex, gnat11, zlib
|
||||
}:
|
||||
|
||||
let
|
||||
version_coreboot = "4.14";
|
||||
|
||||
version_gmp = "6.2.0";
|
||||
version_mpfr = "4.1.0";
|
||||
version_mpc = "1.2.0";
|
||||
version_gcc = "8.3.0";
|
||||
version_binutils = "2.35.1";
|
||||
version_acpica = "20200925";
|
||||
version_nasm = "2.15.05";
|
||||
|
||||
tar_name_gmp = "gmp-${version_gmp}.tar.xz";
|
||||
tar_gmp = fetchurl {
|
||||
url = "https://ftpmirror.gnu.org/gmp/${tar_name_gmp}";
|
||||
sha256 = "09hmg8k63mbfrx1x3yy6y1yzbbq85kw5avbibhcgrg9z3ganr3i5";
|
||||
};
|
||||
|
||||
tar_name_mpfr = "mpfr-${version_mpfr}.tar.xz";
|
||||
tar_mpfr = fetchurl {
|
||||
url = "https://ftpmirror.gnu.org/mpfr/${tar_name_mpfr}";
|
||||
sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c";
|
||||
};
|
||||
|
||||
tar_name_mpc = "mpc-${version_mpc}.tar.gz";
|
||||
tar_mpc = fetchurl {
|
||||
url = "https://ftpmirror.gnu.org/mpc/${tar_name_mpc}";
|
||||
sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9";
|
||||
};
|
||||
|
||||
tar_name_gcc = "gcc-${version_gcc}.tar.xz";
|
||||
tar_gcc = fetchurl {
|
||||
url = "https://ftpmirror.gnu.org/gcc/gcc-${version_gcc}/${tar_name_gcc}";
|
||||
sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4";
|
||||
};
|
||||
|
||||
tar_name_binutils = "binutils-${version_binutils}.tar.xz";
|
||||
tar_binutils = fetchurl {
|
||||
url = "https://ftpmirror.gnu.org/binutils/${tar_name_binutils}";
|
||||
sha256 = "01w6xvfy7sjpw8j08k111bnkl27j760bdsi0wjvq44ghkgdr3v9w";
|
||||
};
|
||||
|
||||
tar_name_acpica = "acpica-unix2-${version_acpica}.tar.gz";
|
||||
tar_acpica = fetchurl {
|
||||
url = "https://acpica.org/sites/acpica/files/${tar_name_acpica}";
|
||||
sha256 = "18n6129fkgj85piid7v4zxxksv3h0amqp4p977vcl9xg3bq0zd2w";
|
||||
};
|
||||
|
||||
tar_name_nasm = "nasm-${version_nasm}.tar.bz2";
|
||||
tar_nasm = fetchurl {
|
||||
url = "https://www.nasm.us/pub/nasm/releasebuilds/${version_nasm}/${tar_name_nasm}";
|
||||
sha256 = "1l1gxs5ncdbgz91lsl4y7w5aapask3w02q9inayb2m5bwlwq6jrw";
|
||||
};
|
||||
|
||||
tar_coreboot_name = "coreboot-${version_coreboot}.tar.xz";
|
||||
tar_coreboot = fetchurl {
|
||||
url = "https://coreboot.org/releases/${tar_coreboot_name}";
|
||||
sha256 = "0viw2x4ckjwiylb92w85k06b0g9pmamjy2yqs7fxfqbmfadkf1yr";
|
||||
};
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "coreboot-toolchain";
|
||||
version = version_coreboot;
|
||||
src = tar_coreboot;
|
||||
version = "4.14";
|
||||
|
||||
nativeBuildInputs = [ perl curl gnumake git bison ];
|
||||
src = fetchgit {
|
||||
url = "https://review.coreboot.org/coreboot";
|
||||
rev = "${version}";
|
||||
sha256 = "00xr74yc0kj9rrqa1a8b7bih865qlp9i4zs67ysavkfrjrwwssxm";
|
||||
};
|
||||
|
||||
buildInputs = [ gnat11 flex zlib ];
|
||||
nativeBuildInputs = [ bison curl git perl ];
|
||||
buildInputs = [ flex gnat11 zlib ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
dontConfigure = true;
|
||||
dontInstall = true;
|
||||
|
||||
patchPhase = ''
|
||||
mkdir util/crossgcc/tarballs
|
||||
ln -s ${tar_gmp} util/crossgcc/tarballs/${tar_name_gmp}
|
||||
ln -s ${tar_mpfr} util/crossgcc/tarballs/${tar_name_mpfr}
|
||||
ln -s ${tar_mpc} util/crossgcc/tarballs/${tar_name_mpc}
|
||||
ln -s ${tar_gcc} util/crossgcc/tarballs/${tar_name_gcc}
|
||||
ln -s ${tar_binutils} util/crossgcc/tarballs/${tar_name_binutils}
|
||||
ln -s ${tar_acpica} util/crossgcc/tarballs/${tar_name_acpica}
|
||||
ln -s ${tar_nasm} util/crossgcc/tarballs/${tar_name_nasm}
|
||||
postPatch = ''
|
||||
mkdir -p util/crossgcc/tarballs
|
||||
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}"
|
||||
) (callPackage ./stable.nix { })
|
||||
}
|
||||
|
||||
patchShebangs util/genbuild_h/genbuild_h.sh util/crossgcc/buildgcc
|
||||
'';
|
||||
|
||||
|
|
|
|||
51
pkgs/development/tools/misc/coreboot-toolchain/stable.nix
Normal file
51
pkgs/development/tools/misc/coreboot-toolchain/stable.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ fetchurl }: [
|
||||
{
|
||||
name = "gmp-6.2.0.tar.xz";
|
||||
archive = fetchurl {
|
||||
sha256 = "09hmg8k63mbfrx1x3yy6y1yzbbq85kw5avbibhcgrg9z3ganr3i5";
|
||||
url = "mirror://gnu/gmp/gmp-6.2.0.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "mpfr-4.1.0.tar.xz";
|
||||
archive = fetchurl {
|
||||
sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c";
|
||||
url = "mirror://gnu/mpfr/mpfr-4.1.0.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "mpc-1.2.0.tar.gz";
|
||||
archive = fetchurl {
|
||||
sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9";
|
||||
url = "mirror://gnu/mpc/mpc-1.2.0.tar.gz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "gcc-8.3.0.tar.xz";
|
||||
archive = fetchurl {
|
||||
sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4";
|
||||
url = "mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "binutils-2.35.1.tar.xz";
|
||||
archive = fetchurl {
|
||||
sha256 = "01w6xvfy7sjpw8j08k111bnkl27j760bdsi0wjvq44ghkgdr3v9w";
|
||||
url = "mirror://gnu/binutils/binutils-2.35.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "acpica-unix2-20200925.tar.gz";
|
||||
archive = fetchurl {
|
||||
sha256 = "18n6129fkgj85piid7v4zxxksv3h0amqp4p977vcl9xg3bq0zd2w";
|
||||
url = "https://acpica.org/sites/acpica/files/acpica-unix2-20200925.tar.gz";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "nasm-2.15.05.tar.bz2";
|
||||
archive = fetchurl {
|
||||
sha256 = "1l1gxs5ncdbgz91lsl4y7w5aapask3w02q9inayb2m5bwlwq6jrw";
|
||||
url = "https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.bz2";
|
||||
};
|
||||
}
|
||||
]
|
||||
31
pkgs/development/tools/misc/coreboot-toolchain/update.sh
Executable file
31
pkgs/development/tools/misc/coreboot-toolchain/update.sh
Executable file
|
|
@ -0,0 +1,31 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell --pure -i bash -p nix cacert git getopt
|
||||
|
||||
rootdir="../../../../../"
|
||||
|
||||
src="$(nix-build $rootdir --no-out-link -A coreboot-toolchain.src)"
|
||||
urls=$($src/util/crossgcc/buildgcc -u)
|
||||
|
||||
tmp=$(mktemp)
|
||||
echo '{ fetchurl }: [' > $tmp
|
||||
|
||||
for url in $urls; do
|
||||
name="$(basename $url)"
|
||||
hash="$(nix-prefetch-url "$url")"
|
||||
|
||||
cat << EOF >> $tmp
|
||||
{
|
||||
name = "$name";
|
||||
archive = fetchurl {
|
||||
sha256 = "$hash";
|
||||
url = "$url";
|
||||
};
|
||||
}
|
||||
EOF
|
||||
done
|
||||
|
||||
echo ']' >> $tmp
|
||||
|
||||
sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' $tmp
|
||||
|
||||
mv $tmp sources.nix
|
||||
|
|
@ -89,7 +89,7 @@ function fetchLockedDep(builtinFetchGit) {
|
|||
|
||||
const [_, branch] = nameWithVersion.split('#')
|
||||
|
||||
return fetchgit(fileName, githubUrl, rev, branch || 'master', builtinFetchGit)
|
||||
return fetchgit(fileName, githubUrl, githubRev, branch || 'master', builtinFetchGit)
|
||||
}
|
||||
|
||||
if (url.startsWith('git+') || url.startsWith("git:")) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "vscode-lldb",
|
||||
"version": "1.6.7",
|
||||
"version": "1.6.8",
|
||||
"dependencies": {
|
||||
"string-argv": "^0.3.1",
|
||||
"yaml": "^1.10.0",
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5";
|
|||
let
|
||||
publisher = "vadimcn";
|
||||
pname = "vscode-lldb";
|
||||
version = "1.6.7";
|
||||
version = "1.6.8";
|
||||
|
||||
vscodeExtUniqueId = "${publisher}.${pname}";
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ let
|
|||
owner = "vadimcn";
|
||||
repo = "vscode-lldb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9rqdqpxUWcUV9RnZOTxg+zMW7wlTXZVkoKYHuv/lE7c=";
|
||||
sha256 = "sha256-/2iyWJfNjvk5n7KwWIu2gc24/21KWibU6IAPN/tJ8Q4=";
|
||||
};
|
||||
|
||||
lldb = callPackage ./lldb.nix {};
|
||||
|
|
@ -25,7 +25,7 @@ let
|
|||
# It will pollute the build environment of `buildRustPackage`.
|
||||
cargoPatches = [ ./reset-cargo-config.patch ];
|
||||
|
||||
cargoSha256 = "sha256-KeZpjMCBdOJTLj8pA5WWi3EMyhhWw/+aik4IJqIs/mk=";
|
||||
cargoSha256 = "sha256-rG+Qw8ac9cCgCjfLFXLlohLk+zV5s1OaqzU0/nXiqgU=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -19,17 +19,26 @@ repo=vscode-lldb
|
|||
version="$1"
|
||||
|
||||
sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile"
|
||||
srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version" --fetchSubmodules)
|
||||
srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version")
|
||||
sed -E 's#\bsha256 = ".*?"#sha256 = "'$srcHash'"#' --in-place "$nixFile"
|
||||
cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
|
||||
sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile"
|
||||
|
||||
src="$(nix-build $nixpkgs -A vscode-extensions.vadimcn.vscode-lldb.src --no-out-link)"
|
||||
oldDeps="$(jq '.dependencies' build-deps/package.json)"
|
||||
newDeps="$(jq '.dependencies + .devDependencies' "$src/package.json")"
|
||||
jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies) }' \
|
||||
--arg version "$version" \
|
||||
"$src/package.json" \
|
||||
> build-deps/package.json
|
||||
|
||||
# Regenerate nodePackages.
|
||||
cd "$nixpkgs/pkgs/development/node-packages"
|
||||
exec ./generate.sh
|
||||
if [[ "$oldDeps" == "$newDeps" ]]; then
|
||||
echo "Dependencies not changed"
|
||||
sed '/"vscode-lldb-build-deps-/,+3 s/version = ".*"/version = "'"$version"'"/' \
|
||||
--in-place "$nixpkgs/pkgs/development/node-packages/node-packages.nix"
|
||||
else
|
||||
echo "Dependencies changed"
|
||||
# Regenerate nodePackages.
|
||||
cd "$nixpkgs/pkgs/development/node-packages"
|
||||
exec ./generate.sh
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ let
|
|||
jre = jre11;
|
||||
};
|
||||
"2.8" = {
|
||||
kafkaVersion = "2.8.0";
|
||||
kafkaVersion = "2.8.1";
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "1iljfjlp29m4s6gkja9fxkzj8a8p0qc0sfy8x4g1318kbnp818rz";
|
||||
sha256 = "0fgil47hxdnc374k0p9sxv6b163xknp3pkihv3r99p977czb1228";
|
||||
jre = jre11;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jackett";
|
||||
version = "0.18.582";
|
||||
version = "0.18.925";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
|
||||
sha256 = "sha256-WwTeUvBD790CP+mph2xKm/m7csYQgmXgJa4TLn5nsVI=";
|
||||
sha256 = "1md0iy6sx0agsnvrj9m7bq1lvp5z34x7zv3pvwy4zw8b46w97mnz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
61
pkgs/servers/prowlarr/default.nix
Normal file
61
pkgs/servers/prowlarr/default.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnetCorePackages, openssl, nixosTests }:
|
||||
|
||||
let
|
||||
os =
|
||||
if stdenv.isDarwin then
|
||||
"osx"
|
||||
else if stdenv.isLinux then
|
||||
"linux"
|
||||
else
|
||||
throw "Not supported on ${stdenv.hostPlatform.system}.";
|
||||
|
||||
arch = {
|
||||
x86_64-linux = "x64";
|
||||
aarch64-linux = "arm64";
|
||||
x86_64-darwin = "x64";
|
||||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
hash = {
|
||||
x64-linux_hash = "sha256-9DoqyotXAUha2TMSgDIot5PD8ABpfZ8gsshS1ypr5SY=";
|
||||
arm64-linux_hash = "sha256-r22c70OuevRsF8gOHZOkkhlRtoD4nsTHnXF82elQIF8=";
|
||||
x64-osx_hash = "sha256-6jVM4iSGT7tpagocI/1nuBPVvAegfFqsCfrz2fPKCI4=";
|
||||
}."${arch}-${os}_hash";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "prowlarr";
|
||||
version = "0.1.1.978";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
|
||||
sha256 = hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share/${pname}-${version}}
|
||||
cp -r * $out/share/${pname}-${version}/.
|
||||
|
||||
makeWrapper "${dotnetCorePackages.netcore_3_1}/bin/dotnet" $out/bin/Prowlarr \
|
||||
--add-flags "$out/share/${pname}-${version}/Prowlarr.dll" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
|
||||
curl sqlite libmediainfo mono openssl icu ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests.smoke-test = nixosTests.prowlarr;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An indexer manager/proxy built on the popular arr .net/reactjs base stack";
|
||||
homepage = "https://wiki.servarr.com/prowlarr";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ jdreaver ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
50
pkgs/servers/prowlarr/update.sh
Executable file
50
pkgs/servers/prowlarr/update.sh
Executable file
|
|
@ -0,0 +1,50 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused nix-prefetch jq
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
dirname="$(dirname "$0")"
|
||||
|
||||
updateHash()
|
||||
{
|
||||
version=$1
|
||||
arch=$2
|
||||
os=$3
|
||||
|
||||
hashKey="${arch}-${os}_hash"
|
||||
|
||||
url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.develop.$version.$os-core-$arch.tar.gz"
|
||||
hash=$(nix-prefetch-url --type sha256 $url)
|
||||
sriHash="$(nix hash to-sri --type sha256 $hash)"
|
||||
|
||||
sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix"
|
||||
}
|
||||
|
||||
updateVersion()
|
||||
{
|
||||
sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix"
|
||||
}
|
||||
|
||||
currentVersion=$(cd $dirname && nix eval --raw -f ../../.. prowlarr.version)
|
||||
|
||||
# N.B. Prowlarr is still in development, so
|
||||
# https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest
|
||||
# returns nothing. Once this endpoint returns something, we should use
|
||||
# it. Until then, we use jq to sort releases (N.B. the "sort_by(. |
|
||||
# split(".") | map(tonumber))" incantation is to sort the version
|
||||
# number properly and not as a string).
|
||||
|
||||
# latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name")
|
||||
# latestVersion="$(expr $latestTag : 'v\(.*\)')"
|
||||
latestVersion=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/git/refs/tags | jq '. | map(.ref | sub("refs/tags/v";"")) | sort_by(. | split(".") | map(tonumber)) | .[-1]' -r)
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "Prowlarr is up-to-date: ${currentVersion}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
updateVersion $latestVersion
|
||||
|
||||
updateHash $latestVersion x64 linux
|
||||
updateHash $latestVersion arm64 linux
|
||||
updateHash $latestVersion x64 osx
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.3.7";
|
||||
version = "3.3.8";
|
||||
pname = "shairport-sync";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "110k196y62zy6cmdvcnf74iamqj7jq0ybnqh1q1irjak81s3yz12";
|
||||
sha256 = "sha256-YxTJ3XEbBgOQqUJGGsjba2PjyTudWZiH9FqXlnvlsp0=";
|
||||
rev = version;
|
||||
repo = "shairport-sync";
|
||||
owner = "mikebrady";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "sickgear";
|
||||
version = "0.23.16";
|
||||
version = "0.24.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SickGear";
|
||||
repo = "SickGear";
|
||||
rev = "release_${version}";
|
||||
sha256 = "sha256-Kx3vTbwYfILxn7n4upyVZo0V6S2lTStlezku9bfwGVw=";
|
||||
sha256 = "sha256-ocnINaz7F01vYC27fq6DYXkYGnzsqYD16aChPHuA/Go=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "depotdownloader";
|
||||
version = "2.4.1";
|
||||
version = "2.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SteamRE";
|
||||
repo = "DepotDownloader";
|
||||
rev = "DepotDownloader_${version}";
|
||||
sha256 = "1ldwda7wyvzqvqv1wshvqvqaimlm0rcdzhy9yn5hvxyswc0jxirr";
|
||||
sha256 = "0i5qgjnliji1g408ks1034r69vqdmfnzanb0qm7jmyzwww7vwpnh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper ];
|
||||
|
|
|
|||
4
pkgs/tools/misc/depotdownloader/deps.nix
generated
4
pkgs/tools/misc/depotdownloader/deps.nix
generated
|
|
@ -7,8 +7,8 @@ fetchNuGet:
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "SteamKit2";
|
||||
version = "2.4.0-Alpha.2";
|
||||
sha256 = "1r6chqdp912pr8f8d7px2vp4y1ydx0kida7d5a1hbf6b7acnsg7d";
|
||||
version = "2.4.0-Alpha.3";
|
||||
sha256 = "0n48yjkyzj49kv89jbkwdq6nm9w9ng6cjhvdv0chpryx9zgasgvv";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "protobuf-net.Core";
|
||||
|
|
|
|||
|
|
@ -1,23 +1,19 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, upx
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hdl-dump";
|
||||
version = "20202807";
|
||||
version = "unstable-2021-08-20";
|
||||
|
||||
# Using AkuHAK's repo because playstation2's repo is outdated
|
||||
src = fetchFromGitHub {
|
||||
owner = "AKuHAK";
|
||||
owner = "ps2homebrew";
|
||||
repo = pname;
|
||||
rev = "0c98b235c83c0fca1da93648f05ea5f940a4aee0";
|
||||
sha256 = "1s3wflqjjlcslpa9n5chr8dbamhmfk88885dzw68apz4vf6g27iq";
|
||||
rev = "1e760d7672dc12a36c09690b8c9b20d6642a2926";
|
||||
sha256 = "sha256-NMExi2pUyj8vRn9beT2YvnEogRw/xzgqE+roaZ/vNZs=";
|
||||
};
|
||||
|
||||
buildInputs = [ upx ];
|
||||
|
||||
makeFlags = [ "RELEASE=yes" ];
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -25,10 +21,11 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/AKuHAK/hdl-dump";
|
||||
homepage = "https://github.com/ps2homebrew/hdl-dump";
|
||||
description = "PlayStation 2 HDLoader image dump/install utility";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ makefu ];
|
||||
mainProgram = "hdl_dump";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, rtmpdump
|
||||
, phantomjs2
|
||||
, atomicparsley
|
||||
, pycryptodome
|
||||
, pycryptodomex
|
||||
, websockets
|
||||
, mutagen
|
||||
, ffmpegSupport ? true
|
||||
|
|
@ -20,16 +20,16 @@ buildPythonPackage rec {
|
|||
# The websites yt-dlp deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2021.9.25";
|
||||
version = "2021.10.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname;
|
||||
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
|
||||
sha256 = "e7b8dd0ee9498abbd80eb38d9753696d6ca3d02f64980322ab3bf39ba1bc31ee";
|
||||
sha256 = "sha256-zJYhHo5V67tI0uZgnA0JQlB+tUcbLOdOOPe5X41wpOc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ websockets mutagen ]
|
||||
++ lib.optional hlsEncryptedSupport pycryptodome;
|
||||
++ lib.optional hlsEncryptedSupport pycryptodomex;
|
||||
|
||||
# Ensure these utilities are available in $PATH:
|
||||
# - ffmpeg: post-processing & transcoding support
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tboot";
|
||||
version = "1.10.1";
|
||||
version = "1.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
|
||||
sha256 = "18bnkwnlk16cc20nysqfcjx006idi7jmmhahk8vk09w458bhaajg";
|
||||
sha256 = "sha256-Lheco7ULg87lbC8qXkCWwG3R8jiPdQgznDkPBPy6sRE=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl trousers zlib ];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, lib, fetchFromGitHub
|
||||
, which
|
||||
, python
|
||||
, python3
|
||||
, help2man
|
||||
}:
|
||||
|
||||
let
|
||||
pyEnv = python.withPackages(ps: [ ps.setuptools ]);
|
||||
pyEnv = python3.withPackages(ps: [ ps.setuptools ]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mininet";
|
||||
version = "2.3.0d6";
|
||||
version = "2.3.0";
|
||||
|
||||
outputs = [ "out" "py" ];
|
||||
|
||||
|
|
@ -17,14 +17,16 @@ stdenv.mkDerivation rec {
|
|||
owner = "mininet";
|
||||
repo = "mininet";
|
||||
rev = version;
|
||||
sha256 = "0wc6gni9dxj9jjnw66a28jdvcfm8bxv1i776m5dh002bn5wjcl6x";
|
||||
sha256 = "sha256-bCppmeB+zQMKTptnzhsXtl72XJXU3USo7cQgP1Z6SrY=";
|
||||
};
|
||||
|
||||
buildFlags = [ "mnexec" ];
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
pythonPath = [ python.pkgs.setuptools ];
|
||||
buildInputs = [ python which help2man ];
|
||||
pythonPath = [ python3.pkgs.setuptools ];
|
||||
nativeBuildInputs = [ help2man ];
|
||||
|
||||
propagatedBuildInputs = [ python3 which ];
|
||||
|
||||
installTargets = [ "install-mnexec" "install-manpages" ];
|
||||
|
||||
|
|
@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Emulator for rapid prototyping of Software Defined Networks";
|
||||
license = {
|
||||
fullName = "Mininet 2.3.0d6 License";
|
||||
fullName = "Mininet 2.3.0 License";
|
||||
};
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://github.com/mininet/mininet";
|
||||
|
|
|
|||
|
|
@ -8643,6 +8643,8 @@ with pkgs;
|
|||
|
||||
openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {});
|
||||
|
||||
prowlarr = callPackage ../servers/prowlarr { };
|
||||
|
||||
qarte = libsForQt5.callPackage ../applications/video/qarte { };
|
||||
|
||||
qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
|
||||
|
|
@ -17978,6 +17980,8 @@ with pkgs;
|
|||
|
||||
liburcu = callPackage ../development/libraries/liburcu { };
|
||||
|
||||
libjaylink = callPackage ../development/libraries/libjaylink { };
|
||||
|
||||
libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix {};
|
||||
|
||||
libusb1 = callPackage ../development/libraries/libusb1 {
|
||||
|
|
@ -31352,9 +31356,7 @@ with pkgs;
|
|||
|
||||
scotch = callPackage ../applications/science/math/scotch { };
|
||||
|
||||
mininet = callPackage ../tools/virtualization/mininet {
|
||||
python = python3;
|
||||
};
|
||||
mininet = callPackage ../tools/virtualization/mininet { };
|
||||
|
||||
msieve = callPackage ../applications/science/math/msieve { };
|
||||
|
||||
|
|
|
|||
|
|
@ -4315,6 +4315,8 @@ in {
|
|||
|
||||
lima = callPackage ../development/python-modules/lima { };
|
||||
|
||||
limiter= callPackage ../development/python-modules/limiter { };
|
||||
|
||||
limitlessled = callPackage ../development/python-modules/limitlessled { };
|
||||
|
||||
limits = callPackage ../development/python-modules/limits { };
|
||||
|
|
@ -4654,7 +4656,7 @@ in {
|
|||
minimock = callPackage ../development/python-modules/minimock { };
|
||||
|
||||
mininet-python = (toPythonModule (pkgs.mininet.override {
|
||||
inherit python;
|
||||
python3 = python;
|
||||
})).py;
|
||||
|
||||
minio = callPackage ../development/python-modules/minio { };
|
||||
|
|
@ -8673,6 +8675,8 @@ in {
|
|||
|
||||
spyder-kernels = callPackage ../development/python-modules/spyder-kernels { };
|
||||
|
||||
spyse-python = callPackage ../development/python-modules/spyse-python { };
|
||||
|
||||
sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
|
||||
|
||||
sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue