From 5a589075f6b3a4f49be58b47a1fd775a59f97f7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 30 Jan 2021 07:43:26 +0000 Subject: [PATCH 001/375] libsForQt5.kquickimageedit: 0.1.2 -> 0.1.3 --- pkgs/development/libraries/kquickimageedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix index f7cac0c03726..ca0afe103b71 100644 --- a/pkgs/development/libraries/kquickimageedit/default.nix +++ b/pkgs/development/libraries/kquickimageedit/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "kquickimageeditor"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4X3GO/NPzA3c9KiGIkznLHUjLfNNNnPXif7IFwY5dOM="; + sha256 = "sha256-p2uOssS5MQSkmppNKOjTxp866Qx1rIB6ZPhcmVvfBxs="; }; nativeBuildInputs = [ extra-cmake-modules ]; From 087011cc68bc0b8a955220ec400a6bad9d0819e9 Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Sun, 31 Jan 2021 12:33:27 +0100 Subject: [PATCH 002/375] nixos/wakeonlan: add types --- nixos/modules/services/networking/wakeonlan.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/networking/wakeonlan.nix b/nixos/modules/services/networking/wakeonlan.nix index 35ff67937fc7..c9850d142aa5 100644 --- a/nixos/modules/services/networking/wakeonlan.nix +++ b/nixos/modules/services/networking/wakeonlan.nix @@ -31,6 +31,20 @@ in services.wakeonlan.interfaces = mkOption { default = [ ]; + type = types.listOf (types.submodule { options = { + interface = mkOption { + type = types.str; + description = "Interface to enable for Wake-On-Lan."; + }; + method = mkOption { + type = types.enum [ "magicpacket" "password"]; + description = "Wake-On-Lan method for this interface."; + }; + password = mkOption { + type = types.strMatching "[a-fA-F0-9]{2}:([a-fA-F0-9]{2}:){4}[a-fA-F0-9]{2}"; + description = "The password has the shape of six bytes in hexadecimal separated by a colon each."; + }; + };}); example = [ { interface = "eth0"; From 193f7f211cd5468bf431f60e2b01bc004424884b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 16:51:32 +0000 Subject: [PATCH 003/375] kdevelop-unwrapped: 5.6.1 -> 5.6.2 --- pkgs/applications/editors/kdevelop5/kdevelop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index b54015de7b8f..63a948c4c759 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y"; + sha256 = "sha256-D4a8P+U/dhwePj91RFd6DEFDO+i/8xDPLnKfdvQ2O/Y="; }; nativeBuildInputs = [ From 408b107b0cae3687bf87b6b300dacaf51bdd76d5 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 3 Feb 2021 00:25:09 -0800 Subject: [PATCH 004/375] doas: don't configure pamdir In the future, doas won't ship PAM files (see https://github.com/Duncaen/OpenDoas/commit/cfa9f0d3b306d6c1287ec4f2aa42be29de66c9de), and we already configure PAM in the doas module. Configuring the pamdir serves no purpose. --- pkgs/tools/security/doas/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index 7da3b8e9f068..f88abbd7e1ba 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { configureFlags = [ (lib.optionalString withTimestamp "--with-timestamp") # to allow the "persist" setting (lib.optionalString (!withPAM) "--without-pam") - "--pamdir=${placeholder "out"}/etc/pam.d" ]; patches = [ From 1bfbe393c28f2a15b084ff8bd49b73a36dc316fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Feb 2021 02:52:51 +0000 Subject: [PATCH 005/375] libsForQt5.phonon-backend-vlc: 0.11.1 -> 0.11.2 --- pkgs/development/libraries/phonon/backends/vlc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 07e6ccf1f346..fbd68011ee1c 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -7,7 +7,7 @@ with lib; stdenv.mkDerivation rec { pname = "phonon-backend-vlc"; - version = "0.11.1"; + version = "0.11.2"; meta = with lib; { homepage = "https://phonon.kde.org/"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "1vp52i5996khpxs233an7mlrzdji50gcs58ig8nrwfwlgyb1xnfc"; + sha256 = "sha256-xsM7/GjRN/DlegKeS3mMu5D1Svb3Ma9JZ3hXeRzNU6U="; }; buildInputs = [ From 1423228413e28d4f4f8fffced1dcea529ef6ba5a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Feb 2021 19:14:21 +0000 Subject: [PATCH 006/375] xl2tpd: 1.3.15 -> 1.3.16 --- pkgs/tools/networking/xl2tpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index 26731817c80f..5abe4ea09673 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xl2tpd"; - version = "1.3.15"; + version = "1.3.16"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "0ppwza8nwm1av1vldw40gin9wrjrs4l9si50jad414js3k8ycaag"; + sha256 = "sha256-1Hipek50qjcr0vgTNr4PQyCf1qLZ3UKqu+DLuDNjRUc="; }; buildInputs = [ libpcap ]; From 7ff749465cb8c4b82fc84df14385f65a70254343 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Feb 2021 09:57:27 +0000 Subject: [PATCH 007/375] python37Packages.flufl_bounce: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/flufl/bounce.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix index deb92ea9ce85..301b16035396 100644 --- a/pkgs/development/python-modules/flufl/bounce.nix +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "flufl.bounce"; - version = "3.0.1"; + version = "3.0.2"; buildInputs = [ nose2 ]; propagatedBuildInputs = [ atpublic zope_interface ]; src = fetchPypi { inherit pname version; - sha256 = "e432fa1ca25ddbf23e2716b177d4d1c6ab6c078e357df56b0106b92bc10a8f06"; + sha256 = "5014b23248fce72b13143c32da30073e6abc655b963e7739575608280c52c9a7"; }; } From 24499bbc6e50d4be62225614e23cd413c8749a67 Mon Sep 17 00:00:00 2001 From: midchildan Date: Tue, 16 Feb 2021 21:26:59 +0900 Subject: [PATCH 008/375] smartmontools: drop mailutils dependency by default mailutils depends on OpenSSL 1.0.2, which is marked as insecure and thus prevents this package from being built on Hydra. Excluding it by default should re-enable binary builds for users who don't need the email feature. This change is unlikely to cause a major disruption because there's an existing NixOS module for smartd that handles email notifications. It works without this package being dependant on mailutils. Since mailutils isn't used for any other purpose besides providing email notification for smartd, it's possible to drop it without feature loss. This change also makes the dependance on inetutils optional. inetutils is needed for the 'hostname' command, and is only used for providing email support. --- pkgs/tools/system/smartmontools/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 954c9eb4110c..898522b77632 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook -, mailutils, enableMail ? true -, inetutils +, enableMail ? false, mailutils, inetutils , IOKit, ApplicationServices }: let @@ -23,15 +22,17 @@ in stdenv.mkDerivation rec { sha256 = "1mlc25sd5rgj5xmzcllci47inmfdw7cp185fday6hc9rwqkqmnaw"; }; - patches = [ ./smartmontools.patch ]; + patches = [ + # fixes darwin build + ./smartmontools.patch + ]; postPatch = "cp -v ${driverdb} drivedb.h"; - configureFlags = [ - "--with-scriptpath=${lib.makeBinPath ([ inetutils ] ++ lib.optional enableMail mailutils)}" - ]; + configureFlags = lib.optional enableMail + "--with-scriptpath=${lib.makeBinPath [ inetutils mailutils ]}"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [] ++ lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ]; enableParallelBuilding = true; meta = with lib; { From c66d4ebfb456ed64a290199524c5677ea6b3eab8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Feb 2021 07:26:24 +0000 Subject: [PATCH 009/375] python37Packages.flufl_i18n: 3.1.4 -> 3.1.5 --- pkgs/development/python-modules/flufl/i18n.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index 8b0c98635507..b757585e40d7 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "flufl.i18n"; - version = "3.1.4"; + version = "3.1.5"; propagatedBuildInputs = [ atpublic ]; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e19036292a825a69f0e0a87566d1628830c69eecd3b0295d22f582039477a6bb"; + sha256 = "b7016000a4d9d366866e776947b777dbe2b1532c990efeef58922b3e7bcab36e"; }; } From 5085ef3e03213d2a4a1c05496bc74d6158c3d2bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 14:44:04 +0000 Subject: [PATCH 010/375] sg3_utils: 1.45 -> 1.46r862 --- pkgs/tools/system/sg3_utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index d0084e1f4d8a..587bc7639a66 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sg3_utils-1.45"; + name = "sg3_utils-1.46r862"; src = fetchurl { url = "http://sg.danny.cz/sg/p/${name}.tgz"; - sha256 = "0qasc3qm4i8swjfaywiwpgz76gdxqvm47qycxgmprbsjmxqwk1qb"; + sha256 = "sha256-s2UmU+p3s7Hoe+GFri2q+/3XLBICc+h04cxM86yaAs8="; }; meta = with lib; { From bf9cf1004306d183b198e1f967c383991da70ce4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 15:28:15 +0000 Subject: [PATCH 011/375] rsyslog: 8.2006.0 -> 8.2102.0 --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 7fc11d49d7c0..6ff5c07721f4 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2006.0"; + version = "8.2102.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "15wfhw2nmpiyjpp82jxqgcjy7wgbc2fswk5g6rbdqbvghrj9wn6r"; + sha256 = "sha256-lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc="; }; #patches = [ ./fix-gnutls-detection.patch ]; From 620a0dbfbb258865755d52d2c40e7c8c7d8ca3d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 22:28:28 +0000 Subject: [PATCH 012/375] sysvinit: 2.97 -> 2.99 --- pkgs/os-specific/linux/sysvinit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 8f9acdf06626..5ee5b0bda57f 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, withoutInitTools ? false }: -let version = "2.97"; in +let version = "2.99"; in stdenv.mkDerivation { name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version; src = fetchurl { url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz"; - sha256 = "042iyayyh3j28vfbypzn822b73r3nfmyn79f9mixigqrfn2rcn9d"; + sha256 = "sha256-sFw2d7tpiv5kyZeWiwDEmyqb0yDOljUjIw7n6kEZd1c="; }; prePatch = '' From 5b296b6af896cbbbb24c6870dc7e046f6dd306e4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Mar 2021 01:51:10 +0000 Subject: [PATCH 013/375] t1utils: 1.41 -> 1.42 --- pkgs/tools/misc/t1utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index 690fbe8abcb3..ffa2c3408b96 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "t1utils-1.41"; + name = "t1utils-1.42"; src = fetchurl { url = "https://www.lcdf.org/type/${name}.tar.gz"; - sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw"; + sha256 = "sha256-YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; }; meta = with lib; { From 7cecb8d6faaf6d26273ac81cf18214014cf47112 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Mar 2021 04:37:22 +0000 Subject: [PATCH 014/375] xorriso: 1.5.2 -> 1.5.4.pl02 --- pkgs/tools/cd-dvd/xorriso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 34fdb8d03af5..e1cd7cc4046e 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xorriso-${version}"; - version = "1.5.2"; + version = "1.5.4.pl02"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "1rqpzj95f70jfwpn4lamasfgqpizjsipz12aprdhri777b4zas9v"; + sha256 = "sha256-Psc5PUqdy/X3QwnCikFfVSJ+xidwuVrpk6yNejsVKXI="; }; doCheck = true; From b1672eee0cc014408bff056375436fb25d6235ab Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 24 Feb 2021 14:10:22 +0100 Subject: [PATCH 015/375] nixosTests.cntr: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/cntr.nix | 63 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 nixos/tests/cntr.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 62188ddf9e8d..aa7c291ba654 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -64,6 +64,7 @@ in cjdns = handleTest ./cjdns.nix {}; clickhouse = handleTest ./clickhouse.nix {}; cloud-init = handleTest ./cloud-init.nix {}; + cntr = handleTest ./cntr.nix {}; cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; consul = handleTest ./consul.nix {}; containers-bridge = handleTest ./containers-bridge.nix {}; diff --git a/nixos/tests/cntr.nix b/nixos/tests/cntr.nix new file mode 100644 index 000000000000..8cffd97459d0 --- /dev/null +++ b/nixos/tests/cntr.nix @@ -0,0 +1,63 @@ +# Test for cntr tool +{ system ? builtins.currentSystem, config ? { } +, pkgs ? import ../.. { inherit system config; }, lib ? pkgs.lib }: + +let + inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; + + mkOCITest = backend: + makeTest { + name = "cntr-${backend}"; + + meta = { maintainers = with lib.maintainers; [ srk mic92 ]; }; + + nodes = { + ${backend} = { pkgs, ... }: { + environment.systemPackages = [ pkgs.cntr ]; + virtualisation.oci-containers = { + inherit backend; + containers.nginx = { + image = "nginx-container"; + imageFile = pkgs.dockerTools.examples.nginx; + ports = [ "8181:80" ]; + }; + }; + }; + }; + + testScript = '' + start_all() + ${backend}.wait_for_unit("${backend}-nginx.service") + result = ${backend}.wait_until_succeeds( + "cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello'" + ) + assert "Hello" in result + ''; + }; + + mkContainersTest = makeTest { + name = "cntr-containers"; + + meta = with pkgs.lib.maintainers; { maintainers = [ sorki mic92 ]; }; + + machine = { lib, ... }: { + environment.systemPackages = [ pkgs.cntr ]; + containers.test = { + autoStart = true; + privateNetwork = true; + hostAddress = "172.16.0.1"; + localAddress = "172.16.0.2"; + config = { }; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("container@test.service") + machine.succeed("cntr attach test sh -- -c 'ping -c5 172.16.0.1'") + ''; + }; +in { + nixos-container = mkContainersTest; +} // (lib.foldl' (attrs: backend: attrs // { ${backend} = mkOCITest backend; }) + { } [ "docker" "podman" ]) From c520a26b7e8a1754697658dc29fd247a9758d719 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 4 Mar 2021 11:49:53 +0100 Subject: [PATCH 016/375] cntr: add passthru.tests --- pkgs/applications/virtualization/cntr/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 9b57be87e443..ebe1644e96b9 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, nixosTests }: rustPlatform.buildRustPackage rec { pname = "cntr"; @@ -13,6 +13,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-o8o/ixjYdnezQZEp78brjmR2lvQbiwCJr4Y97tHiYbk="; + passthru.tests = { + nixos = nixosTests.cntr; + }; + meta = with lib; { description = "A container debugging tool based on FUSE"; homepage = "https://github.com/Mic92/cntr"; From 4ff181860d41dcbd86217b5e52e29c7e51d6b137 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 23:53:49 +0000 Subject: [PATCH 017/375] gbenchmark: 1.5.2 -> 1.5.3 --- pkgs/development/libraries/gbenchmark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index c1f485e18d9b..456e311a0bf0 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "13rxagpzw6bal6ajlmrxlh9kgfvcixn6j734b2bvfqz7lch8n0pa"; + sha256 = "sha256-h/e2vJacUp7PITez9HPzGc5+ofz7Oplso44VibECmsI="; }; nativeBuildInputs = [ cmake ]; From 1a78bf2dd4fd9f0f9d5d48a835903d8fcd368255 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 5 May 2021 18:24:49 +0200 Subject: [PATCH 018/375] aqbanking: 6.2.10 -> 6.3.0 --- pkgs/development/libraries/aqbanking/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index a3c953b8a305..60f61324e650 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -5,7 +5,7 @@ libchipcard.version = "5.0.4"; libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; libchipcard.releaseId = "158"; - aqbanking.version = "6.2.10"; - aqbanking.sha256 = "13dbpi58mw09gnsza11pxy5c8j99r11nkyg2j53y4lqk47rmyhvq"; - aqbanking.releaseId = "368"; + aqbanking.version = "6.3.0"; + aqbanking.sha256 = "1k2mhdnk0jc0inq1hmp74m3y7azxrjm8r07x5k1pp4ic0yi5vs50"; + aqbanking.releaseId = "372"; } From e61d610615b6540e8182b42919b70016fce218e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 May 2021 00:39:43 +0000 Subject: [PATCH 019/375] liblscp: 0.6.0 -> 0.9.2 --- pkgs/development/libraries/liblscp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index dcb862f2cd4d..813aa660ae9d 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "liblscp"; - version = "0.6.0"; + version = "0.9.2"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz"; - sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k"; + sha256 = "sha256-GTW6SBQVCDtzeU+arLmAJi6N9jtN68NdI69p6RSazvs="; }; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; From 94b5fbe5e78ac9b61ef2d24b043e44366513d9b2 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Mon, 8 Feb 2021 21:01:33 +0100 Subject: [PATCH 020/375] perf: define only if kernel version > 3.12 In mobile-nixos, some vendor kernels might be old. Without this patch, the evaluation of the system fails by the assert inside the perf derivation. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bf82e86c9d4..1e0eae88ecc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20394,7 +20394,7 @@ in oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; - perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + perf = if lib.versionAtLeast kernel.version "3.12" then callPackage ../os-specific/linux/kernel/perf.nix { } else null; phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; From 8c3cc186b26add445bc0a1b4a3aea752aaa0d65a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 06:25:39 +0000 Subject: [PATCH 021/375] liblouis: 3.17.0 -> 3.18.0 --- pkgs/development/libraries/liblouis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 2208606a8133..dd2738b1774d 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-rcySznUeoiUZnyVAmg/oYkUkLrZhBI8FEtiff0eHa+k="; + sha256 = "sha256-STAfA2QgSrCZaT/tcoj0BVnFfO3jbe6W2FgVOfxjpJc="; }; outputs = [ "out" "dev" "man" "info" "doc" ]; From b432c3ca0db8d14e2441d735b2ab51dd7fd55e8f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 24 Jun 2021 23:37:10 -0700 Subject: [PATCH 022/375] nomad-autoscaler: init at 0.3.3 --- .../cluster/nomad-autoscaler/default.nix | 112 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 114 insertions(+) create mode 100644 pkgs/applications/networking/cluster/nomad-autoscaler/default.nix diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix new file mode 100644 index 000000000000..702bf19d5795 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -0,0 +1,112 @@ +{ lib, fetchFromGitHub, buildGoModule, go, removeReferencesTo, buildEnv }: + +let + package = buildGoModule rec { + pname = "nomad-autoscaler"; + version = "0.3.3"; + + outputs = [ + "out" + "bin" + "aws_asg" + "azure_vmss" + "datadog" + "fixed_value" + "gce_mig" + "nomad_apm" + "nomad_target" + "pass_through" + "prometheus" + "target_value" + "threshold" + ]; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "nomad-autoscaler"; + rev = "v${version}"; + sha256 = "sha256-bN/U6aCf33B88ouQwTGG8CqARzWmIvXNr5JPr3l8cVI="; + }; + + vendorSha256 = "sha256-Ls8gkfLyxfQD8krvxjAPnZhf1r1s2MhtQfMMfp8hJII="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ removeReferencesTo ]; + + # buildGoModule overrides normal buildPhase, can't use makeTargets + postBuild = '' + make build plugins + ''; + + # tries to pull tests from network, and fails silently anyway + doCheck = false; + + postInstall = '' + mkdir -p $bin/bin + mv $out/bin/nomad-autoscaler $bin/bin/nomad-autoscaler + ln -s $bin/bin/nomad-autoscaler $out/bin/nomad-autoscaler + + for d in $outputs; do + mkdir -p ''${!d}/share + done + rmdir $bin/share + + # have out contain all of the plugins + for plugin in bin/plugins/*; do + remove-references-to -t ${go} "$plugin" + cp "$plugin" $out/share/ + done + + # populate the outputs as individual plugins + # can't think of a more generic way to handle this + # bash doesn't allow for dashes '-' to be in a variable name + # this means that the output names will need to differ slightly from the binary + mv bin/plugins/aws-asg $aws_asg/share/ + mv bin/plugins/azure-vmss $azure_vmss/share/ + mv bin/plugins/datadog $datadog/share/ + mv bin/plugins/fixed-value $fixed_value/share/ + mv bin/plugins/gce-mig $gce_mig/share/ + mv bin/plugins/nomad-apm $nomad_apm/share/ + mv bin/plugins/nomad-target $nomad_target/share/ + mv bin/plugins/pass-through $pass_through/share/ + mv bin/plugins/prometheus $prometheus/share/ + mv bin/plugins/target-value $target_value/share/ + mv bin/plugins/threshold $threshold/share/ + ''; + + # make toggle-able, so that overrided versions can disable this check if + # they want newer versions of the plugins without having to modify + # the output logic + doInstallCheck = true; + installCheckPhase = '' + rmdir bin/plugins || { + echo "Not all plugins were extracted" + echo "Please move the following to their related output: $(ls bin/plugins)" + exit 1 + } + ''; + + passthru = { + inherit plugins withPlugins; + }; + + meta = with lib; { + description = "Autoscaling daemon for Nomad"; + homepage = "https://github.com/hashicorp/nomad-autoscaler"; + license = licenses.mpl20; + maintainers = with maintainers; [ jonringer ]; + }; + }; + + plugins = let + plugins = builtins.filter (n: !(lib.elem n [ "out" "bin" ])) package.outputs; + in lib.genAttrs plugins (output: package.${output}); + + # Intended to be used as: (nomad-autoscaler.withPlugins (ps: [ ps.aws_asg ps.nomad_target ]) + withPlugins = f: buildEnv { + name = "nomad-autoscaler-env"; + paths = [ package.bin ] ++ f plugins; + }; +in + package diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a005df9e60b4..5f145ad3a1e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7265,6 +7265,8 @@ in nvidiaGpuSupport = config.cudaSupport or false; }; + nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; + nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; notable = callPackage ../applications/misc/notable { }; From 7fc7a59e3c9c0e2f15905a98278f8eb5937f0387 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Fri, 7 May 2021 01:07:54 +0800 Subject: [PATCH 023/375] optparse-bash: init at 2021-06-13 --- .../libraries/optparse-bash/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/libraries/optparse-bash/default.nix diff --git a/pkgs/development/libraries/optparse-bash/default.nix b/pkgs/development/libraries/optparse-bash/default.nix new file mode 100644 index 000000000000..811458ed187c --- /dev/null +++ b/pkgs/development/libraries/optparse-bash/default.nix @@ -0,0 +1,63 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, bash +, gnused +, gawk +, coreutils +}: + +stdenvNoCC.mkDerivation { + pname = "optparse-bash-unstable"; + version = "2021-06-13"; + + src = fetchFromGitHub { + owner = "nk412"; + repo = "optparse"; + rev = "d86ec17d15368e5b54eb2d47b001b0b61d68bbd0"; + sha256 = "sha256-vs7Jo1+sV0tPse4Wu2xtzSX1IkahwLgO3e4Riz3uMmI="; + }; + + postPatch = '' + substituteInPlace optparse.bash \ + --replace sed "${gnused}/bin/sed" \ + --replace awk "${gawk}/bin/awk" \ + --replace printf "${coreutils}/bin/printf" +''; + + dontBuild = true; + + doCheck = true; + + checkInputs = [ bash ]; + + # `#!/usr/bin/env` isn't okay for OfBorg + # Need external bash to run + checkPhase = '' + runHook preCheck + bash ./sample_head.sh -v --file README.md + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv optparse.bash $out/bin/ + mkdir -p $out/share/doc/optparse-bash + mv README.md sample_head.sh $out/share/doc/optparse-bash/ + runHook postInstall + ''; + + # As example code, + # sample_head.sh shows how users can use opt-parse in their script, + # and its shebang (`/usr/bin/env bash`) should not be patched. + dontPatchShebangs = true; + + meta = with lib; { + description = "A BASH wrapper for getopts, for simple command-line argument parsing"; + homepage = "https://github.com/nk412/optparse"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 134d26935606..73cdb17c84bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17798,6 +17798,8 @@ in openrct2 = callPackage ../games/openrct2 { }; + optparse-bash = callPackage ../development/libraries/optparse-bash { }; + orcania = callPackage ../development/libraries/orcania { }; osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; From b8a905931ebf4d416f40c063595daa9245f0cb54 Mon Sep 17 00:00:00 2001 From: Max Hille Date: Tue, 13 Jul 2021 17:11:18 +0200 Subject: [PATCH 024/375] maintainers: add maxhille --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 334ea7b72d72..47826b08cf11 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6604,6 +6604,12 @@ githubId = 35892750; name = "Maxine Aubrey"; }; + maxhille = { + email = "mh@lambdasoup.com"; + github = "maxhille"; + githubId = 693447; + name = "Max Hille"; + }; maxhbr = { email = "nixos@maxhbr.dev"; github = "maxhbr"; From 0e2471e421621ebe2558c07ee21bdadb6ab992ae Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 24 Jul 2021 15:25:14 +0800 Subject: [PATCH 025/375] gnome.mutter: fix libdir path --- pkgs/desktops/gnome/core/mutter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 4ad082dabfcd..c4f29e14f56c 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -134,7 +134,7 @@ let self = stdenv.mkDerivation rec { PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; passthru = { - libdir = "${self}/lib/mutter-7"; + libdir = "${self}/lib/mutter-8"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' From 4f91b61192e9e213bd2841872c7469622b556126 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 25 Jul 2021 20:56:50 +0200 Subject: [PATCH 026/375] gphotos-sync: add recommended package --- pkgs/tools/backup/gphotos-sync/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/gphotos-sync/default.nix b/pkgs/tools/backup/gphotos-sync/default.nix index e7cd29e1a812..cce9c5b77b7b 100644 --- a/pkgs/tools/backup/gphotos-sync/default.nix +++ b/pkgs/tools/backup/gphotos-sync/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, ffmpeg }: python3Packages.buildPythonApplication rec { pname = "gphotos-sync"; @@ -19,10 +19,14 @@ python3Packages.buildPythonApplication rec { pyyaml requests_oauthlib ]; + + buildInputs = [ ffmpeg ]; + checkInputs = with python3Packages; [ pytestCheckHook mock ]; + checkPhase = '' export HOME=$(mktemp -d) From 014b404f0395cc5d9f2b18ee0b8d7481abb3f471 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 25 Jul 2021 17:11:32 +1000 Subject: [PATCH 027/375] realvnc-vnc-viewer: init at 6.21.406 --- .../admin/realvnc-vnc-viewer/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/tools/admin/realvnc-vnc-viewer/default.nix diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix new file mode 100644 index 000000000000..690c215471cf --- /dev/null +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchurl, autoPatchelfHook, rpmextract, libX11, libXext }: + +stdenv.mkDerivation rec { + pname = "realvnc-vnc-viewer"; + version = "6.21.406"; + + src = { + "x86_64-linux" = fetchurl { + url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; + sha256 = "0rnizzanaykqg1vfy56p8abc4fmgpbibj54j4c1v81zsj3kmahka"; + }; + "i686-linux" = fetchurl { + url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm"; + sha256 = "1rlxfiqymi1licn2spyiqa00kiwzhdr0pkh7vv3ai6gb9f6phk31"; + }; + }.${stdenv.system}; + + nativeBuildInputs = [ autoPatchelfHook rpmextract ]; + buildInputs = [ libX11 libXext ]; + + unpackPhase = '' + rpmextract $src + ''; + + postPatch = '' + substituteInPlace ./usr/share/applications/realvnc-vncviewer.desktop \ + --replace /usr/share/icons/hicolor/48x48/apps/vncviewer48x48.png vncviewer48x48.png + substituteInPlace ./usr/share/mimelnk/application/realvnc-vncviewer-mime.desktop \ + --replace /usr/share/icons/hicolor/48x48/apps/vncviewer48x48.png vncviewer48x48.png + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + + runHook postInstall + ''; + + meta = with lib; { + description = "VNC remote desktop client software by RealVNC"; + homepage = "https://www.realvnc.com/en/connect/download/viewer/"; + license = { + fullName = "VNC Connect End User License Agreement"; + url = "https://static.realvnc.com/media/documents/LICENSE-4.0a_en.pdf"; + free = false; + }; + maintainers = with maintainers; [ angustrau ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea47..dec9197c5906 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8418,6 +8418,8 @@ in rtss = callPackage ../development/tools/misc/rtss { }; + realvnc-vnc-viewer = callPackage ../tools/admin/realvnc-vnc-viewer {}; + reaverwps = callPackage ../tools/networking/reaver-wps {}; reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; From de61196f4500b2e5d36a3738d089120aaf047e48 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 16:00:20 +0000 Subject: [PATCH 028/375] evolution-ews: 3.40.1 -> 3.40.3 --- .../mailreaders/evolution/evolution-ews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index ad43ed97e09c..7792361145af 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.40.1"; + version = "3.40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kgxdacqqcq8yfkij6vyqlk5r4yqvw7gh7mxqii670hrn1mb2s50"; + sha256 = "ZAIE5rpPOyZT3VSPYOR143bP8Na7Kv0NQRhQ+p2oxJY="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; From ff86267693ad02aa7e95c0d94ee5d5ccb88032ba Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 1 Aug 2021 15:03:35 +0200 Subject: [PATCH 029/375] sweethome3d: 6.5.2 -> 6.6 --- pkgs/applications/misc/sweethome3d/default.nix | 4 ++-- pkgs/applications/misc/sweethome3d/editors.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 387177a8c4c5..bfe9af768412 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -100,13 +100,13 @@ in { application = mkSweetHome3D rec { pname = lib.toLower module + "-application"; - version = "6.5.2"; + version = "6.6"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = lib.licenses.gpl2Plus; src = fetchurl { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "1j0xm2vmcxxjmf12k8rfnisq9hd7hqaiyxrfbrbjxis9iq3kycp3"; + sha256 = "sha256-CnVXpmodmyoZdqmt7OgRyzuLeDhkPhrAS/CldFM8SQs="; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 783ea3e79402..d6ea3fccfa66 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -99,14 +99,14 @@ in { }; furniture-editor = mkEditorProject rec { - version = "1.27"; + version = "1.28"; module = "FurnitureLibraryEditor"; pname = module; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; license = lib.licenses.gpl2; src = fetchurl { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "1zxbcn9awgax8lalzkc05f5yfwbgnrayc17fkyv5i19j4qb3r2a0"; + sha256 = "sha256-r5xJlUctUdcknJfm8rbz+bdzFhqgHsHpHwxEC4mItws="; }; desktopName = "Sweet Home 3D - Furniture Library Editor"; }; From 3e4f2f4f51bd2e6c07d304b5f46247b6fb8a00f8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 29 Jul 2021 11:49:32 -0400 Subject: [PATCH 030/375] fastnlo_toolkit: 2.3.1pre-2411 -> 2.5.0pre-2823 --- .../physics/fastnlo_toolkit/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index e4a731d31721..c6de477953d7 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , autoreconfHook , boost , gfortran @@ -15,17 +15,23 @@ stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; - version = "2.3.1pre-2411"; + rev = "2823"; + version = "2.5.0pre-${rev}"; - src = fetchurl { - urls = [ - "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz" - "https://sid.ethz.ch/debian/fastnlo/${pname}-${version}.tar.gz" - ]; - sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb"; - }; + src = fetchFromGitLab { + domain = "gitlab.etp.kit.edu"; + owner = "qcd-public"; + repo = "fastNLO"; + inherit rev; + hash = "sha256-FEKnEnK90tT4BJJ6MLva9lCl3aYzO1YGdx/8Ol2vM7M="; + } + /v2.5/toolkit; - nativeBuildInputs = lib.optional withPython autoreconfHook; + postPatch = '' + # remove duplicate macro, to fix for autoconf 2.70 + sed -e '0,/AC_CONFIG_MACRO_DIR\([m4]\)/{/AC_CONFIG_MACRO_DIR/d}' -i configure.ac + ''; + + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ boost From 32f2712625b845aaf4f457d60ff660b58315c38a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 30 Jul 2021 20:36:32 -0400 Subject: [PATCH 031/375] fastnlo_toolkit: enable tests --- .../libraries/physics/fastnlo_toolkit/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index c6de477953d7..06370e1672d1 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -6,6 +6,7 @@ , gfortran , lhapdf , ncurses +, perl , python ? null , swig , yoda @@ -57,6 +58,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = true; + checkInputs = [ + perl + lhapdf.pdf_sets.CT10nlo + ]; + preCheck = '' + patchShebangs --build check + ''; + enableParallelChecking = false; + meta = with lib; { homepage = "http://fastnlo.hepforge.org"; description = "Fast pQCD calculations for hadron-induced processes"; @@ -74,5 +85,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; + broken = stdenv.isAarch64; # failing test "fnlo-tk-stattest.pl" }; } From 24ba262fbe335f6cb853f9c66b48968b0acf6dfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Aug 2021 05:16:00 +0000 Subject: [PATCH 032/375] ddccontrol-db: 20210505 -> 20210804 --- pkgs/data/misc/ddccontrol-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index d79fc73d61bf..beccf9dc773d 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20210505"; + version = "20210804"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "sha256-k0Bcf1I/g2sFnX3y4qyWG7Z3W7K6YeZ9trUFSJ4NhSo="; + sha256 = "sha256-+PTw4bDJhWyuEae5ShkIL/KvQ29+gU46iE2RdtTWb8M="; }; preConfigure = '' From e94275202e926e9d7a568c5293a1f118237f8864 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Aug 2021 09:44:19 +0000 Subject: [PATCH 033/375] kubernetes: 1.21.3 -> 1.22.0 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index ac1e0aa91171..b59a5549b72d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.21.3"; + version = "1.22.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-GMigdVuqJN6eIN0nhY5PVUEnCqjAYUzitetk2QmX5wQ="; + sha256 = "sha256-4lqqD3SBLBWrnFWhRzV3QgRLdGRW1Jx/eL6swtHL0Vw="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; From 62ba64d5129b473d39080ead434b33f05683d87e Mon Sep 17 00:00:00 2001 From: Chris Pickard Date: Thu, 5 Aug 2021 10:57:53 -0400 Subject: [PATCH 034/375] tmuxPlugins.better-mouse-mode: fixed broken install path the prior install path did not source the correct path without manual intervention --- pkgs/misc/tmux-plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 826feace271c..b04a54874571 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -72,6 +72,7 @@ in rec { rev = "aa59077c635ab21b251bd8cb4dc24c415e64a58e"; sha256 = "06346ih3hzwszhkj25g4xv5av7292s6sdbrdpx39p0n3kgf5mwww"; }; + rtpFilePath = "scroll_copy_mode.tmux"; meta = { homepage = "https://github.com/NHDaly/tmux-better-mouse-mode"; description = "better mouse support for tmux"; From ab5810a2e1afbbbb100358f2422f62025a901b66 Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Thu, 5 Aug 2021 22:42:56 -0400 Subject: [PATCH 035/375] paraview: 5.8.0 -> 5.9.1 The new version supports python 3.9. The patch to avoid the string-format warning is no longer needed. --- pkgs/applications/graphics/paraview/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 79feab3ab7ae..5e85d304e25f 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -4,28 +4,18 @@ mkDerivation rec { pname = "paraview"; - version = "5.8.0"; + version = "5.9.1"; src = fetchFromGitHub { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1mka6wwg9mbkqi3phs29mvxq6qbc44sspbm4awwamqhilh4grhrj"; + sha256 = "0pzic95br0vr785jnpxqmfxcljw3wk7bhm2xy0jfmwm1dh2b7xac"; fetchSubmodules = true; }; - # Avoid error: format not a string literal and - # no format arguments [-Werror=format-security] - preConfigure = '' - substituteInPlace VTK/Common/Core/vtkLogger.h \ - --replace 'vtkLogScopeF(verbosity_name, __func__)' 'vtkLogScopeF(verbosity_name, "%s", __func__)' - - substituteInPlace VTK/Common/Core/vtkLogger.h \ - --replace 'vtkVLogScopeF(level, __func__)' 'vtkVLogScopeF(level, "%s", __func__)' - ''; - # Find the Qt platform plugin "minimal" - patchPhase = '' + preConfigure = '' export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} ''; From 89bcf569f610afc0f514bcd0c71ae61435a26de9 Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Thu, 5 Aug 2021 22:43:47 -0400 Subject: [PATCH 036/375] paraview: use fetchFromGitLab The main repo is on GitLab; the GitHub repository is a mirror. --- pkgs/applications/graphics/paraview/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 5e85d304e25f..166e04149cc8 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,4 +1,4 @@ -{ boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras, +{ boost, cmake, fetchFromGitLab, ffmpeg, qtbase, qtx11extras, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper, mkDerivation, ninja, mpi, python3, lib, tbb, libGLU, libGL }: @@ -6,9 +6,10 @@ mkDerivation rec { pname = "paraview"; version = "5.9.1"; - src = fetchFromGitHub { - owner = "Kitware"; - repo = "ParaView"; + src = fetchFromGitLab { + domain = "gitlab.kitware.com"; + owner = "paraview"; + repo = "paraview"; rev = "v${version}"; sha256 = "0pzic95br0vr785jnpxqmfxcljw3wk7bhm2xy0jfmwm1dh2b7xac"; fetchSubmodules = true; From e3bb39daf7728d017f7ccdc93bc14d70585ff678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 Aug 2021 17:21:32 +0200 Subject: [PATCH 037/375] gitstatus: format, cleanup --- .../git-and-tools/gitstatus/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index ab0ce9c7cd0f..d010ac435318 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, stdenv, fetchFromGitHub, git, zsh, ...}: +{ callPackage, lib, stdenv, fetchFromGitHub, git, zsh }: stdenv.mkDerivation rec { pname = "gitstatus"; @@ -11,12 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-MQG4thW73gDqY68bKP2FO8z5uc2R/tED+/X9qas/GOA="; }; - buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; - patchPhase = '' + buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ]; + + postPatch = '' sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.sh sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.zsh sed -i "1a GITSTATUS_DAEMON=$out/bin/gitstatusd" install ''; + installPhase = '' install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd install -Dm444 gitstatus.plugin.sh $out @@ -24,6 +26,7 @@ stdenv.mkDerivation rec { install -Dm555 install $out install -Dm444 build.info $out ''; + # Don't install the "install" and "build.info" files, which the end user # should not need to worry about. pathsToLink = [ From 52cab6b8951fb5e69ee932852f36640dc7b5182f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 Aug 2021 17:22:13 +0200 Subject: [PATCH 038/375] gitstatus: move scripts to $out/share/gitstatus, fix a bug when loading from home-manager --- .../git-and-tools/gitstatus/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index d010ac435318..4a0cbc708be0 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -21,18 +21,23 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd - install -Dm444 gitstatus.plugin.sh $out - install -Dm444 gitstatus.plugin.zsh $out - install -Dm555 install $out - install -Dm444 build.info $out + install -Dm444 gitstatus.plugin.sh -t $out/share/gitstatus/ + install -Dm444 gitstatus.plugin.zsh -t $out/share/gitstatus/ + install -Dm555 install -t $out/share/gitstatus/ + install -Dm444 build.info -t $out/share/gitstatus/ + + # the fallback path is wrong in the case of home-manager + # because the FHS directories don't start at / + substituteInPlace install \ + --replace "_gitstatus_install_main ." "_gitstatus_install_main $out" ''; # Don't install the "install" and "build.info" files, which the end user # should not need to worry about. pathsToLink = [ "/bin/gitstatusd" - "/gitstatus.plugin.sh" - "/gitstatus.plugin.zsh" + "/share/gitstatus/gitstatus.plugin.sh" + "/share/gitstatus/gitstatus.plugin.zsh" ]; # The install check sets up an empty Git repository and a minimal zshrc that @@ -50,7 +55,7 @@ stdenv.mkDerivation rec { echo ' GITSTATUS_LOG_LEVEL=DEBUG - . $out/gitstatus.plugin.zsh || exit 1 + . $out/share/gitstatus/gitstatus.plugin.zsh || exit 1 gitstatus_stop NIX_TEST && gitstatus_start NIX_TEST gitstatus_query NIX_TEST From f4cae7047edae00693f005c7da5bdb258e9bb850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 Aug 2021 17:22:55 +0200 Subject: [PATCH 039/375] gitstatus: add SuperSandro2000 maintainer --- .../version-management/git-and-tools/gitstatus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 4a0cbc708be0..1ab6bfd1a2f3 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -85,6 +85,6 @@ stdenv.mkDerivation rec { description = "10x faster implementation of `git status` command"; homepage = "https://github.com/romkatv/gitstatus"; license = licenses.gpl3Only; - maintainers = with maintainers; [ mmlb hexa ]; + maintainers = with maintainers; [ mmlb hexa SuperSandro2000 ]; }; } From e4cbde69075dd0ffd175cfc32626bd44c6fd7c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 Aug 2021 17:23:08 +0200 Subject: [PATCH 040/375] gitstatus: update libgit2 --- .../git-and-tools/gitstatus/romkatv_libgit2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index 9c74fa35752f..f94f772f50f1 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -16,7 +16,7 @@ libgit2.overrideAttrs (oldAttrs: { src = fetchFromGitHub { owner = "romkatv"; repo = "libgit2"; - rev = "tag-82cefe2b42300224ad3c148f8b1a569757cc617a"; - sha256 = "1vhnqynqyxizzkq1h5dfjm75f0jm5637jh0gypwqqz2yjqrscza0"; + rev = "tag-5860a42d19bcd226cb6eff2dcbfcbf155d570c73"; + sha256 = "sha256-OdGLNGOzXbWQGqw5zYM1RhU4Z2yRXi9cpAt7Vn9+j5I="; }; }) From 981cf6a6e2b4fe09653eff0e1d9f88c967c74cdd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 7 Aug 2021 16:17:16 +0200 Subject: [PATCH 041/375] all-cabal-hashes: 2021-08-04T07:53:53Z -> 2021-08-07T10:52:35Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 212c14e482fb..e474bb81719c 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "7818431b8d25dc7951cd7f50369741e9966d2dc8", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7818431b8d25dc7951cd7f50369741e9966d2dc8.tar.gz", - "sha256": "1fssc5r0482i03rcyvagql06p41qmr8vnyw6501zhbprvz0y1sd4", - "msg": "Update from Hackage at 2021-08-04T07:53:53Z" + "commit": "8977803787241e1474bdbb35cbc704c57cce6fcd", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8977803787241e1474bdbb35cbc704c57cce6fcd.tar.gz", + "sha256": "1ivdqlmpdqpa5m5cdwdk6l258nmnz9a6466y8xs19x0wkdx4b738", + "msg": "Update from Hackage at 2021-08-07T10:52:35Z" } From 14467d17353ccf7d484907bbd45d1ea82264bd7c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 7 Aug 2021 16:18:37 +0200 Subject: [PATCH 042/375] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 652 +++++++++++++++--- 1 file changed, 555 insertions(+), 97 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 315edc531768..84ab38feb8f3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2732,30 +2732,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_4_0_0" = callPackage - ({ mkDerivation, array, async, base, base-compat, base-orphans - , binary, bytestring, clock, containers, deepseq, Diff, directory - , filepath, integer-logarithms, mtl, optparse-applicative, parsec - , pretty, process, QuickCheck, rere, stm, tagged, tar, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, text - , time, transformers, tree-diff, unix + "Cabal_3_6_0_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, filepath, mtl, parsec, pretty, process, text + , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.4.0.0"; - sha256 = "1za1cl14fkw8y89hhw6sqirzmkixjaa4wpqsibyk0fvnjs59jydq"; + version = "3.6.0.0"; + sha256 = "0xkyip9fm1k4cwjifqsh12xwi7za5lcbszqkl11gjyx6nxddzdhv"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty process text time transformers unix ]; - testHaskellDepends = [ - array async base base-compat base-orphans binary bytestring clock - containers deepseq Diff directory filepath integer-logarithms - optparse-applicative pretty process QuickCheck rere stm tagged tar - tasty tasty-golden tasty-hunit tasty-quickcheck temporary text - transformers tree-diff - ]; doCheck = false; description = "A framework for packaging Haskell software"; license = lib.licenses.bsd3; @@ -25359,6 +25349,8 @@ self: { pname = "aeson-with"; version = "0.1.2.0"; sha256 = "0zj8jjsq26i6k8m3zfszpjxnnkar3gmvdw1adl9rxlgha2v5kfz8"; + revision = "2"; + editedCabalFile = "1li326p1vvgfs54pai7xswssj67j58prr40pqzhmlgs8v193q175"; libraryHaskellDepends = [ aeson base lens lens-aeson scientific text unordered-containers vector @@ -26639,6 +26631,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "align-audio" = callPackage + ({ mkDerivation, base, comfort-array, comfort-fftw, containers + , netlib-ffi, numeric-prelude, optparse-applicative, shell-utility + , soxlib, storablevector, Stream, synthesizer-core, utility-ht + }: + mkDerivation { + pname = "align-audio"; + version = "0.0"; + sha256 = "0sa7q5fzkc0z4vzibs5l21pvrkil0swdpbl27qn30vb6giy3yh7a"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base comfort-array comfort-fftw containers netlib-ffi + numeric-prelude optparse-applicative shell-utility soxlib + storablevector Stream synthesizer-core utility-ht + ]; + description = "Find relative time displacement of two recordings of the same music"; + license = lib.licenses.bsd3; + }) {}; + "align-text" = callPackage ({ mkDerivation, base, optparse-applicative, text }: mkDerivation { @@ -31071,6 +31083,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "apecs_0_9_3" = callPackage + ({ mkDerivation, array, base, containers, criterion, exceptions + , linear, mtl, QuickCheck, template-haskell, vector + }: + mkDerivation { + pname = "apecs"; + version = "0.9.3"; + sha256 = "02qi63bj0prvmxi6ksw2cq0b7fvhcdv8fgbsjbv7vf51p4c6rbh7"; + libraryHaskellDepends = [ + array base containers exceptions mtl template-haskell vector + ]; + testHaskellDepends = [ base containers linear QuickCheck vector ]; + benchmarkHaskellDepends = [ base criterion linear ]; + description = "Fast Entity-Component-System library for game programming"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "apecs-gloss" = callPackage ({ mkDerivation, apecs, apecs-physics, base, containers, gloss , linear @@ -31119,8 +31149,8 @@ self: { }: mkDerivation { pname = "apecs-stm"; - version = "0.1.4"; - sha256 = "1x9bc3b0x7s7sphr4wzz4mnzz97n2rz3kn48rs889cvqa825dgr9"; + version = "0.1.5"; + sha256 = "10zfmc1zgmw5fkrrcs0mnsb2h44b0zfn2y7w1ld47skvmz580dxp"; libraryHaskellDepends = [ apecs base containers list-t stm stm-containers template-haskell vector @@ -37087,6 +37117,8 @@ self: { pname = "aws-transcribe-ws"; version = "0.0.1.0"; sha256 = "151mlkgbb1lnhqwb4xwriqyj05fsz2dam3sr65j4zh476dmyv6bk"; + revision = "1"; + editedCabalFile = "032n5y32wq8pq8pky1qmjp34p7np72lkq89r7fr8fl8jl9hv6h26"; libraryHaskellDepends = [ aeson async base base16-bytestring binary bytestring crc cryptohash-sha256 lens stm text time websockets wuss @@ -40587,7 +40619,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "binary_0_8_8_0" = callPackage + "binary_0_8_9_0" = callPackage ({ mkDerivation, array, attoparsec, base, base-orphans, bytestring , Cabal, cereal, containers, criterion, deepseq, directory , filepath, generic-deriving, HUnit, mtl, QuickCheck, random @@ -40596,8 +40628,8 @@ self: { }: mkDerivation { pname = "binary"; - version = "0.8.8.0"; - sha256 = "01dwxak6j4499599r22c422js68gn6irxfa3hplzhn7rrx82r6h5"; + version = "0.8.9.0"; + sha256 = "0nv1jpa4c982ic1pqi9nb7n1rsj1vwbi733yim3j3vh5pn45cv2v"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base base-orphans bytestring Cabal containers directory @@ -43726,6 +43758,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "blas-comfort-array_0_0_0_3" = callPackage + ({ mkDerivation, base, blas-ffi, comfort-array + , netlib-comfort-array, netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "blas-comfort-array"; + version = "0.0.0.3"; + sha256 = "1g0bvag205ag520vlxv24cv63idjg6j8nwnadq9gbcibn4gvsisz"; + libraryHaskellDepends = [ + base blas-ffi comfort-array netlib-comfort-array netlib-ffi + storable-complex transformers + ]; + description = "Auto-generated interface to Fortran BLAS via comfort-array"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "blas-ffi" = callPackage ({ mkDerivation, base, blas, netlib-ffi }: mkDerivation { @@ -44605,6 +44654,29 @@ self: { license = lib.licenses.mit; }) {}; + "bnb-staking-csvs" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, hedgehog, req + , scientific, tasty, tasty-hedgehog, tasty-hunit, text, time + }: + mkDerivation { + pname = "bnb-staking-csvs"; + version = "0.1.0.0"; + sha256 = "0dy68qklr8zajcmw4zff921n35j99klgndpgpq0ra9k3g6n22gkn"; + revision = "1"; + editedCabalFile = "0pjrkqkjyq3hl14q7k9sx2xia06z06lv2i1sfs0vbcc3fh1s3wn1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cassava req scientific text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "Generate CSV Exports of Your BNB Staking Rewards"; + license = lib.licenses.bsd3; + }) {}; + "bno055-haskell" = callPackage ({ mkDerivation, base, bytestring, cereal, h2c, mtl, resourcet }: mkDerivation { @@ -54695,10 +54767,8 @@ self: { ({ mkDerivation, base, Cabal, chs-deps }: mkDerivation { pname = "chs-cabal"; - version = "0.1.1.0"; - sha256 = "0zan47md9zivzc1gd1j1g0200n8d0ffx4dcmkd9vriqjsdwhqvl5"; - revision = "2"; - editedCabalFile = "1axn8xmnrk42j1b8bxykbrqjy1ia0ajg27jirjb2gix1vvvpxb1d"; + version = "0.1.1.1"; + sha256 = "0fvf26394rpn9g4f3rp13bq8rrhzs9d95k7nbcpayzml2j9rsv3l"; libraryHaskellDepends = [ base Cabal chs-deps ]; description = "Cabal with c2hs dependencies"; license = lib.licenses.bsd3; @@ -58025,8 +58095,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.4.0"; - sha256 = "0f9v482xarv91d4bpffyjam4l16qq21z2q2vycpdjb5ximinwdv7"; + version = "0.4.2"; + sha256 = "1y8pg8siz4myia38bbyzaibargkjbsls57i9n79w0z63kqij6wn4"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -59305,6 +59375,71 @@ self: { license = lib.licenses.bsd3; }) {}; + "comfort-array_0_5_1" = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, deepseq + , doctest-exitcode-stdio, doctest-lib, guarded-allocation + , non-empty, prelude-compat, primitive, QuickCheck, semigroups + , storable-record, storablevector, tagged, transformers, utility-ht + }: + mkDerivation { + pname = "comfort-array"; + version = "0.5.1"; + sha256 = "0kx4z07a15jrc3dzaxx1335j1wxkgkajmyiraf5wb18l3xyd36b4"; + libraryHaskellDepends = [ + base containers deepseq guarded-allocation non-empty prelude-compat + primitive QuickCheck semigroups storable-record storablevector + tagged transformers utility-ht + ]; + testHaskellDepends = [ + base ChasingBottoms containers doctest-exitcode-stdio doctest-lib + QuickCheck tagged + ]; + description = "Arrays where the index type is a function of the shape type"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "comfort-array-shape" = callPackage + ({ mkDerivation, base, ChasingBottoms, comfort-array, containers + , doctest-exitcode-stdio, doctest-lib, fixed-length, non-empty + , QuickCheck, tagged, tfp, utility-ht + }: + mkDerivation { + pname = "comfort-array-shape"; + version = "0.0"; + sha256 = "0caw0d9566qi9difgprfg3g9yqfiks2ycqjbr7wx7xcplagqdcn7"; + libraryHaskellDepends = [ + base comfort-array fixed-length non-empty tfp utility-ht + ]; + testHaskellDepends = [ + base ChasingBottoms comfort-array containers doctest-exitcode-stdio + doctest-lib fixed-length QuickCheck tagged tfp + ]; + doHaddock = false; + description = "Additional shape types for the comfort-array package"; + license = lib.licenses.bsd3; + }) {}; + + "comfort-fftw" = callPackage + ({ mkDerivation, base, comfort-array, deepseq + , doctest-exitcode-stdio, doctest-lib, fftw-ffi, netlib-ffi + , non-empty, QuickCheck, storable-record + }: + mkDerivation { + pname = "comfort-fftw"; + version = "0.0"; + sha256 = "1g43fj1wmzdsfqz9axrq35bp2ad2900zcqvf9b2w57k3pl2cdk65"; + libraryHaskellDepends = [ + base comfort-array deepseq fftw-ffi netlib-ffi QuickCheck + ]; + testHaskellDepends = [ + base comfort-array deepseq doctest-exitcode-stdio doctest-lib + netlib-ffi non-empty QuickCheck storable-record + ]; + description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array"; + license = lib.licenses.bsd3; + }) {}; + "comfort-graph" = callPackage ({ mkDerivation, base, containers, QuickCheck, semigroups , transformers, utility-ht @@ -59398,16 +59533,21 @@ self: { }) {}; "commander-cli" = callPackage - ({ mkDerivation, base, bytestring, commandert, containers, mtl - , text, unordered-containers + ({ mkDerivation, base, bytestring, commandert, containers + , directory, mtl, process, text, unordered-containers }: mkDerivation { pname = "commander-cli"; - version = "0.10.1.2"; - sha256 = "0hkz657j9rpmda1rr4v7696216xxwjwpzgc5npg5ajhdk74w1vz0"; + version = "0.10.2.0"; + sha256 = "1cp7g04ag1pkcqlckpzxfq3x4vw7yd6v9vzhhp228pjc1f36iqgx"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring commandert containers mtl text unordered-containers ]; + executableHaskellDepends = [ + base commandert directory mtl process text + ]; testHaskellDepends = [ base commandert text unordered-containers ]; description = "A command line argument/option parser library"; license = lib.licenses.mit; @@ -59417,8 +59557,8 @@ self: { ({ mkDerivation, base, hspec, mtl }: mkDerivation { pname = "commandert"; - version = "0.1.0.0"; - sha256 = "0r4qkiw4jzqjkzcimpm6adwq56gj31sqrm0cjddhlwskjbp73g71"; + version = "0.1.1.0"; + sha256 = "0li8ja7j8386k5j7l6vczq3g74bnj0qrz4n4f1hkgf82sg333jxz"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec mtl ]; description = "A monad for commanders"; @@ -60326,8 +60466,8 @@ self: { pname = "composite-dhall"; version = "0.0.1.0"; sha256 = "1hhy3incp4j8n0c8jyk12qi9zgxmwqpvb08zhc8rql855g88rpfq"; - revision = "2"; - editedCabalFile = "16ki1iii379yn1qwxs76qfjm4wvkysdm15b60m24v1gz1vkxidhi"; + revision = "3"; + editedCabalFile = "0c6mim2i1bzdnm19cglm01i6kf0yka8i5nwjl7wcczvqy27fqlrz"; libraryHaskellDepends = [ base composite-base dhall lens text ]; description = "Dhall instances for composite records"; license = lib.licenses.mit; @@ -102551,8 +102691,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.2.0.0"; - sha256 = "0x58s2ip5p59vpx1x6lwdq46vxjfx6b28yzxjpd9pb148x787yfd"; + version = "0.3.0.0"; + sha256 = "129pcvbyp416gimqva8s368kq64sp17lsyxr2z6j6qbif2xl9pcy"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -110301,23 +110441,24 @@ self: { }) {}; "gotyno-hs" = callPackage - ({ mkDerivation, base, fsnotify, hspec, megaparsec + ({ mkDerivation, aeson, base, fsnotify, hspec, megaparsec , optparse-applicative, pretty-show, rio, text }: mkDerivation { pname = "gotyno-hs"; - version = "1.0.2"; - sha256 = "1jn6bi0c5ciqw8lsd331mww47mz5qy3bb3672gk00q4pvyl7idkr"; + version = "1.1.0"; + sha256 = "06iyihagbsxddn2lq26razb5q6j3g4mwb134lb62caw3r7iyxfd7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base fsnotify megaparsec pretty-show rio text + aeson base fsnotify megaparsec pretty-show rio text ]; executableHaskellDepends = [ - base fsnotify megaparsec optparse-applicative pretty-show rio text + aeson base fsnotify megaparsec optparse-applicative pretty-show rio + text ]; testHaskellDepends = [ - base fsnotify hspec megaparsec pretty-show rio text + aeson base fsnotify hspec megaparsec pretty-show rio text ]; description = "A type definition compiler supporting multiple output languages"; license = lib.licenses.bsd2; @@ -131862,6 +132003,34 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hmm-lapack_0_4_1" = callPackage + ({ mkDerivation, base, comfort-array, comfort-array-shape + , containers, deepseq, doctest-exitcode-stdio, doctest-lib + , explicit-exception, fixed-length, lapack, lazy-csv, netlib-ffi + , non-empty, prelude-compat, QuickCheck, random, semigroups, tfp + , transformers, utility-ht + }: + mkDerivation { + pname = "hmm-lapack"; + version = "0.4.1"; + sha256 = "0m0axils10dr49b7ag8cnfnlwb9va6ng615hhbpqw81kir6avq6z"; + libraryHaskellDepends = [ + base comfort-array comfort-array-shape containers deepseq + explicit-exception fixed-length lapack lazy-csv netlib-ffi + non-empty prelude-compat random semigroups tfp transformers + utility-ht + ]; + testHaskellDepends = [ + base comfort-array comfort-array-shape containers deepseq + doctest-exitcode-stdio doctest-lib fixed-length lapack non-empty + QuickCheck random tfp utility-ht + ]; + doHaddock = false; + description = "Hidden Markov Models using LAPACK primitives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hmp3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, mersenne-random, ncurses, old-time, pcre-light @@ -136985,6 +137154,54 @@ self: { license = lib.licenses.lgpl3Only; }) {}; + "hscim" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring + , case-insensitive, email-validate, hashable, hedgehog, hspec + , hspec-discover, hspec-expectations, hspec-wai, http-api-data + , http-media, http-types, hw-hspec-hedgehog, list-t, microlens + , mmorph, mtl, network-uri, retry, scientific, servant + , servant-server, stm, stm-containers, string-conversions + , template-haskell, text, time, unordered-containers, uuid, wai + , wai-extra, warp + }: + mkDerivation { + pname = "hscim"; + version = "0.3.4"; + sha256 = "0jyb630gsbiw7zy043mqh9i86nj19y0gn0mgs9hvh21h8xfp6xvj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-qq attoparsec base bytestring case-insensitive + email-validate hashable hedgehog hspec hspec-expectations hspec-wai + http-api-data http-media http-types hw-hspec-hedgehog list-t + microlens mmorph mtl network-uri retry scientific servant + servant-server stm stm-containers string-conversions + template-haskell text time unordered-containers uuid wai wai-extra + warp + ]; + executableHaskellDepends = [ + aeson aeson-qq attoparsec base bytestring case-insensitive + email-validate hashable hedgehog hspec hspec-expectations hspec-wai + http-api-data http-media http-types hw-hspec-hedgehog list-t + microlens mmorph mtl network-uri retry scientific servant + servant-server stm stm-containers string-conversions + template-haskell text time unordered-containers uuid wai wai-extra + warp + ]; + testHaskellDepends = [ + aeson aeson-qq attoparsec base bytestring case-insensitive + email-validate hashable hedgehog hspec hspec-expectations hspec-wai + http-api-data http-media http-types hw-hspec-hedgehog list-t + microlens mmorph mtl network-uri retry scientific servant + servant-server stm stm-containers string-conversions + template-haskell text time unordered-containers uuid wai wai-extra + warp + ]; + testToolDepends = [ hspec-discover ]; + description = "hscim json schema and server implementation"; + license = lib.licenses.agpl3Only; + }) {}; + "hsclock" = callPackage ({ mkDerivation, base, cairo, glib, gtk, old-time }: mkDerivation { @@ -149397,6 +149614,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "interpolation_0_1_1_2" = callPackage + ({ mkDerivation, array, base, containers, doctest-exitcode-stdio + , doctest-lib, QuickCheck, utility-ht + }: + mkDerivation { + pname = "interpolation"; + version = "0.1.1.2"; + sha256 = "0y61hwm4xfa1wna4xk61c5p3b3z8i589lz6cxkk2pbaifydccxy0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base utility-ht ]; + testHaskellDepends = [ + array base containers doctest-exitcode-stdio doctest-lib QuickCheck + utility-ht + ]; + description = "piecewise linear and cubic Hermite interpolation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "interpolator" = callPackage ({ mkDerivation, aeson, base, containers, either, hspec , mono-traversable, mtl, product-profunctors, profunctors @@ -156219,8 +156456,8 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.0.0"; - sha256 = "05h4dp27sp23ihmr8hvflqr1bqyf590s607sxl9vc1k46k9hc179"; + version = "0.1.0.1"; + sha256 = "1hvrnyw1m03v36xyak514a4v0l2jrwz7mr5k3jqzdmab4srz887s"; libraryHaskellDepends = [ adjunctions base binary bytestring cryptohash-md5 derive-storable derive-storable-plugin distributive foldl geomancy GLFW-b ktx-codec @@ -156235,13 +156472,15 @@ self: { }) {}; "keid-geometry" = callPackage - ({ mkDerivation, base, geomancy, keid-core, rio, rio-app, vulkan }: + ({ mkDerivation, base, geomancy, keid-core, mtl, rio, rio-app + , vector, vulkan + }: mkDerivation { pname = "keid-geometry"; - version = "0.1.0.0"; - sha256 = "1bhmxgbza1l9qr25g8ad31j70z1dmvsa5gd05fgpwha9liixahsc"; + version = "0.1.0.1"; + sha256 = "0cnvgkqcc4nqvsbm9h6kn1l3sgs7dlhcb7iq6z18ynwry8z510w0"; libraryHaskellDepends = [ - base geomancy keid-core rio rio-app vulkan + base geomancy keid-core mtl rio rio-app vector vulkan ]; description = "Geometry primitives for Keid engine"; license = lib.licenses.bsd3; @@ -156251,19 +156490,19 @@ self: { "keid-render-basic" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cryptohash-md5 , derive-storable, derive-storable-plugin, foldl, geomancy, GLFW-b - , keid-core, neat-interpolation, resourcet, rio, rio-app, tagged - , text, unliftio, vector, vulkan, vulkan-utils + , keid-core, keid-geometry, neat-interpolation, resourcet, rio + , rio-app, tagged, text, unliftio, vector, vulkan, vulkan-utils , VulkanMemoryAllocator, zstd }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.0.0"; - sha256 = "1rjvf5bxh3llfq1pd9hwy8laida9rhw4f49ca5hn69cnpchpngmy"; + version = "0.1.1.0"; + sha256 = "0j8474chg9qbknj71nd288h8r5652rk55vax7y5nzm5qznbirg1b"; libraryHaskellDepends = [ aeson base binary bytestring cryptohash-md5 derive-storable derive-storable-plugin foldl geomancy GLFW-b keid-core - neat-interpolation resourcet rio rio-app tagged text unliftio - vector vulkan vulkan-utils VulkanMemoryAllocator zstd + keid-geometry neat-interpolation resourcet rio rio-app tagged text + unliftio vector vulkan vulkan-utils VulkanMemoryAllocator zstd ]; description = "Basic rendering programs for Keid engine"; license = lib.licenses.bsd3; @@ -160116,6 +160355,37 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lapack_0_4" = callPackage + ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms + , comfort-array, comfort-array-shape, data-ref, deepseq + , doctest-exitcode-stdio, fixed-length, guarded-allocation, hyper + , lapack-ffi, lazyio, monoid-transformer, netlib-ffi, non-empty + , QuickCheck, quickcheck-transformer, random, semigroups, Stream + , tagged, text, tfp, transformers, unique-logic-tf, utility-ht + }: + mkDerivation { + pname = "lapack"; + version = "0.4"; + sha256 = "138vy9nxvqlv2lkgq5i9fkyf6140vw6pk60374vjcgv2h8hkkbqd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blas-ffi blaze-html boxes comfort-array comfort-array-shape + deepseq fixed-length guarded-allocation hyper lapack-ffi lazyio + netlib-ffi non-empty semigroups Stream tagged text tfp transformers + utility-ht + ]; + testHaskellDepends = [ + base ChasingBottoms comfort-array comfort-array-shape data-ref + doctest-exitcode-stdio monoid-transformer netlib-ffi non-empty + QuickCheck quickcheck-transformer random semigroups tfp + transformers unique-logic-tf utility-ht + ]; + description = "Numerical Linear Algebra using LAPACK"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lapack-carray" = callPackage ({ mkDerivation, base, carray, lapack-ffi, netlib-carray , netlib-ffi, storable-complex, transformers @@ -160150,6 +160420,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lapack-comfort-array_0_0_1" = callPackage + ({ mkDerivation, base, comfort-array, lapack-ffi + , netlib-comfort-array, netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "lapack-comfort-array"; + version = "0.0.1"; + sha256 = "1p4vfw95qnd48cbizncb7b7fgzkxbv7r3rp3ffw6r11wymhm67q0"; + libraryHaskellDepends = [ + base comfort-array lapack-ffi netlib-comfort-array netlib-ffi + storable-complex transformers + ]; + description = "Auto-generated interface to Fortran LAPACK via comfort-array"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lapack-ffi" = callPackage ({ mkDerivation, base, liblapack, netlib-ffi }: mkDerivation { @@ -164383,6 +164670,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "linear-circuit_0_1_0_3" = callPackage + ({ mkDerivation, base, comfort-array, comfort-graph, containers + , lapack, netlib-ffi, non-empty, QuickCheck, transformers + , utility-ht + }: + mkDerivation { + pname = "linear-circuit"; + version = "0.1.0.3"; + sha256 = "0nffl1sq273ndfsnfhbblbxmnh53v0b8p6hgd3d3lbnypksh7bkk"; + libraryHaskellDepends = [ + base comfort-array comfort-graph containers lapack netlib-ffi + transformers utility-ht + ]; + testHaskellDepends = [ + base comfort-graph containers non-empty QuickCheck transformers + utility-ht + ]; + description = "Compute resistance of linear electrical circuits"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-code" = callPackage ({ mkDerivation, base, containers, data-default , ghc-typelits-knownnat, ghc-typelits-natnormalise, HaskellForMaths @@ -168643,22 +168952,22 @@ self: { license = lib.licenses.mit; }) {}; - "lsp-types_1_3_0_0" = callPackage + "lsp-types_1_3_0_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum-template, Diff, directory - , dlist, filepath, hashable, hslogger, lens, mtl, network-uri - , rope-utf16-splay, scientific, some, template-haskell, temporary - , text, unordered-containers + , data-default, deepseq, dependent-sum, dependent-sum-template + , Diff, directory, dlist, filepath, hashable, hslogger, lens, mtl + , network-uri, rope-utf16-splay, scientific, some, template-haskell + , temporary, text, unordered-containers }: mkDerivation { pname = "lsp-types"; - version = "1.3.0.0"; - sha256 = "1v897kp5ian8cwpkh23fdn3f1ysk72vs2ks26b7v9mc7dca0x0sc"; + version = "1.3.0.1"; + sha256 = "05zgd99y7xnxnydisq5x24n1af2isar172p247hb5q0mp12hdd3z"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq - dependent-sum-template Diff directory dlist filepath hashable - hslogger lens mtl network-uri rope-utf16-splay scientific some - template-haskell temporary text unordered-containers + dependent-sum dependent-sum-template Diff directory dlist filepath + hashable hslogger lens mtl network-uri rope-utf16-splay scientific + some template-haskell temporary text unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; @@ -170218,6 +170527,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "magico_0_0_2_2" = callPackage + ({ mkDerivation, base, comfort-array, lapack, transformers + , utility-ht + }: + mkDerivation { + pname = "magico"; + version = "0.0.2.2"; + sha256 = "17mpxfw6y1swk0d8dksr71qvagrgmw38xj585dz0s0zwn4y73bzx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base comfort-array lapack transformers utility-ht + ]; + description = "Compute solutions for Magico puzzle"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "magma" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, profunctors, semigroups }: @@ -173617,6 +173944,8 @@ self: { pname = "megaparsec"; version = "9.1.0"; sha256 = "0rbs0nwr3ffhn10gl9sxqd2q8n6pn96ggf0dyz23myfskzar1fn1"; + revision = "1"; + editedCabalFile = "0aw0kvx744730h232rw23yh8ds07irc2ywv5i5iacgqyrh48mvzj"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -185844,6 +186173,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "netlib-comfort-array_0_0_0_2" = callPackage + ({ mkDerivation, base, comfort-array, netlib-ffi, transformers }: + mkDerivation { + pname = "netlib-comfort-array"; + version = "0.0.0.2"; + sha256 = "1mwgdll9m0ryy5y1385sx2asff98kqfkz4bif8s4i0dkrqalsfx4"; + libraryHaskellDepends = [ + base comfort-array netlib-ffi transformers + ]; + description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "netlib-ffi" = callPackage ({ mkDerivation, base, guarded-allocation, storable-complex , transformers @@ -196473,8 +196816,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.4.4"; - sha256 = "17kwyqwywnj694b30bs3da4pns73jp7pr2jxpc7zy261gmfqvpyz"; + version = "0.4.5"; + sha256 = "0r8pw2zy6yckizy9hrwg3kpg6f9v0dkj0fxw873sxpc4ccz5nkl0"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -198838,8 +199181,8 @@ self: { pname = "path-io"; version = "1.6.3"; sha256 = "1dnc48hf8x83p0jy05qi8j8gmfmsy50swnql9ssdv74lsryp615n"; - revision = "1"; - editedCabalFile = "0hzpwyxyj332mq09vgf06vfsga9b0q711fr52x3xswcmhvvsv60g"; + revision = "3"; + editedCabalFile = "0rsr9r2175lf7zcz2sns0mhxkvl21pm50sjidjq5v75nalrsw6rp"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -202304,8 +202647,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.5.1.0"; - sha256 = "0ahgkbrh0rsi7ykz9mai1fsmb367a39nviwpqy71qf3gsz8znwyw"; + version = "0.5.2.0"; + sha256 = "05l2nj9rwz0cl3ig8ysi49jjhs7fngfww1rg10klrlg19whwf24j"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity properties for the text"; license = lib.licenses.mit; @@ -206471,6 +206814,8 @@ self: { pname = "polysemy-extra"; version = "0.2.0.0"; sha256 = "0w8spy9l66ys1x9riwy8cwvywzqxkcbhzrqyia85jgl6mgp96zis"; + revision = "1"; + editedCabalFile = "0j44rqp13n5hxl0kx06hhliwmsqxl81jrcylsk7h8khjqmphgsn7"; libraryHaskellDepends = [ base containers polysemy polysemy-kvstore ]; @@ -206487,6 +206832,8 @@ self: { pname = "polysemy-fs"; version = "0.1.0.0"; sha256 = "16lf6a5ypf5injdl8aljrnrdrfz21b0rhcmypx5ngvw1k2mgh6zl"; + revision = "1"; + editedCabalFile = "0cbplvbx35q3h4ln9ldyk8yvx1c4sgbybbm02frf8nlp1khxji0w"; libraryHaskellDepends = [ base bytestring path polysemy rio temporary text unliftio-path ]; @@ -206582,6 +206929,8 @@ self: { pname = "polysemy-kvstore-jsonfile"; version = "0.1.1.0"; sha256 = "1aibvhr6fsz4d02rj74pa0hwhkqzmxbp64gxf5r3q6l67ij2faw3"; + revision = "1"; + editedCabalFile = "18yk8l7rca4nhgk0iw42smv9n43z467dpynl05qw97w9ip1gsxj5"; libraryHaskellDepends = [ aeson base containers exceptions extra path polysemy polysemy-kvstore unliftio-path @@ -206667,6 +207016,8 @@ self: { pname = "polysemy-methodology"; version = "0.2.1.0"; sha256 = "17md6l5smy1ssn99kij6rnb42bx3fx8h49z85cm9sf41k6lb5k1g"; + revision = "1"; + editedCabalFile = "1sn9447cxpxmw1jkijbv2039xv3ya08mdgd7kmrwp8ljzj1922ni"; libraryHaskellDepends = [ base polysemy polysemy-kvstore polysemy-several ]; @@ -206683,6 +207034,8 @@ self: { pname = "polysemy-methodology-co-log"; version = "0.1.0.0"; sha256 = "1pvvb83lkpxqni6055y3s0ckjg50nd1jfivq1c8701zjv31ylbpa"; + revision = "1"; + editedCabalFile = "1b617fpgnzxykdhz2fp9syzzzhppi3cmkrwwfd1ar9jijqwfcdx4"; libraryHaskellDepends = [ base co-log-polysemy polysemy polysemy-methodology polysemy-plugin ]; @@ -206699,6 +207052,8 @@ self: { pname = "polysemy-methodology-composite"; version = "0.1.4.0"; sha256 = "014kfaxxi24n99gvrvf9c6c8cx8csbb9a8fbfb2md5g2d2q4v08g"; + revision = "1"; + editedCabalFile = "1vf5l2c3k370x0rl4js2hfrc0z434zzkgbkgnhjixbkbqcq2ig2p"; libraryHaskellDepends = [ base composite-base polysemy polysemy-extra polysemy-methodology polysemy-vinyl vinyl @@ -206742,6 +207097,8 @@ self: { pname = "polysemy-path"; version = "0.2.1.0"; sha256 = "0smaai432vpqci9w7pyg443kcd1rpz7zpwww2wcxbyqszzllbhnr"; + revision = "1"; + editedCabalFile = "0x9b1zm804bnmjs0qbrx23s1mzgb6h9dqfchf8i3ri7x1sy24ibh"; libraryHaskellDepends = [ base path polysemy polysemy-extra ]; description = "Polysemy versions of Path functions"; license = lib.licenses.mit; @@ -206856,6 +207213,8 @@ self: { pname = "polysemy-several"; version = "0.1.0.0"; sha256 = "1mw6a6fz3879yqnpq6h0221i8b8f05j90b1zydhzr57nsbklxzps"; + revision = "1"; + editedCabalFile = "0d0632ayig8f66604ncad7y4gjlxsss9awlscxd5hsa2r49l4m7q"; libraryHaskellDepends = [ base polysemy ]; description = "Run several effects at once, taken from the polysemy-zoo"; license = lib.licenses.mit; @@ -206868,6 +207227,8 @@ self: { pname = "polysemy-socket"; version = "0.0.2.0"; sha256 = "0465sax3927cig1plbdyhifx1xipai68w01085mvslvd6am9mz6y"; + revision = "1"; + editedCabalFile = "05wxllpppxmzagf3zp80jm3vzdika9jcrd5bjvb7pasvxsg1rln4"; libraryHaskellDepends = [ base bytestring polysemy socket ]; description = "Socket effect for polysemy"; license = lib.licenses.mit; @@ -206929,6 +207290,8 @@ self: { pname = "polysemy-uncontrolled"; version = "0.1.1.0"; sha256 = "08q69sn1ac4xhpffiabayw2l5j1jy9iz1y37ww84kx32njas9c2b"; + revision = "1"; + editedCabalFile = "09j8fw0m1i0zp33v7pg3g2550blwajksvwbfnqq1slhmbyigd2jr"; libraryHaskellDepends = [ base polysemy polysemy-methodology ]; description = "Uncontrolled toy effect for polysemy"; license = lib.licenses.mit; @@ -206944,6 +207307,8 @@ self: { pname = "polysemy-video"; version = "0.2.0.1"; sha256 = "1lbjjq6q3i6v41ssqy69p4iwvybidrmxcxwjzddbxcrmymr0rmlc"; + revision = "1"; + editedCabalFile = "0bz6zb6zn1q4swj2szzrjakjm8qfmzasin6fgpz01g5m2payfc3c"; libraryHaskellDepends = [ base formatting path path-formatting polysemy simple-media-timestamp simple-media-timestamp-formatting text @@ -206962,6 +207327,8 @@ self: { pname = "polysemy-vinyl"; version = "0.1.5.0"; sha256 = "06y91nv2fcis058gqv5hlpl5a6kmia5r9sc6npp6102lc19vkkc4"; + revision = "1"; + editedCabalFile = "13f289dxr03habyggn3vl7lzrl2r3a9r0y0bisrfmq48qaiv08n1"; libraryHaskellDepends = [ base polysemy polysemy-extra polysemy-several vinyl ]; @@ -223801,8 +224168,8 @@ self: { pname = "req"; version = "3.9.1"; sha256 = "0468ah4142jrqp5l3pw4izrw6f6kznisan888b30jhif4c6xncr0"; - revision = "2"; - editedCabalFile = "15mlnrkm3nbjvzpd81fs4bjk8yibk4cm2qcim5ymilas9zpiglm3"; + revision = "3"; + editedCabalFile = "0xx161kb3j1givixs489yhd6zgiscajbn6hdkf00pdkwqdy59k75"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -224134,6 +224501,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "resistor-cube_0_0_1_3" = callPackage + ({ mkDerivation, base, comfort-array, lapack }: + mkDerivation { + pname = "resistor-cube"; + version = "0.0.1.3"; + sha256 = "1i96s6x3xzs3jxk00fakfjk4jvfr700gfh56jgzqj4w49pdf09k4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base comfort-array lapack ]; + description = "Compute total resistance of a cube of resistors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "resolv_0_1_1_2" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring , containers, directory, filepath, tasty, tasty-hunit @@ -224328,6 +224709,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "resourcet_1_2_4_3" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , primitive, transformers, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.2.4.3"; + sha256 = "0zrvnikw1a0r2j59k12fxikyrg0ki5a7xhqhjgfl9h6dqpz54h85"; + libraryHaskellDepends = [ + base containers exceptions mtl primitive transformers unliftio-core + ]; + testHaskellDepends = [ base exceptions hspec transformers ]; + description = "Deterministic allocation and freeing of scarce resources"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "resourcet-pool" = callPackage ({ mkDerivation, base, resource-pool, resourcet }: mkDerivation { @@ -237646,6 +238044,8 @@ self: { pname = "shake-cabal"; version = "0.2.2.1"; sha256 = "1vyz95qa5f6k0lqf24w60dmlszs1sv0sqv2p0sncn8ll7g785sx1"; + revision = "1"; + editedCabalFile = "04b9kd2jaim8qsgpji4xv7c9kmbfw089zla877qr67kvfwp6qy6m"; libraryHaskellDepends = [ base binary Cabal composition-prelude deepseq directory filepath hashable shake @@ -237874,6 +238274,8 @@ self: { pname = "shake-plus"; version = "0.3.4.0"; sha256 = "0022npwhvzlpz6d6xl75kx0f7ydr8fqqcy04zkv70gwsv0gp5zbm"; + revision = "1"; + editedCabalFile = "1az2234agrza3qhsd400bw94qj3dcxjh3fi0aq24ihbm8yx1a21s"; libraryHaskellDepends = [ base extra path rio shake ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = lib.licenses.mit; @@ -244950,6 +245352,30 @@ self: { broken = true; }) {softfloat = null;}; + "solana-staking-csvs" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, cmdargs + , hedgehog, mtl, req, scientific, tasty, tasty-hedgehog + , tasty-hunit, text, time + }: + mkDerivation { + pname = "solana-staking-csvs"; + version = "0.1.0.0"; + sha256 = "1rswlfanbkh6k3f8dnnlrh9wbk8qbi87c61bi30ndw7gndf3gyqj"; + revision = "1"; + editedCabalFile = "0n83h717zi900ph65imqi5z7va00nm492g911m25j0hgnrj0wd06"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cassava cmdargs mtl req scientific text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "Generate CSV Exports of your Solana Staking Rewards"; + license = lib.licenses.bsd3; + }) {}; + "solar" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -245274,22 +245700,21 @@ self: { }) {}; "sound-collage" = callPackage - ({ mkDerivation, array, base, carray, containers, fft, filepath - , numeric-prelude, optparse-applicative, pathtype, sample-frame - , shell-utility, soxlib, storablevector, storablevector-carray + ({ mkDerivation, base, comfort-array, comfort-fftw, containers + , filepath, numeric-prelude, optparse-applicative, pathtype + , sample-frame, shell-utility, soxlib, storablevector , synthesizer-core, temporary, transformers, utility-ht }: mkDerivation { pname = "sound-collage"; - version = "0.2.0.2"; - sha256 = "11rirlg25iawv4shwhvc4bcnzk4axvgk5n7yj05nnbpyx4s6r0pp"; + version = "0.2.1"; + sha256 = "09g63b3k0l30z3lxmcz0zpggqqhnr7m01wh2vpm5v561rbnl8rsi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base carray containers fft filepath numeric-prelude + base comfort-array comfort-fftw containers filepath numeric-prelude optparse-applicative pathtype sample-frame shell-utility soxlib - storablevector storablevector-carray synthesizer-core temporary - transformers utility-ht + storablevector synthesizer-core temporary transformers utility-ht ]; description = "Approximate a song from other pieces of sound"; license = lib.licenses.bsd3; @@ -246508,18 +246933,18 @@ self: { }) {}; "split-record" = callPackage - ({ mkDerivation, base, numeric-prelude, soxlib, storablevector - , synthesizer-core, transformers, utility-ht + ({ mkDerivation, base, numeric-prelude, shell-utility, soxlib + , storablevector, synthesizer-core, transformers, utility-ht }: mkDerivation { pname = "split-record"; - version = "0.1.1.3"; - sha256 = "0ydsdf2pk8gzcqriqm6pv7him55qz62ycfqxjm8qhpy1k8i3ipqj"; + version = "0.1.1.4"; + sha256 = "0yjmyanwzxvz43ry5ypg9d65yp1yplpwczzwhxmy221nrm2wfch4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base numeric-prelude soxlib storablevector synthesizer-core - transformers utility-ht + base numeric-prelude shell-utility soxlib storablevector + synthesizer-core transformers utility-ht ]; description = "Split a big audio file into pieces at positions of silence"; license = lib.licenses.bsd3; @@ -249777,8 +250202,8 @@ self: { }: mkDerivation { pname = "stm-actor"; - version = "0.2.3.0"; - sha256 = "0982wj1lnxs7jv35hrkjpp539x3nn5hrwm652i1xbvmmy4i2k41p"; + version = "0.2.3.1"; + sha256 = "1gl4hladndwbjdb02hcb5mdirm9gnz23ayclh0wws8xsq23dv2b4"; libraryHaskellDepends = [ base mtl stm stm-queue transformers unliftio-core ]; @@ -253415,12 +253840,12 @@ self: { }) {}; "summer" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, base, generics-sop, vector }: mkDerivation { pname = "summer"; - version = "0.1.2.0"; - sha256 = "1xcfw3f4y53a9jdj2a7jy32pp5pcvqsv78gblkjj1bxvsijwa4ab"; - libraryHaskellDepends = [ base vector ]; + version = "0.2.0.1"; + sha256 = "0kxxvifs68gbmh7vdjfcsf1baiih646s9msvd5rh7hrbr8n14w5l"; + libraryHaskellDepends = [ base generics-sop vector ]; testHaskellDepends = [ base ]; description = "An implementation of extensible products and sums"; license = lib.licenses.mit; @@ -255952,6 +256377,8 @@ self: { pname = "synthesizer-alsa"; version = "0.5.0.5"; sha256 = "09nf2c7nc5dbrd8nskmjrxz8fynnacbnml2wcf5p5qghq2dcd6ma"; + revision = "1"; + editedCabalFile = "0acwdxdi8wj63x6f3vcm366hm9liyjbm0czv4mwmm9ryrnc36sc6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -255981,6 +256408,8 @@ self: { pname = "synthesizer-core"; version = "0.8.2.1"; sha256 = "1sdvqabxlgiqqb3kppxwyvmkmvcqrmrzicbmcmy6mr5c4npjxffj"; + revision = "1"; + editedCabalFile = "1c3l83qrdn3nxpp0gsr06iz9praw37c2j9zjj15pxd8in73mb74a"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -257842,8 +258271,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.11.1"; - sha256 = "1rznf0dw7wypb3al3g3k5r8w837p9dmkjzma5zwvhq5wnr9yppsg"; + version = "1.11.2"; + sha256 = "0ycv054gh28c5llyfjvsdbyq1w5jhj25b9zphj2kya0jnvpkmm81"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259201,6 +259630,8 @@ self: { pname = "techlab"; version = "0.1.1.0"; sha256 = "1139slr5pd03zr7w6m3mw625wkfd9jw8slqddgmbawpbi2z20p80"; + revision = "1"; + editedCabalFile = "09y7yymfgvrj28d7k2a4lqkwrif0wr6pp028kzcsj2i4k9b4krdg"; libraryHaskellDepends = [ base chassis co-log-polysemy composite-base containers dhall formatting optics path-dhall-instance polysemy polysemy-extra @@ -266583,8 +267014,8 @@ self: { ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { pname = "tophat"; - version = "1.0.1.0"; - sha256 = "0q00lrv02pmy5zgnqciwaj87hs7daraj6pvcz9hm93djk6cgs5fn"; + version = "1.0.3.0"; + sha256 = "07ph3jh84wq9373kzw5xv4gzk2wcq9dj5akw5a79lhzphl9py7w0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors text ]; @@ -278274,6 +278705,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "vessel" = callPackage + ({ mkDerivation, aeson, aeson-gadt-th, base, bifunctors + , constraints, constraints-extras, containers, dependent-map + , dependent-monoidal-map, dependent-sum + , dependent-sum-aeson-orphans, dependent-sum-template, lens + , markdown-unlit, monoidal-containers, mtl, patch, reflex + , semialign, text, these, witherable + }: + mkDerivation { + pname = "vessel"; + version = "0.1.0.0"; + sha256 = "0j6i2xgb9yahyw5ab15gg5qy5dphkblkcn1p629dm800759njy1s"; + libraryHaskellDepends = [ + aeson aeson-gadt-th base bifunctors constraints constraints-extras + containers dependent-map dependent-monoidal-map dependent-sum + dependent-sum-aeson-orphans dependent-sum-template lens + markdown-unlit monoidal-containers mtl patch reflex semialign text + these witherable + ]; + libraryToolDepends = [ markdown-unlit ]; + doHaddock = false; + description = "Functor-parametric containers"; + license = lib.licenses.bsd3; + }) {}; + "vflow-types" = callPackage ({ mkDerivation, aeson, base, bytestring, ip, json-alt , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes @@ -293509,6 +293965,8 @@ self: { pname = "zip"; version = "1.7.1"; sha256 = "0impiv9xsirbvnpnv1lh6lhnl8a4fqylpjif7niyjjbcvyxh4zqd"; + revision = "1"; + editedCabalFile = "0a8wj2bkg66mhiac2m71n39ynvvcx5ar79ak35fmn1is73z7c5xk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 124d658eff308e678eee5b3b8a514490c18fbee1 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 7 Aug 2021 16:23:10 +0200 Subject: [PATCH 043/375] haskellPackages.{cabal-install, cabal-install-parsers}: use Cabal 3.6.0.0 Try using the latest and greatest version Cabal for cabal-install and cabal-install-parsers, we'll see how it goes. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +- pkgs/top-level/release-haskell.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5ef659349b38..ca4b974449a1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -44,12 +44,12 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_4_0_0; + Cabal = self.Cabal_3_6_0_0; base16-bytestring = self.base16-bytestring_0_1_1_7; }); # cabal-install-parsers is written for Cabal 3.4 - cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_4_0_0; }; + cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_0_0; }; # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 7e495474c84f..cfc19f6b35f4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -58,7 +58,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and random, but an older # version of base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_4_0_0; + Cabal = self.Cabal_3_6_0_0; base16-bytestring = self.base16-bytestring_0_1_1_7; }); diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 5173ec6cb361..400635740eae 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -300,7 +300,7 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = all; - Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ]; + Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ]; cabal2nix-unstable = all; funcmp = all; # Doesn't currently work on ghc-9.0: From 696651e5684cc7a547380509681563c2cd962237 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 20:36:28 +0000 Subject: [PATCH 044/375] fllog: 1.2.6 -> 1.2.7 --- pkgs/applications/radio/fllog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix index b0983c811e12..e762dbe65716 100644 --- a/pkgs/applications/radio/fllog/default.nix +++ b/pkgs/applications/radio/fllog/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "1.2.6"; + version = "1.2.7"; pname = "fllog"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "18nwqbbg5khpkwlr7dn41g6zf7ms2wzxykd42fwdsj4m4z0ysyyg"; + sha256 = "sha256-HxToZ+f1IJgDKGPHBeVuS7rRkh3+KfpyoYPBwfyqsC8="; }; buildInputs = [ From e15ad63acefb7aa27393ee4c7a7863a13806dcf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 23:10:16 +0000 Subject: [PATCH 045/375] flmsg: 4.0.17 -> 4.0.19 --- pkgs/applications/radio/flmsg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index 0f75f704af3d..cb0925019f9c 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.17"; + version = "4.0.19"; pname = "flmsg"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "09xf3f65d3qi69frznf4fdznbfbc7kmgxw716q2c7ccsmh9c5q44"; + sha256 = "sha256-Pm5qAUNbenkX9V3OSQWW09iIRR/WB1jB4ioyRCZmjqs="; }; buildInputs = [ From 67a7f01005321b751a44e07b06a708a3ba165d74 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 8 Aug 2021 04:20:00 +0000 Subject: [PATCH 046/375] buildkit: 0.8.3 -> 0.9.0 https://github.com/moby/buildkit/releases/tag/v0.9.0 --- pkgs/development/tools/buildkit/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index f6eb7aef1ed5..12d35c07db3e 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "buildkit"; - version = "0.8.3"; - - goPackagePath = "github.com/moby/buildkit"; - subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; + version = "0.9.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-dHtGxugTtxHcfZHMIHinlcH05ss7zT/+Ll1WboAhw9o="; + sha256 = "0i04b5ngvhkan45mx6xjcia0dsx0dc6w8bwy90yg3qnz7yzidm2d"; }; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ]; + vendorSha256 = null; + + subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; + + ldflags = [ "-s" "-w" "-X github.com/moby/buildkit/version.Version=${version}" "-X github.com/moby/buildkit/version.Revision=${src.rev}" ]; + + doCheck = false; meta = with lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; From a443496e847ca1def86acd45f06b86c41dc07325 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 8 Aug 2021 07:51:35 +0200 Subject: [PATCH 047/375] meshcentral: 0.8.87 -> 0.8.98 --- pkgs/tools/admin/meshcentral/default.nix | 6 +- pkgs/tools/admin/meshcentral/package.json | 2 +- pkgs/tools/admin/meshcentral/yarn.lock | 180 ++++++++++--------- pkgs/tools/admin/meshcentral/yarn.nix | 208 ++++++++++++---------- 4 files changed, 213 insertions(+), 183 deletions(-) diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 7d87019020ef..0214adb72c3f 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,10 +1,10 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage rec { - version = "0.8.87"; + version = "0.8.98"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-0.8.87.tgz"; - sha256 = "1jb65pvbld83mdjdb4f4z2brqsdh3b1mvnjdhbllcsn35m705cp5"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-0.8.98.tgz"; + sha256 = "0120csvak07mkgaiq4sxyslcipgfgal0mhd8gwywcij2s71a3n26"; }; packageJSON = ./package.json; diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index dec471e7acc9..99125c15e10a 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.8.87", + "version": "0.8.98", "keywords": [ "Remote Device Management", "Remote Device Monitoring", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index 6d2a752857ed..6d00c730024e 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -9,12 +9,12 @@ dependencies: "@babel/highlight" "^7.14.5" -"@babel/generator@^7.14.8", "@babel/generator@^7.4.0": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" - integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== +"@babel/generator@^7.15.0", "@babel/generator@^7.4.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15" + integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ== dependencies: - "@babel/types" "^7.14.8" + "@babel/types" "^7.15.0" jsesc "^2.5.1" source-map "^0.5.0" @@ -48,10 +48,10 @@ dependencies: "@babel/types" "^7.14.5" -"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" - integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== "@babel/highlight@^7.14.5": version "7.14.5" @@ -62,10 +62,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.4.3": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" - integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== +"@babel/parser@^7.14.5", "@babel/parser@^7.15.0", "@babel/parser@^7.4.3": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.0.tgz#b6d6e29058ca369127b0eeca2a1c4b5794f1b6b9" + integrity sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ== "@babel/template@^7.14.5", "@babel/template@^7.4.0": version "7.14.5" @@ -77,26 +77,26 @@ "@babel/types" "^7.14.5" "@babel/traverse@^7.4.3": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce" - integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg== + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98" + integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw== dependencies: "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.8" + "@babel/generator" "^7.15.0" "@babel/helper-function-name" "^7.14.5" "@babel/helper-hoist-variables" "^7.14.5" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.4.0": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728" - integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q== +"@babel/types@^7.14.5", "@babel/types@^7.15.0", "@babel/types@^7.4.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd" + integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ== dependencies: - "@babel/helper-validator-identifier" "^7.14.8" + "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" "@mysql/xdevapi@*": @@ -148,14 +148,27 @@ "@types/node" "*" "@types/node@*": - version "16.4.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.5.tgz#eac95d4e52775190c405f0b9061ddcfb0304f7fc" - integrity sha512-+0GPv/hIFNoy8r5MFf7vRpBjnqNYNrlHdetoy23E7TYc7JB2ctwyi3GMKpviozaHQ/Sy2kBNUTvG9ywN66zV1g== + version "16.4.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz#7dfd9c14661edc65cccd43a29eb454174642370d" + integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg== "@types/node@^14.14.14", "@types/node@^14.14.28": - version "14.17.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.6.tgz#cc61c8361c89e70c468cda464d1fa3dd7e5ebd62" - integrity sha512-iBxsxU7eswQDGhlr3AiamBxOssaYxbM+NKXVil8jg9yFXvrfEFbDumLD/2dMTB+zYyg7w+Xjt8yuxfdbUHAtcQ== + version "14.17.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.9.tgz#b97c057e6138adb7b720df2bd0264b03c9f504fd" + integrity sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g== + +"@types/webidl-conversions@*": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-6.1.1.tgz#e33bc8ea812a01f63f90481c666334844b12a09e" + integrity sha512-XAahCdThVuCFDQLT7R7Pk/vqeObFNL3YqRyFZg+AqAP/W1/w3xHaIxuW7WszQqTbIBOPRcItYJIou3i/mppu3Q== + +"@types/whatwg-url@^8.0.0": + version "8.2.1" + resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.1.tgz#f1aac222dab7c59e011663a0cb0a3117b2ef05d4" + integrity sha512-2YubE1sjj5ifxievI5Ge1sckb9k/Er66HyR2c+3+I6VDUUg1TLPdYYTEbQ+DjRkS4nTxMJhgWfSfMRD2sl2EYQ== + dependencies: + "@types/node" "*" + "@types/webidl-conversions" "*" "@xmpp/base64@^0.9.0": version "0.9.0" @@ -792,9 +805,9 @@ async@^2.0.1: lodash "^4.17.14" async@^3.2.0, async@~3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== + version "3.2.1" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" + integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== asynckit@^0.4.0: version "0.4.0" @@ -1665,9 +1678,9 @@ chalk@^2.0.0: supports-color "^5.3.0" chalk@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -3089,9 +3102,9 @@ globals@^9.18.0: integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== google-auth-library@^7.0.2: - version "7.3.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.3.0.tgz#946a911c72425b05f02735915f03410604466657" - integrity sha512-MPeeMlnsYnoiiVFMwX3hgaS684aiXrSqKoDP+xL4Ejg4Z0qLvIeg4XsaChemyFI8ZUO7ApwDAzNtgmhWSDNh5w== + version "7.5.0" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.5.0.tgz#6b0a623dfb4ee7a8d93a0d25455031d1baf86181" + integrity sha512-iRMwc060kiA6ncZbAoQN90nlwT8jiHVmippofpMgo4YFEyRBaPouyM7+ZB742wKetByyy+TahshVRTx0tEyXGQ== dependencies: arrify "^2.0.0" base64-js "^1.3.0" @@ -3116,9 +3129,9 @@ google-protobuf@3.14.0: integrity sha512-bwa8dBuMpOxg7COyqkW6muQuvNnWgVN8TX/epDRGW5m0jcrmq2QJyCyiV8ZE2/6LaIIqJtiv9bYokFhfpy/o6w== googleapis-common@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.3.tgz#9580944e538029687a4e25726afea4a1a535ac6f" - integrity sha512-8khlXblLyT9UpB+NTZzrWfKQUW6U7gO6WnfJp51WrLgpzP7zkO+OshwtdArq8z2afj37jdrhbIT8eAxZLdwvwA== + version "5.0.4" + resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.4.tgz#d47ba164dce40ff32f35319e56d1d67209ae25c3" + integrity sha512-clr6NSAoIeTrQ/ESl/OmH4uuvPUq4XgiyPAnTIrItOWyM/YKYsXgzpPNkmP6D6LNd/UoTnymcyLNuMPh0ibzXg== dependencies: extend "^3.0.2" gaxios "^4.0.0" @@ -3128,17 +3141,17 @@ googleapis-common@^5.0.2: uuid "^8.0.0" googleapis@*: - version "82.0.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-82.0.0.tgz#26ab303b065c37fc4c9723b703550e62057ea810" - integrity sha512-TytL2h+Cl82RP8ZZ4hgiqOz/ZKWJ5nqn2ZaQ1bNIsIp6z4xuasXyJsgPaZzHADyRx/zNQfRfJGwzRInYJy7X4A== + version "83.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-83.0.0.tgz#045399fe8403d8516add6aa90802dda604fcfe20" + integrity sha512-/xzWnSPfZC6jwoq4bY8gMauGHF2kIbWZJ6bPgMUzI4zUGAhGD7YttHtbZX6Vz/eYIviYaQtL7HIvw5Jnei/TzA== dependencies: google-auth-library "^7.0.2" googleapis-common "^5.0.2" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.9, graceful-fs@^4.2.0: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== grunt-cli@~1.4.2: version "1.4.3" @@ -3992,9 +4005,9 @@ jsdoc2md-stats@^1.0.3: feature-detect-es6 "^1.3.1" jsdom@*: - version "16.6.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac" - integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg== + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== dependencies: abab "^2.0.5" acorn "^8.2.4" @@ -4021,7 +4034,7 @@ jsdom@*: whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.5.0" - ws "^7.4.5" + ws "^7.4.6" xml-name-validator "^3.0.0" jsesc@^1.3.0: @@ -4214,9 +4227,9 @@ ldapauth-fork@*: lru-cache "^6.0.0" ldapjs@^2.2.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.0.tgz#999c85f642216709009dc8728e58ac7793888def" - integrity sha512-3Rbm3CS7vzTccpP1QnzKCEPok60L/b3BFlWU8r93P5oadCAaqCWEH9Td08crPnw4Ti20W8y0+ZKtFFNzxVu4kA== + version "2.3.1" + resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz#04136815fb1f21d692ac87fab5961a04d86e8b04" + integrity sha512-kf0tHHLrpwKaBAQOhYHXgdeh2PkFuCCxWgLb1MRn67ZQVo787D2pij3mmHVZx193GIdM8xcfi8HF6AIYYnj0fQ== dependencies: abstract-logging "^2.0.0" asn1 "^0.2.4" @@ -4656,16 +4669,17 @@ moment-timezone@^0.5.33: integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== mongodb-connection-string-url@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-1.0.1.tgz#1509b44570851f5331f9ca7052b723789d63f8dc" - integrity sha512-sXi8w9nwbMrErWbOK+8nofHz531rboasDbYAMS+sQ+W+2YnHN980RlMr+t5SDL6uKEU/kw/wG6jcjCTLiJltoA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-1.1.0.tgz#0bd769f16aa1767758c119c275ea22bb5110915f" + integrity sha512-g0Qaj4AzIaktWKBkfjMjwzvBzZQN1mtb2DVOTbjdvlaqTa5lGLcnTeh0/9R9mPiIt2lvRGOrDgUdazeP5rD9oA== dependencies: + "@types/whatwg-url" "^8.0.0" whatwg-url "^8.4.0" mongodb@*: - version "4.0.1" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.0.1.tgz#e7fa8de3448492097b3c67a0d980c4816907aa83" - integrity sha512-Ll2YCciRgbFN2jdfSqW1vhxvAcnqu+5ZlrTZNaEg+hZqKREg4xiUV56ZAtTjC02skfoTirHY5jQwtg7mBxqfug== + version "4.1.0" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.1.0.tgz#f491de5d52003f41dffbc6ebfd8b95be21174d63" + integrity sha512-Gx9U9MsFWgJ3E0v4oHAdWvYTGBznNYPCkhmD/3i/kPTY/URnPfHD5/6VoKUFrdgQTK3icFiM9976hVbqCRBO9Q== dependencies: bson "^4.4.0" denque "^1.5.0" @@ -4674,9 +4688,9 @@ mongodb@*: saslprep "^1.0.0" mongodb@^3.3.2: - version "3.6.10" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.10.tgz#f10e990113c86b195c8af0599b9b3a90748b6ee4" - integrity sha512-fvIBQBF7KwCJnDZUnFFy4WqEFP8ibdXeFANnylW19+vOwdjOAvqIzPdsNCEMT6VKTHnYu4K64AWRih0mkFms6Q== + version "3.6.11" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.11.tgz#8a59a0491a92b00a8c925f72ed9d9a5b054aebb2" + integrity sha512-4Y4lTFHDHZZdgMaHmojtNAlqkvddX2QQBEN0K//GzxhGwlI9tZ9R0vhbjr1Decw+TF7qK0ZLjQT292XgHRRQgw== dependencies: bl "^2.2.1" bson "^1.1.4" @@ -4771,9 +4785,9 @@ mysql@*: sqlstring "2.3.1" nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.14.1, nan@^2.14.2: - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" - integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== nanoid@^2.1.0: version "2.1.11" @@ -4864,9 +4878,9 @@ node-rdpjs-2@*: lodash.isnumber "^3.0.3" node-sspi@*: - version "0.2.8" - resolved "https://registry.yarnpkg.com/node-sspi/-/node-sspi-0.2.8.tgz#e4b4245729fa5c579ebcfa9194d491751354963f" - integrity sha512-C9OWJkOu5Syevh/QPJRQ9lyIDcpMb4XMCau2c3z9FNQfWHfJ5Q/4XKX7+ugHRiQHjqh56/NDSxzGAqBMbrQTzg== + version "0.2.9" + resolved "https://registry.yarnpkg.com/node-sspi/-/node-sspi-0.2.9.tgz#5a5aab40a4062dbc95cbdbe61a44df34e91afaaf" + integrity sha512-7wnA8J6HQlqIS6J9B4Ofk1lf/e0tZzrMQYurrYKq46WLUJP9onFnmmedpiTpCwlrtXu4EMeEi+WStIDf9tz1fQ== dependencies: bindings "^1.1.1" node-addon-api "^1.7.1" @@ -5122,9 +5136,9 @@ optimist@^0.6.1, optimist@~0.6.0: wordwrap "~0.0.2" optional-require@^1.0.3: - version "1.1.0" - resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.0.tgz#01dfbafbbc2e8d79e33558f5af3917f22cc35c2c" - integrity sha512-5/7ee3eTFg1P+F9usTubuNCLfWRK6DjV0EFHLlbp7MmV5UlWqpWIVSnH6xo4u+fc5WHXaJuvJi6iuYnfDyj6oQ== + version "1.1.4" + resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.4.tgz#8af7da26b17da76abbf8a1c46e2e148a63813c0e" + integrity sha512-YIabCRxu1Qqlxowh5MBaT8vrvC5fa5QehT4iJw8OthkTC1ZXe7aMxtZHtwnNwJRfFgiqPof2RZeguXo4weS9mA== dependencies: require-at "^1.0.6" @@ -5325,9 +5339,9 @@ passport-reddit@*: pkginfo "0.3.x" passport-saml@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.0.tgz#32f79316c617d223ad03f71f23d2ee3813e34516" - integrity sha512-mLIg3QbVwCOgjDKqWCbAz7Oo/IAwUp5ftloEkecbD/oVYMgVZFDjTFuIA5KJ4LQ8tRVf1o2aTaMlzl6JmYfHiA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.1.tgz#257470003366e06ce3c5738aa64a1209a0f4d7e7" + integrity sha512-45YXn/BUdzMSx27lEmY0EMXck+qgR8jdnsdgNbnG5HNzwGbcSLcTkH5AoULW+6gd5fcG1rcMDtKyIJwTIMJA6A== dependencies: debug "^4.3.1" passport-strategy "^1.0.0" @@ -6355,9 +6369,9 @@ sqlstring@2.3.1: integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= ssh2@*: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.1.0.tgz#43dd24930e15e317687f519d6b40270d9cd00d00" - integrity sha512-CidQLG2ZacoT0Z7O6dOyisj4JdrOrLVJ4KbHjVNz9yI1vO08FAYQPcnkXY9BP8zeYo+J/nBgY6Gg4R7w4WFWtg== + version "1.2.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.2.0.tgz#177a46bb12b7ef2b7bce28bdcbd7eae3cbc50045" + integrity sha512-vklfVRyylayGV/zMwVEkTC9kBhA3t264hoUHV/yGuunBJh6uBGP1VlzhOp8EsqxpKnG0xkLE1qHZlU0+t8Vh6Q== dependencies: asn1 "^0.2.4" bcrypt-pbkdf "^1.0.2" @@ -6712,9 +6726,9 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= twilio@*: - version "3.66.0" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.66.0.tgz#8df54865b16b3b0578826cf4f342542daa1227c4" - integrity sha512-2jek7akXcRMusoR20EWA1+e5TQp9Ahosvo81wTUoeS7H24A1xbVQJV4LfSWQN4DLUY1oZ4d6tH2oCe/+ELcpNA== + version "3.66.1" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.66.1.tgz#8435441ca45b0c7cb3761c4ba3011ca32e75ba69" + integrity sha512-BmIgfx2VuS7tj4IscBhyEj7CdmtfIaaJ1IuNeGoJFYBx5xikpuwkR0Ceo5CNtK5jnN3SCKmxHxToec/MYEXl0A== dependencies: axios "^0.21.1" dayjs "^1.8.29" @@ -7170,7 +7184,7 @@ ws@5.2.3, ws@^5.2.0: dependencies: async-limiter "~1.0.0" -ws@^7.0.0, ws@^7.4.5: +ws@^7.0.0, ws@^7.4.6: version "7.5.3" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix index 94ef1c721885..6e78523b66d6 100644 --- a/pkgs/tools/admin/meshcentral/yarn.nix +++ b/pkgs/tools/admin/meshcentral/yarn.nix @@ -10,11 +10,11 @@ }; } { - name = "_babel_generator___generator_7.14.8.tgz"; + name = "_babel_generator___generator_7.15.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz"; - sha1 = "bf86fd6af96cf3b74395a8ca409515f89423e070"; + name = "_babel_generator___generator_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz"; + sha1 = "a7d0c172e0d814974bad5aa77ace543b97917f15"; }; } { @@ -50,11 +50,11 @@ }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; - sha1 = "32be33a756f29e278a0d644fa08a2c9e0f88a34c"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha1 = "6654d171b2024f6d8ee151bf2509699919131d48"; }; } { @@ -66,11 +66,11 @@ }; } { - name = "_babel_parser___parser_7.14.8.tgz"; + name = "_babel_parser___parser_7.15.0.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz"; - sha1 = "66fd41666b2d7b840bd5ace7f7416d5ac60208d4"; + name = "_babel_parser___parser_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.0.tgz"; + sha1 = "b6d6e29058ca369127b0eeca2a1c4b5794f1b6b9"; }; } { @@ -82,19 +82,19 @@ }; } { - name = "_babel_traverse___traverse_7.14.8.tgz"; + name = "_babel_traverse___traverse_7.15.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz"; - sha1 = "c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"; + name = "_babel_traverse___traverse_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz"; + sha1 = "4cca838fd1b2a03283c1f38e141f639d60b3fc98"; }; } { - name = "_babel_types___types_7.14.8.tgz"; + name = "_babel_types___types_7.15.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz"; - sha1 = "38109de8fcadc06415fbd9b74df0065d4d41c728"; + name = "_babel_types___types_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz"; + sha1 = "61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"; }; } { @@ -154,19 +154,35 @@ }; } { - name = "_types_node___node_16.4.5.tgz"; + name = "_types_node___node_16.4.13.tgz"; path = fetchurl { - name = "_types_node___node_16.4.5.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.4.5.tgz"; - sha1 = "eac95d4e52775190c405f0b9061ddcfb0304f7fc"; + name = "_types_node___node_16.4.13.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz"; + sha1 = "7dfd9c14661edc65cccd43a29eb454174642370d"; }; } { - name = "_types_node___node_14.17.6.tgz"; + name = "_types_node___node_14.17.9.tgz"; path = fetchurl { - name = "_types_node___node_14.17.6.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.6.tgz"; - sha1 = "cc61c8361c89e70c468cda464d1fa3dd7e5ebd62"; + name = "_types_node___node_14.17.9.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.9.tgz"; + sha1 = "b97c057e6138adb7b720df2bd0264b03c9f504fd"; + }; + } + { + name = "_types_webidl_conversions___webidl_conversions_6.1.1.tgz"; + path = fetchurl { + name = "_types_webidl_conversions___webidl_conversions_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-6.1.1.tgz"; + sha1 = "e33bc8ea812a01f63f90481c666334844b12a09e"; + }; + } + { + name = "_types_whatwg_url___whatwg_url_8.2.1.tgz"; + path = fetchurl { + name = "_types_whatwg_url___whatwg_url_8.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.1.tgz"; + sha1 = "f1aac222dab7c59e011663a0cb0a3117b2ef05d4"; }; } { @@ -842,11 +858,11 @@ }; } { - name = "async___async_3.2.0.tgz"; + name = "async___async_3.2.1.tgz"; path = fetchurl { - name = "async___async_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; - sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; + name = "async___async_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz"; + sha1 = "d3274ec66d107a47476a4c49136aacdb00665fc8"; }; } { @@ -1674,11 +1690,11 @@ }; } { - name = "chalk___chalk_4.1.1.tgz"; + name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; - sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; }; } { @@ -3194,11 +3210,11 @@ }; } { - name = "google_auth_library___google_auth_library_7.3.0.tgz"; + name = "google_auth_library___google_auth_library_7.5.0.tgz"; path = fetchurl { - name = "google_auth_library___google_auth_library_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.3.0.tgz"; - sha1 = "946a911c72425b05f02735915f03410604466657"; + name = "google_auth_library___google_auth_library_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.5.0.tgz"; + sha1 = "6b0a623dfb4ee7a8d93a0d25455031d1baf86181"; }; } { @@ -3218,27 +3234,27 @@ }; } { - name = "googleapis_common___googleapis_common_5.0.3.tgz"; + name = "googleapis_common___googleapis_common_5.0.4.tgz"; path = fetchurl { - name = "googleapis_common___googleapis_common_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.3.tgz"; - sha1 = "9580944e538029687a4e25726afea4a1a535ac6f"; + name = "googleapis_common___googleapis_common_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.4.tgz"; + sha1 = "d47ba164dce40ff32f35319e56d1d67209ae25c3"; }; } { - name = "googleapis___googleapis_82.0.0.tgz"; + name = "googleapis___googleapis_83.0.0.tgz"; path = fetchurl { - name = "googleapis___googleapis_82.0.0.tgz"; - url = "https://registry.yarnpkg.com/googleapis/-/googleapis-82.0.0.tgz"; - sha1 = "26ab303b065c37fc4c9723b703550e62057ea810"; + name = "googleapis___googleapis_83.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-83.0.0.tgz"; + sha1 = "045399fe8403d8516add6aa90802dda604fcfe20"; }; } { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; }; } { @@ -4178,11 +4194,11 @@ }; } { - name = "jsdom___jsdom_16.6.0.tgz"; + name = "jsdom___jsdom_16.7.0.tgz"; path = fetchurl { - name = "jsdom___jsdom_16.6.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz"; - sha1 = "f79b3786682065492a3da6a60a4695da983805ac"; + name = "jsdom___jsdom_16.7.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz"; + sha1 = "918ae71965424b197c819f8183a754e18977b710"; }; } { @@ -4410,11 +4426,11 @@ }; } { - name = "ldapjs___ldapjs_2.3.0.tgz"; + name = "ldapjs___ldapjs_2.3.1.tgz"; path = fetchurl { - name = "ldapjs___ldapjs_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.0.tgz"; - sha1 = "999c85f642216709009dc8728e58ac7793888def"; + name = "ldapjs___ldapjs_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz"; + sha1 = "04136815fb1f21d692ac87fab5961a04d86e8b04"; }; } { @@ -4914,27 +4930,27 @@ }; } { - name = "mongodb_connection_string_url___mongodb_connection_string_url_1.0.1.tgz"; + name = "mongodb_connection_string_url___mongodb_connection_string_url_1.1.0.tgz"; path = fetchurl { - name = "mongodb_connection_string_url___mongodb_connection_string_url_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-1.0.1.tgz"; - sha1 = "1509b44570851f5331f9ca7052b723789d63f8dc"; + name = "mongodb_connection_string_url___mongodb_connection_string_url_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-1.1.0.tgz"; + sha1 = "0bd769f16aa1767758c119c275ea22bb5110915f"; }; } { - name = "mongodb___mongodb_4.0.1.tgz"; + name = "mongodb___mongodb_4.1.0.tgz"; path = fetchurl { - name = "mongodb___mongodb_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.0.1.tgz"; - sha1 = "e7fa8de3448492097b3c67a0d980c4816907aa83"; + name = "mongodb___mongodb_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.1.0.tgz"; + sha1 = "f491de5d52003f41dffbc6ebfd8b95be21174d63"; }; } { - name = "mongodb___mongodb_3.6.10.tgz"; + name = "mongodb___mongodb_3.6.11.tgz"; path = fetchurl { - name = "mongodb___mongodb_3.6.10.tgz"; - url = "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.10.tgz"; - sha1 = "f10e990113c86b195c8af0599b9b3a90748b6ee4"; + name = "mongodb___mongodb_3.6.11.tgz"; + url = "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.11.tgz"; + sha1 = "8a59a0491a92b00a8c925f72ed9d9a5b054aebb2"; }; } { @@ -5026,11 +5042,11 @@ }; } { - name = "nan___nan_2.14.2.tgz"; + name = "nan___nan_2.15.0.tgz"; path = fetchurl { - name = "nan___nan_2.14.2.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz"; - sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19"; + name = "nan___nan_2.15.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; + sha1 = "3f34a473ff18e15c1b5626b62903b5ad6e665fee"; }; } { @@ -5138,11 +5154,11 @@ }; } { - name = "node_sspi___node_sspi_0.2.8.tgz"; + name = "node_sspi___node_sspi_0.2.9.tgz"; path = fetchurl { - name = "node_sspi___node_sspi_0.2.8.tgz"; - url = "https://registry.yarnpkg.com/node-sspi/-/node-sspi-0.2.8.tgz"; - sha1 = "e4b4245729fa5c579ebcfa9194d491751354963f"; + name = "node_sspi___node_sspi_0.2.9.tgz"; + url = "https://registry.yarnpkg.com/node-sspi/-/node-sspi-0.2.9.tgz"; + sha1 = "5a5aab40a4062dbc95cbdbe61a44df34e91afaaf"; }; } { @@ -5402,11 +5418,11 @@ }; } { - name = "optional_require___optional_require_1.1.0.tgz"; + name = "optional_require___optional_require_1.1.4.tgz"; path = fetchurl { - name = "optional_require___optional_require_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.0.tgz"; - sha1 = "01dfbafbbc2e8d79e33558f5af3917f22cc35c2c"; + name = "optional_require___optional_require_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.4.tgz"; + sha1 = "8af7da26b17da76abbf8a1c46e2e148a63813c0e"; }; } { @@ -5626,11 +5642,11 @@ }; } { - name = "passport_saml___passport_saml_3.1.0.tgz"; + name = "passport_saml___passport_saml_3.1.1.tgz"; path = fetchurl { - name = "passport_saml___passport_saml_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.0.tgz"; - sha1 = "32f79316c617d223ad03f71f23d2ee3813e34516"; + name = "passport_saml___passport_saml_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.1.tgz"; + sha1 = "257470003366e06ce3c5738aa64a1209a0f4d7e7"; }; } { @@ -6826,11 +6842,11 @@ }; } { - name = "ssh2___ssh2_1.1.0.tgz"; + name = "ssh2___ssh2_1.2.0.tgz"; path = fetchurl { - name = "ssh2___ssh2_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.1.0.tgz"; - sha1 = "43dd24930e15e317687f519d6b40270d9cd00d00"; + name = "ssh2___ssh2_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.2.0.tgz"; + sha1 = "177a46bb12b7ef2b7bce28bdcbd7eae3cbc50045"; }; } { @@ -7242,11 +7258,11 @@ }; } { - name = "twilio___twilio_3.66.0.tgz"; + name = "twilio___twilio_3.66.1.tgz"; path = fetchurl { - name = "twilio___twilio_3.66.0.tgz"; - url = "https://registry.yarnpkg.com/twilio/-/twilio-3.66.0.tgz"; - sha1 = "8df54865b16b3b0578826cf4f342542daa1227c4"; + name = "twilio___twilio_3.66.1.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-3.66.1.tgz"; + sha1 = "8435441ca45b0c7cb3761c4ba3011ca32e75ba69"; }; } { From b0fc6e8ff921343e365f726a96b8419515936f4d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 2 Aug 2021 23:11:25 +0200 Subject: [PATCH 048/375] make-initrd: fix #132059 --- pkgs/build-support/kernel/make-initrd.nix | 2 +- pkgs/build-support/kernel/make-initrd.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 83d3bb65baec..23ce992f0d55 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -78,7 +78,7 @@ let in stdenvNoCC.mkDerivation rec { inherit name makeUInitrd extension uInitrdArch prepend; - ${if makeUInitrd then "uinitrdCompression" else null} = uInitrdCompression; + ${if makeUInitrd then "uInitrdCompression" else null} = uInitrdCompression; builder = ./make-initrd.sh; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index c0619ef14ae0..70884741af3a 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -43,9 +43,9 @@ done (cd root && find * .[^.*] -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd") if [ -n "$makeUInitrd" ]; then - mkimage -A $uInitrdArch -O linux -T ramdisk -C "$uInitrdCompression" -d $out/initrd"$extension" $out/initrd.img + mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img # Compatibility symlink - ln -s "initrd.img" "$out/initrd" + ln -sf "initrd.img" "$out/initrd" else ln -s "initrd" "$out/initrd$extension" fi From b15a7c718e127d6046328c474244a40e70b9e317 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 Aug 2021 11:31:22 +0200 Subject: [PATCH 049/375] gitea: 1.14.5 -> 1.14.6 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.6 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index bd61d984c620..65c85261cd4f 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.14.5"; + version = "1.14.6"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-8nwLVpe/5IjXJqO179lN80B/3WGUL3LKM8OWdh/bYOE="; + sha256 = "sha256-IIoOJlafMD6Kg8Zde3LcoK97PKLmqOUMQN3nmIgqe1o="; }; unpackPhase = '' From 582a9c13b56faefd98a869d209e5cbd9247c7612 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 8 Aug 2021 12:00:00 +0000 Subject: [PATCH 050/375] nixos/tests/nagios.nix: fix eval --- nixos/modules/services/monitoring/nagios.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 61214508a9c6..0afaefe04e18 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -102,8 +102,8 @@ in plugins = mkOption { type = types.listOf types.package; - default = with pkgs; [ nagiosPluginsOfficial ssmtp mailutils ]; - defaultText = "[pkgs.nagiosPluginsOfficial pkgs.ssmtp pkgs.mailutils]"; + default = with pkgs; [ monitoring-plugins ssmtp mailutils ]; + defaultText = "[pkgs.monitoring-plugins pkgs.ssmtp pkgs.mailutils]"; description = " Packages to be added to the Nagios PATH. Typically used to add plugins, but can be anything. From 5c2478ba3cc2e66a2373c6ff9946346e2f746f8c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 26 Jul 2021 12:34:42 +0800 Subject: [PATCH 051/375] nixos/influxdb2: init --- .../from_md/release-notes/rl-2111.section.xml | 8 +++ .../manual/release-notes/rl-2111.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/databases/influxdb2.nix | 53 +++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 nixos/modules/services/databases/influxdb2.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index f241bff0760f..6203de9d6d16 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -156,6 +156,14 @@ moonraker. + + + influxdb2, + a Scalable datastore for metrics, events, and real-time + analytics. Available as + services.influxdb2. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 13cb08e2c9a3..1dd43977f211 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -48,6 +48,8 @@ pt-services.clipcat.enable). - [moonraker](https://github.com/Arksine/moonraker), an API web server for Klipper. Available as [moonraker](#opt-services.moonraker.enable). +- [influxdb2](https://github.com/influxdata/influxdb), a Scalable datastore for metrics, events, and real-time analytics. Available as [services.influxdb2](#opt-services.influxdb2.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4276a625ed6c..c9a124544f83 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -321,6 +321,7 @@ ./services/databases/foundationdb.nix ./services/databases/hbase.nix ./services/databases/influxdb.nix + ./services/databases/influxdb2.nix ./services/databases/memcached.nix ./services/databases/monetdb.nix ./services/databases/mongodb.nix diff --git a/nixos/modules/services/databases/influxdb2.nix b/nixos/modules/services/databases/influxdb2.nix new file mode 100644 index 000000000000..df7bac4261b5 --- /dev/null +++ b/nixos/modules/services/databases/influxdb2.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: +with lib; +let + format = pkgs.formats.json { }; + cfg = config.services.influxdb2; + configFile = format.generate "config.json" cfg.settings; +in +{ + options = { + services.influxdb2 = { + enable = mkEnableOption "the influxdb2 server"; + package = mkOption { + default = pkgs.influxdb2; + defaultText = "pkgs.influxdb2"; + description = "influxdb2 derivation to use."; + type = types.package; + }; + settings = mkOption { + default = { }; + description = "configuration options for influxdb2, see https://docs.influxdata.com/influxdb/v2.0/reference/config-options for details."; + type = format.type; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [{ + assertion = !(builtins.hasAttr "bolt-path" cfg.settings) && !(builtins.hasAttr "engine-path" cfg.settings); + message = "services.influxdb2.config: bolt-path and engine-path should not be set as they are managed by systemd"; + }]; + systemd.services.influxdb2 = { + description = "InfluxDB is an open-source, distributed, time series database"; + documentation = [ "https://docs.influxdata.com/influxdb/" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + INFLUXD_CONFIG_PATH = "${configFile}"; + }; + serviceConfig = { + ExecStart = "${cfg.package}/bin/influxd --bolt-path \${STATE_DIRECTORY}/influxd.bolt --engine-path \${STATE_DIRECTORY}/engine"; + StateDirectory = "influxdb2"; + DynamicUser = true; + CapabilityBoundingSet = ""; + SystemCallFilter = "@system-service"; + LimitNOFILE = 65536; + KillMode = "control-group"; + Restart = "on-failure"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ nickcao ]; +} From 13be07b251b8fd64aabd39f97362f10dd0eb0b7a Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 9 Aug 2021 02:04:59 +1000 Subject: [PATCH 052/375] tiny: 0.8.0 -> 0.9.0 --- .../applications/networking/irc/tiny/default.nix | 16 ++++++---------- .../networking/irc/tiny/fix-Cargo.lock.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 08e8d6a00bcf..c9637fef4ca6 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , rustPlatform -, fetchpatch , fetchFromGitHub , pkg-config , dbus @@ -11,23 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "tiny"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "osa1"; repo = pname; rev = "v${version}"; - sha256 = "07a50shv6k4fwl2gmv4j0maxaqqkjpwwmqkxkqs0gvx38lc5f7m7"; + sha256 = "gKyHR3FZHDybaP38rqB8/gvr8T+mDO4QQxoTtWS+TlE="; }; - cargoSha256 = "0npkcprcqy2pn7k64jzwg41vk9id6yzw211xw203h80cc5444igr"; + cargoSha256 = "0ChfW8vaqC2kCp4lpS0HOvhuihPw9G5TOmgwKzVDfws="; + # Fix Cargo.lock version. Remove with the next release. cargoPatches = [ - # Fix Cargo.lock version. Remove with the next release. - (fetchpatch { - url = "https://github.com/osa1/tiny/commit/b1caf48a6399dad8875de1d965d1ad445e49585d.patch"; - sha256 = "1zkjhx94nwmd69cfwwwzg51ipcwq01wyvgsmn0vq7iaa2h0d286i"; - }) + ./fix-Cargo.lock.patch ]; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; @@ -38,6 +34,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/osa1/tiny"; changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne vyp ]; }; } diff --git a/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch b/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch new file mode 100644 index 000000000000..71bc4709bece --- /dev/null +++ b/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 3a184dc..0e58cb1 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1023,7 +1023,7 @@ dependencies = [ + + [[package]] + name = "tiny" +-version = "0.8.0" ++version = "0.9.0" + dependencies = [ + "clap", + "dirs 3.0.1", From 792abce19438e0d900c0b8e1002d70322c9a3ed1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 8 Aug 2021 16:34:34 +0000 Subject: [PATCH 053/375] python3.pkgs.flufl_lock: 5.0.5 -> 5.1 --- pkgs/development/python-modules/flufl/lock.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 40ce524c6675..792af5a6c725 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "flufl.lock"; - version = "5.0.5"; + version = "5.1"; src = fetchPypi { inherit pname version; - sha256 = "1bnapkg99r6mixn3kh314bqcfk8q54y0cvhjpj87j7dhjpsakfpz"; + sha256 = "1ylahys50vaj7iw6dhlx3gg7vs8cms9sbyvscd06clnk6lqk78ad"; }; propagatedBuildInputs = [ atpublic psutil ]; From 12a866dfd952c0907337448c7cce7b5e7d58d5a3 Mon Sep 17 00:00:00 2001 From: polykernel <81340136+polykernel@users.noreply.github.com> Date: Sun, 8 Aug 2021 12:11:05 -0400 Subject: [PATCH 054/375] wbg: unstable-2020-08-01 -> 1.0.2 * Change from fetchgit to fetchFromGitea. * Set `mesonBuildType` to release. * Adhere to syntax style guide for long lists. * Add optional flags for PNG and JPEG support respectively, and pass corresponding options in `mesonFlags`. * Add wayland-scanner for gluing wlr-protocol XML files. * Remove extraneous dependencies. * Add upstream changelog. --- pkgs/applications/misc/wbg/default.nix | 58 ++++++++++++++++---------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/misc/wbg/default.nix b/pkgs/applications/misc/wbg/default.nix index 4f385ef21740..57a1f55392aa 100644 --- a/pkgs/applications/misc/wbg/default.nix +++ b/pkgs/applications/misc/wbg/default.nix @@ -1,50 +1,64 @@ { stdenv , lib -, fetchgit +, fetchFromGitea +, pkg-config , meson , ninja -, pkg-config -, git -, scdoc -, cairo -, fcft -, libpng -, librsvg -, libxkbcommon , pixman , tllist , wayland +, wayland-scanner , wayland-protocols -, wlroots +, enablePNG ? true +, enableJPEG ? true +# Optional dependencies +, libpng +, libjpeg }: +let + # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 + mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; +in + stdenv.mkDerivation rec { pname = "wbg"; - version = "unstable-2020-08-01"; + version = "1.0.2"; - src = fetchgit { - url = "https://codeberg.org/dnkl/wbg"; - rev = "1b05bd80d0f40e3ba1e977002d0653f532649269"; - sha256 = "0i1j7aqvj0vl2ww5cvffqci1kjqjn0sw6sp2j0ljblaif6qk9asc"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "wbg"; + rev = version; + sha256 = "sha256-PKEOWRcSAB4Uv5TfameQIEZh6s6xCGdyoZ13etL1TKA="; }; - nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland-scanner + ]; + buildInputs = [ - cairo - fcft - libpng - librsvg - libxkbcommon pixman tllist wayland wayland-protocols - wlroots + ] ++ lib.optional enablePNG libpng + ++ lib.optional enableJPEG libjpeg; + + mesonBuildType = "release"; + + mesonFlags = [ + (mesonFeatureFlag "png" enablePNG) + (mesonFeatureFlag "jpeg" enableJPEG) ]; meta = with lib; { description = "Wallpaper application for Wayland compositors"; homepage = "https://codeberg.org/dnkl/wbg"; + changelog = "https://codeberg.org/dnkl/wbg/releases/tag/${version}"; license = licenses.isc; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; From c858c42002313cc5f9c837c10d8b3babddc77b32 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 8 Aug 2021 13:54:09 +0200 Subject: [PATCH 055/375] llvmPackages_13.clang: fix linker invocation with LLVMgold plugin Ported from 3530837417da13076a2c8412de2c0c385dfbd648. --- pkgs/development/compilers/llvm/13/clang/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index cfafe43c3a5f..78c2831a2f35 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, src, cmake, libxml2, libllvm, version, python3 +{ lib, stdenv, llvm_meta, src, substituteAll, cmake, libxml2, libllvm, version, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -37,6 +37,10 @@ let ./purity.patch # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-11-12-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -52,12 +56,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output From 6a1354b1fc14dfd549bd88f58aede0178f489415 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 8 Aug 2021 13:54:16 +0200 Subject: [PATCH 056/375] llvmPackages_13.compiler-rt: fix build on darwin Ported from cf4e1b9e62ab987552eb676f7618ea085f12a751. --- .../darwin-targetconditionals.patch | 71 +++++++++++++++++++ .../compilers/llvm/13/compiler-rt/default.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/darwin-targetconditionals.patch diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/13/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 000000000000..425dc2af01e7 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/compiler-rt/darwin-targetconditionals.patch @@ -0,0 +1,71 @@ +diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp +--- a/lib/sanitizer_common/sanitizer_mac.cpp ++++ b/lib/sanitizer_common/sanitizer_mac.cpp +@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { + // Offset example: + // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 + constexpr u16 GetOSMajorKernelOffset() { +- if (TARGET_OS_OSX) return 4; +- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; +- if (TARGET_OS_WATCH) return 13; ++#if TARGET_OS_OSX ++ return 4; ++#endif ++#if TARGET_OS_IOS || TARGET_OS_TV ++ return 6; ++#endif ++#if TARGET_OS_WATCH ++ return 13; ++#endif + } + + using VersStr = char[64]; +@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { + u16 os_major = kernel_major - offset; + + const char *format = "%d.0"; +- if (TARGET_OS_OSX) { +- if (os_major >= 16) { // macOS 11+ +- os_major -= 5; +- } else { // macOS 10.15 and below +- format = "10.%d"; +- } ++#if TARGET_OS_OSX ++ if (os_major >= 16) { // macOS 11+ ++ os_major -= 5; ++ } else { // macOS 10.15 and below ++ format = "10.%d"; + } ++#endif + return internal_snprintf(vers, sizeof(VersStr), format, os_major); + } + +@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { + // Aligned versions example: + // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 + static void MapToMacos(u16 *major, u16 *minor) { +- if (TARGET_OS_OSX) +- return; +- +- if (TARGET_OS_IOS || TARGET_OS_TV) ++#if !TARGET_OS_OSX ++#if TARGET_OS_IOS || TARGET_OS_TV + *major += 2; +- else if (TARGET_OS_WATCH) ++#elif TARGET_OS_WATCH + *major += 9; +- else ++#else + UNREACHABLE("unsupported platform"); ++#endif + + if (*major >= 16) { // macOS 11+ + *major -= 5; +@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { + *minor = *major; + *major = 10; + } ++#endif + } + + static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index 8e258e349b9d..eb3446342b4a 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -60,6 +60,8 @@ stdenv.mkDerivation { # extra `/`. ./normalize-var.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + # Prevent a compilation error on darwin + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks From a6defaf953d4470a9dcf8cae3bef1c2c4d17f296 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 8 Aug 2021 13:55:23 +0200 Subject: [PATCH 057/375] llvmPackages_13.lldb: fix python lldb library Ported from e097f7efc77726a17acca7be3e6e2346331883f3. --- pkgs/development/compilers/llvm/13/lldb/default.nix | 6 ++++++ .../compilers/llvm/13/lldb/gnu-install-dirs.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/pkgs/development/compilers/llvm/13/lldb/default.nix b/pkgs/development/compilers/llvm/13/lldb/default.nix index 2dd6c46eb82c..63a5c828faac 100644 --- a/pkgs/development/compilers/llvm/13/lldb/default.nix +++ b/pkgs/development/compilers/llvm/13/lldb/default.nix @@ -84,6 +84,12 @@ stdenv.mkDerivation (rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' # Editor support # vscode: diff --git a/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch index 98321f4479e6..0435784a2474 100644 --- a/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch @@ -63,3 +63,16 @@ index 734167e51bc5..f95761b5df58 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 752113b..010f187 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -62,7 +62,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file From a5f0733461e6937d0397e2afdef73db15f748c61 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 8 Aug 2021 13:56:25 +0200 Subject: [PATCH 058/375] llvmPackages_13.lldb: python into lib & wrap binary Ported from cc7740ae770c52ac1f385aa25cfc143fe79c6b6e. --- .../compilers/llvm/13/lldb/default.nix | 7 +++++-- .../compilers/llvm/13/lldb/gnu-install-dirs.patch | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/13/lldb/default.nix b/pkgs/development/compilers/llvm/13/lldb/default.nix index 63a5c828faac..96d8b19ee419 100644 --- a/pkgs/development/compilers/llvm/13/lldb/default.nix +++ b/pkgs/development/compilers/llvm/13/lldb/default.nix @@ -19,6 +19,7 @@ , Carbon , Cocoa , lit +, makeWrapper , enableManpages ? false }: @@ -42,7 +43,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit + cmake python3 which swig lit makeWrapper ] ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -85,12 +86,14 @@ stdenv.mkDerivation (rec { doCheck = false; installCheckPhase = '' - if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then return 1; fi ''; postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + # Editor support # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json diff --git a/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch index 0435784a2474..afc945ce2614 100644 --- a/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch @@ -75,4 +75,17 @@ index 752113b..010f187 100644 +set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) if(WIN32 OR CYGWIN) # DLL platform -- put DLLs into bin. - set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5633e2..86e4738 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,7 +79,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb") + else() +- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb") ++ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb") + endif() + get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) + finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") From c8db49f0a939ce2219b41f8d3993268ceeef05f1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 8 Aug 2021 14:00:59 +0200 Subject: [PATCH 059/375] pkgsi686Linux.llvmPackages_13.compiler-rt: fix build Ported from a7c4537a729929f6670349f67d248ffb6ff800da. --- .../compilers/llvm/13/compiler-rt/X86-support-extension.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch index f6f9336ad5ad..66742e5b1498 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch +++ b/pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch @@ -2,9 +2,7 @@ diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt index 3a66dd9c3fb..7efc85d9f9f 100644 --- a/lib/builtins/CMakeLists.txt +++ b/lib/builtins/CMakeLists.txt -@@ -301,6 +301,10 @@ if (NOT MSVC) - i386/umoddi3.S - ) +@@ -345,4 +345,8 @@ if (NOT MSVC) + set(i486_SOURCES ${i386_SOURCES}) + set(i586_SOURCES ${i386_SOURCES}) From 1cffbf616835878b6d982297346050c5c29b3eff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Aug 2021 19:20:51 +0200 Subject: [PATCH 060/375] python3Packages.nad-receiver: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/nad-receiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nad-receiver/default.nix b/pkgs/development/python-modules/nad-receiver/default.nix index ee7ac9648e18..60006c7afcb7 100644 --- a/pkgs/development/python-modules/nad-receiver/default.nix +++ b/pkgs/development/python-modules/nad-receiver/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "nad-receiver"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "joopert"; repo = "nad_receiver"; rev = version; - sha256 = "1mylrrvxczhplscayf4hvj56vaqkh7mv32fn9pcvla83y39kg8rw"; + sha256 = "sha256-jRMk/yMA48ei+g/33+mMYwfwixaKTMYcU/z/VOoJbvY="; }; propagatedBuildInputs = [ From c0d7ec431db8af0dfc474617e417895ddc4b4447 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Aug 2021 19:26:13 +0200 Subject: [PATCH 061/375] python3Packages.pymata-express: 1.20 -> 1.21 --- .../python-modules/pymata-express/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix index 69d7585e8a5d..a4306fb4ed82 100644 --- a/pkgs/development/python-modules/pymata-express/default.nix +++ b/pkgs/development/python-modules/pymata-express/default.nix @@ -7,20 +7,23 @@ buildPythonPackage rec { pname = "pymata-express"; - version = "1.20"; + version = "1.21"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MrYsLab"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-spYmd+Cb7Ej5FmniuJYAVVmq0mhOz5fu4+2UUXctRWs="; + rev = version; + sha256 = "1mibyn84kjahrv3kn51yl5mhkyig4piv6wanggzjflh5nm96bhy8"; }; - propagatedBuildInputs = [ pyserial ]; + propagatedBuildInputs = [ + pyserial + ]; # Project has no tests doCheck = false; + pythonImportsCheck = [ "pymata_express" ]; meta = with lib; { From 3b12f3c3cf1fbb82246b7408e049ce84aa387f17 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Aug 2021 19:28:17 +0200 Subject: [PATCH 062/375] python3Packages.solax: 0.2.6 -> 0.2.7 --- pkgs/development/python-modules/solax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/solax/default.nix b/pkgs/development/python-modules/solax/default.nix index a5ca45627164..2ed8d7086bbb 100644 --- a/pkgs/development/python-modules/solax/default.nix +++ b/pkgs/development/python-modules/solax/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "solax"; - version = "0.2.6"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3WhJBBnIl6C0AdEsmSX3ZEVDThzCBguS4UUri80ifGg="; + sha256 = "sha256-02cIOIow+eHBgYa7Dnl7b31j3I8WRxGuTpwHFKL4XYQ="; }; nativeBuildInputs = [ setuptools-scm ]; From 8c656947dcc908ea269b9df3dff3b6d83468d59a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Aug 2021 19:29:04 +0200 Subject: [PATCH 063/375] python3Packages.subarulink: 0.3.14 -> 0.3.15 --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 56dbc588c780..6abaa02d703b 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.14"; + version = "0.3.15"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "G-Two"; repo = pname; rev = "v${version}"; - sha256 = "0xwiw50xc0k8r00k33crsl5wb01n2dz5rzhy96y7vr3zj4kfypsp"; + sha256 = "sha256-akDccWkiFwTwq7dvUxm34BFNS5PnQowqnxVvkPFzxLM="; }; propagatedBuildInputs = [ From a1a34f71dc47eea6fc4b282907c496cd9f505c2f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 8 Aug 2021 14:04:51 -0400 Subject: [PATCH 064/375] fastnlo_toolkit: refactor to not define rev as environment variable --- .../libraries/physics/fastnlo_toolkit/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index 06370e1672d1..fae2ff5a0f22 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -14,16 +14,19 @@ , withPython ? false }: +let + tag = "2823"; +in + stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; - rev = "2823"; - version = "2.5.0pre-${rev}"; + version = "2.5.0pre-${tag}"; src = fetchFromGitLab { domain = "gitlab.etp.kit.edu"; owner = "qcd-public"; repo = "fastNLO"; - inherit rev; + rev = tag; hash = "sha256-FEKnEnK90tT4BJJ6MLva9lCl3aYzO1YGdx/8Ol2vM7M="; } + /v2.5/toolkit; From 38b4a4364de02412795e4a452a0cfab9189d228f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 8 Aug 2021 20:09:38 +0200 Subject: [PATCH 065/375] ecl: inform ecl about libraries to link against via configure flags All libraries that ecl will have compiled libraries and executables link against now have their own --with--incdir and --with--libdir flag which is perfect for our distinct lib and dev outputs. Consequently, we can get rid of the NIX_LDFLAGS-based hack in the wrapper since ecl can figure out which flags to pass on its own. --- pkgs/development/compilers/ecl/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 269beef9e7a2..e891c898c472 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -45,20 +45,20 @@ stdenv.mkDerivation { configureFlags = [ (if threadSupport then "--enable-threads" else "--disable-threads") - "--with-gmp-prefix=${lib.getDev gmp}" - "--with-libffi-prefix=${lib.getDev libffi}" - ] ++ lib.optional useBoehmgc "--with-libgc-prefix=${lib.getDev boehmgc}" - ++ lib.optional (!noUnicode) "--enable-unicode"; + "--with-gmp-incdir=${lib.getDev gmp}/include" + "--with-gmp-libdir=${lib.getLib gmp}/lib" + "--with-libffi-incdir=${lib.getDev libffi}/include" + "--with-libffi-libdir=${lib.getLib libffi}/lib" + ] ++ lib.optionals useBoehmgc [ + "--with-libgc-incdir=${lib.getDev boehmgc}/include" + "--with-libgc-libdir=${lib.getLib boehmgc}/lib" + ] ++ lib.optional (!noUnicode) "--enable-unicode"; hardeningDisable = [ "format" ]; - postInstall = let - ldArgs = lib.strings.concatMapStringsSep " " - (l: ''--prefix NIX_LDFLAGS ' ' "-L${l.lib or l.out or l}/lib"'') - ([ gmp libffi ] ++ lib.optional useBoehmgc boehmgc); - in '' + postInstall = '' sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config - wrapProgram "$out/bin/ecl" --prefix PATH ':' "${gcc}/bin" ${ldArgs} + wrapProgram "$out/bin/ecl" --prefix PATH ':' "${gcc}/bin" ''; meta = with lib; { From ccef83bd40028cb2dd852e9c170307d4936f40d8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 8 Aug 2021 20:16:36 +0200 Subject: [PATCH 066/375] ecl_16_1_2: fix linking of compiled programs * Use --with-gmp-incdir and --with-gmp-libdir (like for the main ecl derivation), so ecl can figure out the flags to pass on its own. Remove NIX_LDFLAGS hack for gmp. * Make sure ecl can find boehmgc when linking programs / libraries via NIX_LDFLAGS. Pass correct -I for boehmgc via NIX_CFLAGS_COMPILE since there's no --with-boehmgc-prefix configure flag to achieve the same result. * Use correct suffixSalt for every flag. This makes NIX_CFLAGS_COMPILE work properly in the first place and should prevent the extra flags hacks leaking into other places in some edge cases. --- pkgs/development/compilers/ecl/16.1.2.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index 0789addb337b..e0017c42f8e0 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -38,8 +38,10 @@ stdenv.mkDerivation { configureFlags = [ (if threadSupport then "--enable-threads" else "--disable-threads") - "--with-gmp-prefix=${gmp.dev}" - "--with-libffi-prefix=${libffi.dev}" + "--with-gmp-incdir=${lib.getDev gmp}/include" + "--with-gmp-libdir=${lib.getLib gmp}/lib" + # -incdir, -libdir doesn't seem to be supported for libffi + "--with-libffi-prefix=${lib.getDev libffi}" ] ++ (lib.optional (! noUnicode) @@ -70,8 +72,18 @@ stdenv.mkDerivation { sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config wrapProgram "$out/bin/ecl" \ --prefix PATH ':' "${gcc}/bin" \ - --prefix NIX_LDFLAGS ' ' "-L${gmp.lib or gmp.out or gmp}/lib" \ - --prefix NIX_LDFLAGS ' ' "-L${libffi.lib or libffi.out or libffi}/lib" + '' + # ecl 16.1.2 is too old to have -libdir for libffi and boehmgc, so we need to + # use NIX_LDFLAGS_BEFORE to make gcc find these particular libraries. + # Since it is missing even the prefix flag for boehmgc we also need to inject + # the correct -I flag via NIX_CFLAGS_COMPILE. Since we have access to it, we + # create the variables with suffixSalt (which seems to be necessary for + # NIX_CFLAGS_COMPILE even). + + lib.optionalString useBoehmgc '' + --prefix NIX_CFLAGS_COMPILE_${gcc.suffixSalt} ' ' "-I${lib.getDev boehmgc}/include" \ + --prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib boehmgc}/lib" \ + '' + '' + --prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib libffi}/lib" ''; meta = { From da89ec8b8dd6d3d9b42c5432e8bc59c6c3183354 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 8 Aug 2021 19:41:43 +0100 Subject: [PATCH 067/375] terraform-providers.cloudfoundry: 0.12.6 -> 0.14.2 --- .../cluster/terraform-providers/cloudfoundry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix index 1ee986d20303..05d46c079f83 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-provider-cloudfoundry"; - version = "0.12.6"; + version = "0.14.2"; src = fetchFromGitHub { owner = "cloudfoundry-community"; repo = pname; rev = "v${version}"; - sha256 = "0n5ybpzk6zkrnd9vpmbjlkm8fdp7nbfr046wih0jk72pmiyrcygi"; + sha256 = "12mx87dip6vn10zvkf4rgrd27k708lnl149j9xj7bmb8v9m1082v"; }; - vendorSha256 = "01lfsd9aw9w3kr1a2a5b7ac6d8jaij83lhxl4y4qsnjlqk86fbxq"; + vendorSha256 = "0kydjnwzj0fylizvk1vg42zyiy17qhz40z3iwa1r5bb20qkrlz93"; # needs a running cloudfoundry doCheck = false; From d3997e04fee19429d5c5697f8463c902342a1a7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Aug 2021 20:49:27 +0200 Subject: [PATCH 068/375] python3Packages.ha-philipsjs: 2.7.4 -> 2.7.5 --- pkgs/development/python-modules/ha-philipsjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index c6de997a1da7..14b60f551435 100644 --- a/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "2.7.4"; + version = "2.7.5"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "08fjdb1q02dwxq8s15ddd00gps64xplblkn8dx5yivldskiy8i1n"; + sha256 = "sha256-CAYyVNVq1rZZ/AYOAE8bfd7f94+PlAsnFRdguparNtY="; }; propagatedBuildInputs = [ From da045464c49de77b0406e07bfc78d608646c84df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Aug 2021 20:55:39 +0200 Subject: [PATCH 069/375] lynis: 3.0.5 -> 3.0.6 --- pkgs/tools/security/lynis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 094aab1e86d3..fbca5633fcad 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "sha256-IJCLj3iSPkfkYOqTu7adtU26jTgKfRmiwIfKvSApdIY="; + sha256 = "sha256-RIz0GTuw3QJKSk25zl4c34o+HgMkpclzoPEbzKhCNqg="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From bfbfab56cc72d2d0ed400a3992029abb4698cd55 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 8 Aug 2021 11:12:42 -0400 Subject: [PATCH 070/375] dnspeep: init at 0.1.2 --- pkgs/tools/security/dnspeep/Cargo.lock | 660 ++++++++++++++++++++++++ pkgs/tools/security/dnspeep/default.nix | 32 ++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 694 insertions(+) create mode 100644 pkgs/tools/security/dnspeep/Cargo.lock create mode 100644 pkgs/tools/security/dnspeep/default.nix diff --git a/pkgs/tools/security/dnspeep/Cargo.lock b/pkgs/tools/security/dnspeep/Cargo.lock new file mode 100644 index 000000000000..9039c430d4c8 --- /dev/null +++ b/pkgs/tools/security/dnspeep/Cargo.lock @@ -0,0 +1,660 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "aho-corasick" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +dependencies = [ + "memchr", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi 0.3.9", +] + +[[package]] +name = "dns-message-parser" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e859c9ca137be3407a445a34eda3395aeef5aae12cd47d46a7fffba54460072" +dependencies = [ + "bytes 1.0.1", + "hex", + "thiserror", +] + +[[package]] +name = "dnspeep" +version = "0.1.2" +dependencies = [ + "bytes 1.0.1", + "chrono", + "dns-message-parser", + "etherparse", + "eyre", + "futures", + "getopts", + "hex", + "libc", + "pcap", + "tokio", +] + +[[package]] +name = "etherparse" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fa20922281f9ee5ffcda45e80d56085829279f1270f79fbabc39809a4354807" +dependencies = [ + "byteorder", +] + +[[package]] +name = "eyre" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "221239d1d5ea86bf5d6f91c9d6bc3646ffe471b08ff9b0f91c44f115ac969d2b" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futures" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" + +[[package]] +name = "futures-executor" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" + +[[package]] +name = "futures-macro" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" + +[[package]] +name = "futures-task" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" + +[[package]] +name = "futures-util" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite 0.2.6", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" + +[[package]] +name = "libloading" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "memchr" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow 0.2.2", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio-named-pipes" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" +dependencies = [ + "log", + "mio", + "miow 0.3.7", + "winapi 0.3.9", +] + +[[package]] +name = "mio-uds" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" +dependencies = [ + "iovec", + "libc", + "mio", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" + +[[package]] +name = "pcap" +version = "0.8.1" +source = "git+https://github.com/jvns/pcap#ae2aa7f501ae5bb7069155cf7c5c700b7482681d" +dependencies = [ + "futures", + "libc", + "libloading", + "mio", + "regex", + "tokio", + "widestring", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + +[[package]] +name = "pin-project-lite" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro-nested" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" + +[[package]] +name = "signal-hook-registry" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + +[[package]] +name = "syn" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "thiserror" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi", + "winapi 0.3.9", +] + +[[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "iovec", + "lazy_static", + "libc", + "memchr", + "mio", + "mio-named-pipes", + "mio-uds", + "num_cpus", + "pin-project-lite 0.1.12", + "signal-hook-registry", + "slab", + "tokio-macros", + "winapi 0.3.9", +] + +[[package]] +name = "tokio-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "widestring" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb" + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] diff --git a/pkgs/tools/security/dnspeep/default.nix b/pkgs/tools/security/dnspeep/default.nix new file mode 100644 index 000000000000..534894813ca2 --- /dev/null +++ b/pkgs/tools/security/dnspeep/default.nix @@ -0,0 +1,32 @@ +{ fetchFromGitHub, lib, libpcap, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "dnspeep"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "jvns"; + repo = pname; + rev = "v${version}"; + sha256 = "0lz22vlgi1alsq676q4nlzfzwnsrvziyqdnmdbn00rwqsvlb81q6"; + }; + + # dnspeep has git dependencies therefore doesn't work with `cargoSha256` + cargoLock = { + # update Cargo.lock every update + lockFile = ./Cargo.lock; + outputHashes = { + "pcap-0.8.1" = "1nnfyhlhcpbl4i6zmfa9rvnvr6ibg5khran1f5yhmr9yfhmhgakd"; + }; + }; + + LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ]; + LIBPCAP_VER = libpcap.version; + + meta = with lib; { + description = "Spy on the DNS queries your computer is making"; + homepage = "https://github.com/jvns/dnspeep"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 090a0461680e..6608f16f0016 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4216,6 +4216,8 @@ in dnsmasq = callPackage ../tools/networking/dnsmasq { }; + dnspeep = callPackage ../tools/security/dnspeep { }; + dnsproxy = callPackage ../tools/networking/dnsproxy { }; dnsperf = callPackage ../tools/networking/dnsperf { }; From c708f2f92a5bd04b14f58c0d8ab9772d2bc41f96 Mon Sep 17 00:00:00 2001 From: David Terry Date: Thu, 27 May 2021 14:53:59 +0200 Subject: [PATCH 071/375] turbo-geth: rename to erigon --- .../blockchains/{turbo-geth/default.nix => erigon.nix} | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/applications/blockchains/{turbo-geth/default.nix => erigon.nix} (100%) diff --git a/pkgs/applications/blockchains/turbo-geth/default.nix b/pkgs/applications/blockchains/erigon.nix similarity index 100% rename from pkgs/applications/blockchains/turbo-geth/default.nix rename to pkgs/applications/blockchains/erigon.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af6ed97f140..fb151723373f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28840,6 +28840,8 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; + erigon = callPackage ../applications/blockchains/erigon.nix { }; + exodus = callPackage ../applications/blockchains/exodus { }; faraday = callPackage ../applications/blockchains/faraday { }; @@ -28911,8 +28913,6 @@ with pkgs; tessera = callPackage ../applications/blockchains/tessera { }; - turbo-geth = callPackage ../applications/blockchains/turbo-geth { }; - vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin { boost = boost165; withGui = true; From a74eaeba5a3b5ba416c848929930045ddda914e4 Mon Sep 17 00:00:00 2001 From: David Terry Date: Tue, 8 Jun 2021 15:41:43 +0200 Subject: [PATCH 072/375] erigon: 2021.05.02 -> 2021.08.01 --- .../from_md/release-notes/rl-2111.section.xml | 7 +++++++ .../manual/release-notes/rl-2111.section.md | 2 ++ pkgs/applications/blockchains/erigon.nix | 20 +++++++++++-------- pkgs/top-level/aliases.nix | 1 + 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 27175564e9d0..6c1e73884b95 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -167,6 +167,13 @@ from 1.0.4 to 3.0.1 + + + The erigon ethereum node has moved to a new + database format in 2021-05-04, and requires + a full resync + + services.geoip-updater was broken and has diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 8596cea10d7e..6fdec708a6fb 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -52,6 +52,8 @@ pt-services.clipcat.enable). - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 +- The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync + - `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable). - PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release. diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 58c0b45337eb..0d6a395b05af 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -1,29 +1,33 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "turbo-geth"; - version = "2021.05.02"; + pname = "erigon"; + version = "2021.08.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7sTRAAlKZOdwi/LRbIEDKWpBe1ol8pZfEf2KIC4s0xk="; + sha256 = "sha256-fjMkCCeQa/IHB4yXlL7Qi8J9wtZm90l3xIA72LeoW8M="; }; - vendorSha256 = "1d0ahdb2b5v8nxq3kdxw151phnyv6habb8kr8qjaq3kyhcnyk6ng"; + vendorSha256 = "1vsgd19an592dblm9afasmh8cd0x2frw5pvnxkxd2fikhy2mibbs"; runVend = true; + # Build errors in mdbx when format hardening is enabled: + # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] + hardeningDisable = [ "format" ]; + subPackages = [ - "cmd/tg" + "cmd/erigon" "cmd/evm" "cmd/rpcdaemon" "cmd/rlpdump" ]; meta = with lib; { - homepage = "https://github.com/ledgerwatch/turbo-geth/"; - description = "Ethereum node and geth fork focused on scalability and modularity"; + homepage = "https://github.com/ledgerwatch/erigon/"; + description = "Ethereum node implementation focused on scalability and modularity"; license = with licenses; [ lgpl3Plus gpl3Plus ]; maintainers = with maintainers; [ d-xo ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ae0194850666..d7d4b0dd8c21 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -874,6 +874,7 @@ mapAliases ({ truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 + turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 20201-08-08 uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 From 865e06fa211706dde4917ac4652accbe6456b7ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 8 Aug 2021 21:58:15 +0200 Subject: [PATCH 073/375] python3Packages.pynetbox: 6.1.2 -> 6.1.3 --- pkgs/development/python-modules/pynetbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index e81a4b8dd666..e6759e736a94 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "6.1.2"; + version = "6.1.3"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "v${version}"; - sha256 = "0di07rny3gqdfb0rf7hm3x03rpn7rydpv3lrl7cak2ccpqm0wzhl"; + sha256 = "sha256-ALDNnKgnOjYladDRVothjm3/2Jv1eNxR2wSS+ZL/Fqk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b8611ee768c3d72f774e964b5f85a22018156bed Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Sun, 8 Aug 2021 15:53:35 -0400 Subject: [PATCH 074/375] paraview: install doc files by default The "Getting Started"/"Tutorial"/"Guide" options on the splash screen and help menu don't work otherwise. --- .../graphics/paraview/default.nix | 44 ++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 166e04149cc8..73cd39568f2b 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,10 +1,35 @@ -{ boost, cmake, fetchFromGitLab, ffmpeg, qtbase, qtx11extras, - qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper, - mkDerivation, ninja, mpi, python3, lib, tbb, libGLU, libGL }: +{ lib, stdenv, fetchFromGitLab, fetchurl +, boost, cmake, ffmpeg, qtbase, qtx11extras +, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper +, mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL +, withDocs ? true +}: -mkDerivation rec { - pname = "paraview"; +let version = "5.9.1"; + major = "5.9"; + + docFiles = [ + (fetchurl { + url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${major}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; + name = "Tutorial.pdf"; + sha256 = "1knpirjbz3rv8p8n03p39vv8vi5imvxakjsssqgly09g0cnsikkw"; + }) + (fetchurl { + url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${major}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; + name = "GettingStarted.pdf"; + sha256 = "14xhlvg7s7d5amqf4qfyamx2a6b66zf4cmlfm3s7iw3jq01x1lx6"; + }) + (fetchurl { + url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${major}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; + name = "CatalystGuide.pdf"; + sha256 = "133vcfrbg2nh15igl51ns6gnfn1is20vq6j0rg37wha697pmcr4a"; + }) + ]; + +in mkDerivation rec { + pname = "paraview"; + inherit version; src = fetchFromGitLab { domain = "gitlab.kitware.com"; @@ -68,6 +93,14 @@ mkDerivation rec { qtsvg ]; + postInstall = let docDir = "$out/share/paraview-${major}/doc"; in + lib.optionalString withDocs '' + mkdir -p ${docDir}; + for docFile in ${lib.concatStringsSep " " docFiles}; do + cp $docFile ${docDir}/$(stripHash $docFile); + done; + ''; + propagatedBuildInputs = [ (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ])) ]; @@ -79,4 +112,5 @@ mkDerivation rec { maintainers = with maintainers; [ guibert ]; platforms = platforms.linux; }; + } From 1e0f240b10b98b6587d668bf9fa8b6399ca27de5 Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Sun, 8 Aug 2021 15:55:32 -0400 Subject: [PATCH 075/375] paraview: license is bsd3 See https://github.com/Kitware/ParaView/blob/master/Copyright.txt --- pkgs/applications/graphics/paraview/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 73cd39568f2b..64072b83654e 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -108,7 +108,7 @@ in mkDerivation rec { meta = with lib; { homepage = "https://www.paraview.org/"; description = "3D Data analysis and visualization application"; - license = licenses.free; + license = licenses.bsd3; maintainers = with maintainers; [ guibert ]; platforms = platforms.linux; }; From e19b326e1cde4de0110a3ffe831cb633ea5fba97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Aug 2021 20:29:33 +0000 Subject: [PATCH 076/375] dprint: 0.15.0 -> 0.15.1 --- pkgs/development/tools/dprint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 7ac81b236dbe..8fe044e41cce 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.15.0"; + version = "0.15.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1DUGp+HiiY03fyZ+b8hNUBIfuQV5Z/gEcOxc/vG3YiA="; + sha256 = "sha256-ftzV5babf3/l59CWDzVgUF2qws5yo1qEuepFLYd8psA="; }; - cargoSha256 = "sha256-twFXA8A+vP1n6IFJO78fKNs+FC2ui46rj1JmJ/eq3wc="; + cargoSha256 = "sha256-ayCCNE44cOpbrk3FFtW2ZPZ1fTwzXwq3srmptI629sw="; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions From dd040a6cc199689f1147780067f39ddcc6855258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sun, 8 Aug 2021 23:40:29 +0300 Subject: [PATCH 077/375] xfce.xfce4-sensors-plugin: 1.3.95 -> 1.4.1 --- .../xfce/panel-plugins/xfce4-sensors-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index 2e275f2b35d9..3e592b60f141 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-sensors-plugin"; - version = "1.3.95"; + version = "1.4.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-g8ZK5GGN1ZKXHPoLwoWptHr4AaPthWg1zbKkxTPHhGw="; + sha256 = "sha256-N9DcVp5zXkgqGFRcJOsc4CKdaRDjpNTB3uBoCZkjS+I="; }; nativeBuildInputs = [ From 9e9a7327d1ecf4cca60f3362c1b0f1220708bbda Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 Aug 2021 23:59:53 +0300 Subject: [PATCH 078/375] argyllcms: 2.1.2 -> 2.2.0 --- pkgs/tools/graphics/argyllcms/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 8ebccd8047ae..a4117790a148 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -4,16 +4,13 @@ stdenv.mkDerivation rec { pname = "argyllcms"; - version = "2.1.2"; + version = "2.2.0"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "1bsi795kphr1a8l2kvvm9qfkvgfpimds4ijalnmg23wnr8691md1"; - - # The argyllcms web server doesn't like curl ... - curlOpts = "--user-agent 'Mozilla/5.0'"; + sha256 = "sha256-EcVwYJfJbWWXl58O3ulsrWgUYTgR4uWdMgb0Z140Pu4="; }; patches = [ ./gcc5.patch ]; From aa6e8990672124bb858ced36dd311568eeb32c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Mon, 9 Aug 2021 00:01:11 +0300 Subject: [PATCH 079/375] xfce.catfish: 1.4.13 -> 4.16.2 --- pkgs/desktops/xfce/applications/catfish/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 072181595a6f..df072f862080 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -1,15 +1,15 @@ { lib, fetchurl, file, which, intltool, gobject-introspection, - findutils, xdg-utils, dconf, gtk3, python3Packages, + findutils, xdg-utils, dconf, gtk3, python3Packages, xfconf, wrapGAppsHook }: python3Packages.buildPythonApplication rec { pname = "catfish"; - version = "1.4.13"; + version = "4.16.2"; src = fetchurl { url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-WMDqBuXyhgGSlVRfv9HbyiOup0xiV2K7tMiab0hK6Dk="; + sha256 = "sha256-shouFRlD8LGU04sX/qrzghh5R+0SoCw9ZJKvt0gBKms="; }; nativeBuildInputs = [ @@ -36,6 +36,7 @@ python3Packages.buildPythonApplication rec { python3Packages.pexpect xdg-utils findutils + xfconf ]; # Explicitly set the prefix dir in "setup.py" because setuptools is From d6907765bbe4eff9020f3cd0fae2f2b9a0e97508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Mon, 9 Aug 2021 00:10:17 +0300 Subject: [PATCH 080/375] xfce.mousepad: 0.5.5 -> 0.5.6 --- pkgs/desktops/xfce/applications/mousepad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 11ef1c6841d2..c3e7805b112d 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.5"; + version = "0.5.6"; odd-unstable = false; - sha256 = "sha256-ViiibikQ90S47stb3egXwK5JbcMYYiJAsKukMVYvKLE="; + sha256 = "sha256-cdM2NHUnN2FITITb4077Je5Z8xwZAJfjmwXfV+WE6jk="; nativeBuildInputs = [ gobject-introspection ]; From 9437d2ca411c1857f324de3a02ca72ef6e344979 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 8 Aug 2021 22:15:05 +0100 Subject: [PATCH 081/375] python3Packages.gremlinpython: 3.4.10 -> 3.5.1 --- .../python-modules/gremlinpython/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index 573f5a68ce67..c9ab433d9816 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -2,10 +2,11 @@ , buildPythonPackage , fetchFromGitHub , aenum +, aiohttp , importlib-metadata , isodate +, nest-asyncio , six -, tornado , pytestCheckHook , mock , pyhamcrest @@ -14,20 +15,20 @@ buildPythonPackage rec { pname = "gremlinpython"; - version = "3.4.10"; + version = "3.5.1"; # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "apache"; repo = "tinkerpop"; rev = version; - sha256 = "0i9lkrwbsmpx1h9480vf97pibm2v37sgw2qm2r1c0i8gg5bcmhj3"; + sha256 = "1vlhxq0f2hanhkv6f17dxgbwr7gnbnh1kkkq0lxcwkbm2l0rdrlr"; }; - sourceRoot = "source/gremlin-python/src/main/jython"; + sourceRoot = "source/gremlin-python/src/main/python"; postPatch = '' substituteInPlace setup.py \ --replace 'aenum>=1.4.5,<3.0.0' 'aenum' \ - --replace 'tornado>=4.4.1,<6.0' 'tornado' \ + --replace 'aiohttp>=3.7.0,<=3.7.4' 'aiohttp' \ --replace 'PyHamcrest>=1.9.0,<2.0.0' 'PyHamcrest' \ --replace 'radish-bdd==0.8.6' 'radish-bdd' \ --replace 'mock>=3.0.5,<4.0.0' 'mock' \ @@ -42,9 +43,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ aenum + aiohttp isodate + nest-asyncio six - tornado ]; checkInputs = [ From 8ab578e496796accddeeceb48b966983cc90cd09 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 8 Aug 2021 22:40:05 +0100 Subject: [PATCH 082/375] unicorn: 1.0.2 -> 1.0.3 --- pkgs/development/libraries/unicorn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index 7f768d9631bb..0a760c07a97e 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "unicorn"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "unicorn-engine"; repo = pname; rev = version; - sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j"; + sha256 = "079azb1df4nwsnsck36b200rnf03aqilw30h3fiaqi1ixash957k"; }; nativeBuildInputs = [ pkg-config cmake ]; From 090a15887460d208e5f382a89d4ae5fd1de5ffd5 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 8 Aug 2021 14:44:08 -0700 Subject: [PATCH 083/375] linux_xanmod: 5.13.8 -> 5.13.9 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index a07735bdc055..587266ec999a 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.8"; + version = "5.13.9"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-VZ8Rbbh0FXKXrN5k1oRqGoYEXiAJjwN8GOJFVoRxE+c="; + sha256 = "sha256-cr5tmJVpjd9czlR1PklJccZ3wc+E1eJgQhhNooFEQ4I="; }; structuredExtraConfig = with lib.kernel; { From d62ab966988bfe7f6f61d5bf0ec2e3b4fa857b7b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 8 Aug 2021 22:39:12 +0200 Subject: [PATCH 084/375] plm: fix old link & deprecate phases --- .../science/programming/plm/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index e56282b68631..ca8e87a05533 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -1,37 +1,39 @@ -{lib, stdenv, fetchurl, makeWrapper, jre, gcc, valgrind}: +{ lib, stdenv, fetchurl, makeWrapper, jre, gcc, valgrind }: # gcc and valgrind are not strict dependencies, they could be made # optional. They are here because plm can only help you learn C if you # have them installed. stdenv.mkDerivation rec { - major = "2"; - minor = "5"; - version = "${major}-${minor}"; pname = "plm"; + version = "2.9.3"; src = fetchurl { - url = "http://webloria.loria.fr/~quinson/Teaching/PLM/plm-${major}_${minor}.jar"; - sha256 = "0m17cxa3nxi2cbswqvlfzp0mlfi3wrkw8ry2xhkxy6aqzm2mlgcc"; + url = "https://github.com/BuggleInc/PLM/releases/download/v${version}/plm-${version}.jar"; + sha256 = "0i9ghx9pm3kpn9x9n1hl10zdr36v5mv3drx8lvhsqwhlsvz42p5i"; name = "${pname}-${version}.jar"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre gcc valgrind ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' + runHook preInstall + mkdir -p "$prefix/bin" makeWrapper ${jre}/bin/java $out/bin/plm \ --add-flags "-jar $src" \ --prefix PATH : "$PATH" + + runHook postInstall ''; meta = with lib; { description = "Free cross-platform programming exerciser"; + homepage = "http://people.irisa.fr/Martin.Quinson/Teaching/PLM/"; license = licenses.gpl3; maintainers = [ ]; platforms = lib.platforms.all; - broken = true; }; } From 7907d803799bbf712fec4fd7ec55afead06dbeae Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 8 Aug 2021 23:18:59 +0200 Subject: [PATCH 085/375] intel-graphics-compiler: deprecate phases and replace it with runCommandLocal --- .../intel-graphics-compiler/default.nix | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 75687de4e9e2..1c40d7fe516b 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake -, pkg-config - +, runCommandLocal , bison , flex , llvmPackages_8 @@ -46,18 +46,14 @@ stdenv.mkDerivation rec { doCheck = false; # Handholding the braindead build script - # We put this in a derivation because the cmake requires an absolute path - prebuilds = stdenv.mkDerivation { - name = "igc-cclang-prebuilds"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir $out - ln -s ${clang}/bin/clang $out/ - ln -s clang $out/clang-${versions.major (getVersion clang)} - ln -s ${opencl-clang}/lib/* $out/ - ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c.h $out/ - ''; - }; + # cmake requires an absolute path + prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' + mkdir $out + ln -s ${clang}/bin/clang $out/ + ln -s clang $out/clang-${versions.major (getVersion clang)} + ln -s ${opencl-clang}/lib/* $out/ + ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c.h $out/ + ''; cmakeFlags = [ "-DCCLANG_BUILD_PREBUILDS=ON" @@ -66,10 +62,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/intel/intel-graphics-compiler"; + homepage = "https://github.com/intel/intel-graphics-compiler"; description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; - license = licenses.mit; - platforms = platforms.all; + license = licenses.mit; + platforms = platforms.all; maintainers = with maintainers; [ gloaming ]; }; } From 734e2b7b11c01164c4e41ec814fd22935b4a52e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 Aug 2021 12:49:07 +0200 Subject: [PATCH 086/375] libdeltachat: support Darwin --- .../libraries/libdeltachat/default.nix | 23 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 5 +++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 77315776aca2..872429aa0918 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -1,12 +1,17 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , openssl , perl , pkg-config , rustPlatform , sqlite +, fixDarwinDylibNames +, CoreFoundation +, Security +, libiconv }: stdenv.mkDerivation rec { @@ -20,6 +25,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZyVEI6q+GzHLEFH01TxS7NqwT7zqVgg0vduyf/fibB8="; }; + patches = [ + # https://github.com/deltachat/deltachat-core-rust/pull/2589 + (fetchpatch { + url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch"; + sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59"; + }) + ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; @@ -33,11 +46,17 @@ stdenv.mkDerivation rec { ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo - ]); + ]) ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; buildInputs = [ openssl sqlite + ] ++ lib.optionals stdenv.isDarwin [ + CoreFoundation + Security + libiconv ]; checkInputs = with rustPlatform; [ @@ -49,7 +68,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/deltachat/deltachat-core-rust/"; changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${version}/CHANGELOG.md"; license = licenses.mpl20; - platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af6ed97f140..6997047e1a05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16520,7 +16520,10 @@ with pkgs; libdeflate = callPackage ../development/libraries/libdeflate { }; - libdeltachat = callPackage ../development/libraries/libdeltachat { }; + libdeltachat = callPackage ../development/libraries/libdeltachat { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + inherit (darwin) libiconv; + }; libdevil = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; From 4d9ddc3eebd3949c18291632c6986655b50e512c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Aug 2021 11:21:50 +0200 Subject: [PATCH 087/375] libdeltachat: don't build static lib --- .../libraries/libdeltachat/default.nix | 1 + .../libdeltachat/no-static-lib.patch | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/libdeltachat/no-static-lib.patch diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 872429aa0918..6a0a6ae5c874 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch"; sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59"; }) + ./no-static-lib.patch ]; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/pkgs/development/libraries/libdeltachat/no-static-lib.patch b/pkgs/development/libraries/libdeltachat/no-static-lib.patch new file mode 100644 index 000000000000..95238cf88524 --- /dev/null +++ b/pkgs/development/libraries/libdeltachat/no-static-lib.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe7abe08..acdbe0d6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,7 +13,6 @@ find_program(CARGO cargo) + + add_custom_command( + OUTPUT +- "target/release/libdeltachat.a" + "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + COMMAND +@@ -38,13 +37,11 @@ add_custom_target( + lib_deltachat + ALL + DEPENDS +- "target/release/libdeltachat.a" + "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + ) + + include(GNUInstallDirs) + install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +-install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml +index a34a27ba..cf354abb 100644 +--- a/deltachat-ffi/Cargo.toml ++++ b/deltachat-ffi/Cargo.toml +@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"] + + [lib] + name = "deltachat" +-crate-type = ["cdylib", "staticlib"] ++crate-type = ["cdylib"] + + [dependencies] + deltachat = { path = "../", default-features = false } From 64f7698fc2bd2e2503aa43ec448e6851f65b5b7a Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Sun, 8 Aug 2021 18:16:50 -0400 Subject: [PATCH 088/375] scala-runners: unstable-2020-02-02 -> unstable-2021-07-28 This brings support for Scala 3 (Dotty) with the `-3` flag. --- pkgs/development/compilers/scala-runners/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/scala-runners/default.nix b/pkgs/development/compilers/scala-runners/default.nix index e379bf4e38e9..d41ae17211e2 100644 --- a/pkgs/development/compilers/scala-runners/default.nix +++ b/pkgs/development/compilers/scala-runners/default.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { pname = "scala-runners"; - version = "unstable-2020-02-02"; + version = "unstable-2021-07-28"; src = fetchFromGitHub { repo = pname; owner = "dwijnand"; - rev = "95e03c9f9de0fe0ab61eeb6dea2a364f9d081d31"; - sha256 = "0mvlc6fxsh5d6gsyak9n3g98g4r061n8pir37jpiqb7z00m9lfrx"; + rev = "9bf096ca81f4974d7327e291eac291e22b344a8f"; + sha256 = "032fds5nr102h1lc81n9jc60jmxzivi4md4hcjrlqn076hfhj4ax"; }; + dontBuild = true; installPhase = '' mkdir -p $out/bin $out/lib sed -ie "s| cs | ${coursier}/bin/coursier |" scala-runner From 7ff192b335dd183d9708e47a22e55285ad7c93d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Aug 2021 22:29:06 +0000 Subject: [PATCH 089/375] drumkv1: 0.9.18 -> 0.9.23 --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index e15e4550e0e5..30d6328b5758 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.18"; + version = "0.9.23"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "1bzkaz7sqx1pvirja8zm7i2ckzl5ad6xspr4840389ik3l8qpnr5"; + sha256 = "sha256-gNscsqGpEfU1CNJDlBAzum9M0vzJSm6Wx5b/zhOt+sk="; }; buildInputs = [ libjack2 alsa-lib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; From 43d83eae366b6d3a9ba2f01af8617ea03812b5e3 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 8 Aug 2021 23:36:51 +0100 Subject: [PATCH 090/375] python3Packages.rich: 10.4.0 -> 10.7.0 --- pkgs/development/python-modules/rich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index e939d3fc9334..323bd8ba8685 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.4.0"; + version = "10.7.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "0z01bvn8zx69simk26jv5ngvqv35fs7i0wbg1hjcd37lmv3v6261"; + sha256 = "1drh08cmcn8dqi0mpfwscz3ljsv2s60kyhxy6iiw5si7rf717j4p"; }; nativeBuildInputs = [ poetry-core ]; From d66335d57ce20d5abd17eb85e27eda34e6503592 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Aug 2021 22:44:55 +0000 Subject: [PATCH 091/375] flink: 1.12.1 -> 1.13.2 --- pkgs/applications/networking/cluster/flink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 3c3bc2bace25..ccefd6d3de25 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.12.1"; + version = "1.13.2"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz"; - sha256 = "146azc5wg1xby3nqz8mha959qy99z2h8032rfgs2mcl3d5rrsm2l"; + sha256 = "sha256-GPiHV19Z2Htt75hCXK2nCeQMIBQFEEUxXlBembenFL0="; }; nativeBuildInputs = [ makeWrapper ]; From 816b3decda2cc331ff2f8ef0cbfe39fbdb2882af Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 8 Aug 2021 15:45:59 -0700 Subject: [PATCH 092/375] tabnine: 3.5.15 -> 3.5.37 --- pkgs/development/tools/tabnine/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index 5499a937b289..baff8affcbfe 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -1,19 +1,20 @@ { stdenv, lib, fetchurl, unzip }: let - version = "3.5.15"; + # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` + version = "3.5.37"; src = if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; - sha256 = "sha256-JrDAF/3yPGJXwonWIvaKf0dw4GQf3U2wbf5iF4QUXco="; + sha256 = "sha256-Vxmhl4/bhRDeByGgkdSF8yEY5wI23WzT2iH1OFkEpck="; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; - sha256 = "sha256-fgVVJ+J4w+Z3Kmryixp844xlLFiRs5PSAcD/wrcXF1w="; + sha256 = "sha256-pttjlx7WWE3nog9L1APp8HN+a4ShhlBj5irHOaPgqHw="; } else throw "Not supported on ${stdenv.hostPlatform.system}"; in From 26ec7c39bb796dd5122dbe60288f81741e91bd0a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:17:24 +0000 Subject: [PATCH 093/375] linux: 4.14.240 -> 4.14.243 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ccecc433a4ac..ce0bb98ad6ff 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.240"; + version = "4.14.243"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1k65qwzlnqnh9ym0n2fxpa8nk2qwvykwhwgaixk3b7ndzmr8b6c8"; + sha256 = "0wdk93qv91pa6bd3ff1gv7manhkzh190c5blcpl14cbh9m2ms8vz"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 553c6ef12af489a7bd60d5ca9260246aca20a1fe Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:17:36 +0000 Subject: [PATCH 094/375] linux: 4.19.198 -> 4.19.202 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 4ed06ee22058..3d1beb7bd6df 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.198"; + version = "4.19.202"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "13k0r6a4n8nbni64a18wqzy0pg4vn1zw2li78xrm78rqcrnah85y"; + sha256 = "09ya7n0il8fipp8ksb8cyl894ihny2r75g70vbhclbv20q2pv0pj"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From 1adb289851291353b4062c7d0fe10598de804668 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:17:40 +0000 Subject: [PATCH 095/375] linux: 4.4.278 -> 4.4.279 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e74cd257d28d..da435b307e5a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.278"; + version = "4.4.279"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1r2sbxn8finzcg72ds5dyh4578vv2s5zwylq3b3xyw3hzr4swn4f"; + sha256 = "1d3cfhs7ixk0dhh1mc1z6y73i816a2wl16zhayl1ssp69d4ndpsb"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From a5713826c48b70b04b6963cd621f4e64a267fab3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:17:45 +0000 Subject: [PATCH 096/375] linux: 4.9.278 -> 4.9.279 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d88479ee18cf..a0b4391b3744 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.278"; + version = "4.9.279"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04byav6cbga3jqkppygm5zj73d9v44xyvx6hbrhwr22lsk282dz7"; + sha256 = "01rf3xh2jcz6l2h79g0m02i8f9q51j64wvgvzi8lmq0gx9yvbv91"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From cde6046992f56b51de41275340560283c5ae6c7d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:17:53 +0000 Subject: [PATCH 097/375] linux: 5.10.52 -> 5.10.57 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f59cca3e12fb..8e3108a9d24b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.52"; + version = "5.10.57"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ydf09wsg0pkjm9dk8y730ksg15p5rlbhq445zx8k191zah5g7kn"; + sha256 = "0b8lwfjlyd6j0csk71v07bxb5lrrzp545g1wv6kdk0kzq6maxfq0"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From d416101b659c8bd8fd3cb224bce5803a0e70e6e8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:18:00 +0000 Subject: [PATCH 098/375] linux: 5.13.8 -> 5.13.9 --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index efa1329153c3..4086299c0c35 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.8"; + version = "5.13.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0a54r71mcyqvq7c8kff817vh6zfj0bdzmp6ql4az84wq9nwc526h"; + sha256 = "16hm6sb64f1hlr0qmf2w81zv55s6flj1x8jr2q326d9ny30przkj"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From b570def284bedd5821a5d8faf4fc7110b0c8b809 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:18:07 +0000 Subject: [PATCH 099/375] linux: 5.4.134 -> 5.4.139 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index c4e08b685b5e..1433c5925a92 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.134"; + version = "5.4.139"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0haqw1w6f8p330ydbsl7iml1x0qqrv63az6921p2a70n88b8dyy9"; + sha256 = "0zx3hj8fc0qpdmkn56cna5438wjxmj42a69msbkxlg4mnz6d0w84"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 8425e47a7416facee6cb0b8dce122715c152ed5b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:18:42 +0000 Subject: [PATCH 100/375] linux-rt_5_10: 5.10.52-rt47 -> 5.10.56-rt48 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 83b2fc05093b..88bc386f5972 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.52-rt47"; # updated by ./update-rt.sh + version = "5.10.56-rt48"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0ydf09wsg0pkjm9dk8y730ksg15p5rlbhq445zx8k191zah5g7kn"; + sha256 = "0szcj0lbs33wmphxzvcc8jzfdvzncgxy2q8b1s4l9yjhkighssjd"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1n71nbshma0gxyrifyymrd0wii1q0plj020amc0wdzzm27xs5k2k"; + sha256 = "1fi83iky7r80cc1xlxyvsd2fcfgd67hz1nhmrhxawzkx6cx6i55a"; }; }; in [ rt-patch ] ++ kernelPatches; From b84eecf9fc114625f43f9d6cad035d61ad2c439c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:19:16 +0000 Subject: [PATCH 101/375] linux/hardened/patches/4.14: 4.14.240-hardened1 -> 4.14.243-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 412e50415007..78dd21c12087 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.240-hardened1.patch", - "sha256": "0j5zp0f8s4w3f60yam2spg3bx56bdjvv0mh632zlhchz8rdk5zs4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.240-hardened1/linux-hardened-4.14.240-hardened1.patch" + "name": "linux-hardened-4.14.243-hardened1.patch", + "sha256": "0ngz1ywkxjqyv92wirj9m6l99p4caj6n75h2mv0a6rhk9r4di6p6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.243-hardened1/linux-hardened-4.14.243-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 0a41183454eeed7ce105a08ecd8e2ba438bf858d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:19:17 +0000 Subject: [PATCH 102/375] linux/hardened/patches/4.19: 4.19.198-hardened1 -> 4.19.202-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 78dd21c12087..1b3281ce8f82 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.198-hardened1.patch", - "sha256": "18c5j00xiwc0xn5klcrwazk6wvjiy3cixbfbrw4xj7zal9r5p6q9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.198-hardened1/linux-hardened-4.19.198-hardened1.patch" + "name": "linux-hardened-4.19.202-hardened1.patch", + "sha256": "0bylyc7k5azs8335mmzrgsx42cg8l3vm4izzikc8kchs2grb1q5v", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.202-hardened1/linux-hardened-4.19.202-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 7aae6061b6e9879590e4f4315be2b6bdb3b90c09 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:19:18 +0000 Subject: [PATCH 103/375] linux/hardened/patches/5.10: 5.10.52-hardened1 -> 5.10.57-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 1b3281ce8f82..bdff9b62b06d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.52-hardened1.patch", - "sha256": "062a32rb1g5xk1npiz9fa114k7g4x9pmygycn3alc0phngjmvr98", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.52-hardened1/linux-hardened-5.10.52-hardened1.patch" + "name": "linux-hardened-5.10.57-hardened1.patch", + "sha256": "0zqv77k0i4q5w4qhgiknvrh4fav1jc4a2i9cdracwqlrk8fgmiih", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.57-hardened1/linux-hardened-5.10.57-hardened1.patch" }, "5.12": { "extra": "-hardened1", From cbb5ca89ca473f09d8c1abf274f48b19700de57c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 8 Aug 2021 23:19:19 +0000 Subject: [PATCH 104/375] linux/hardened/patches/5.4: 5.4.134-hardened1 -> 5.4.139-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bdff9b62b06d..3acd18a4b281 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.134-hardened1.patch", - "sha256": "0iay6dxwd1vqj02ljf0ghncrqpr6b0gby90xiza8kkk8wnh3r9hh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.134-hardened1/linux-hardened-5.4.134-hardened1.patch" + "name": "linux-hardened-5.4.139-hardened1.patch", + "sha256": "0lznmwy8yqc8rq5pr0akxclpnwz98pgai6ib5a3d77ncfham6fnl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.139-hardened1/linux-hardened-5.4.139-hardened1.patch" } } From b00dd3ac1f53eebfd9c8291ce1fa10b559b04a04 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 01:49:54 +0200 Subject: [PATCH 105/375] nixos/tests/prometheus-exporters/kea: drop enable option There is no generic services.kea.enable option. Instead kea consists of four daemons (dhcp4, dhcp6, ddns, ctrlagent) that can be enabled individually. In this test we're just looking at dhcp6. --- nixos/tests/prometheus-exporters.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 6153ba9e366f..c6e8fa5a9ee1 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -360,7 +360,6 @@ let systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6-server.service" ]; services.kea = { - enable = true; dhcp6 = { enable = true; settings = { From 323134240a18ecd771df0d3258d71949c6de932a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 00:26:53 +0000 Subject: [PATCH 106/375] gama: 2.12 -> 2.14 --- pkgs/applications/science/geometry/gama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index c5e95d37b510..899e65a7740a 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.12"; + version = "2.14"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0zfilasalsy29b7viw0iwgnl9bkvp0l87gpxl1hx7379l8agwqyj"; + sha256 = "sha256-ltYoJyo4b4Ys70nbZo5gxkjBw/RiEs5Rrdb6he9bsBI="; }; buildInputs = [ expat ]; From e135fdae7729e6567ec94aa4989bfbdecc04e14b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 00:57:45 +0000 Subject: [PATCH 107/375] flyway: 7.5.4 -> 7.12.1 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 4679c6aa0523..3db9e0f38671 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "7.5.4"; + version = "7.12.1"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I="; + sha256 = "sha256-EwS4prlZlI6V0mUidE7Kaz/rYy5ji/DB0huDt0ATxGs="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 18a4e4f94f50b991280148c9b3b3325d577d5c2b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 9 Aug 2021 03:01:02 +0200 Subject: [PATCH 108/375] ecl, ecl_16_1_2: make sure ar is in PATH --- pkgs/development/compilers/ecl/16.1.2.nix | 7 ++++++- pkgs/development/compilers/ecl/default.nix | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index e0017c42f8e0..7736b71e56ed 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -71,7 +71,12 @@ stdenv.mkDerivation { postInstall = '' sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config wrapProgram "$out/bin/ecl" \ - --prefix PATH ':' "${gcc}/bin" \ + --prefix PATH ':' "${ + lib.makeBinPath [ + gcc # for the C compiler + gcc.bintools.bintools # for ar + ] + }" \ '' # ecl 16.1.2 is too old to have -libdir for libffi and boehmgc, so we need to # use NIX_LDFLAGS_BEFORE to make gcc find these particular libraries. diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index e891c898c472..44f7eab62ee5 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -58,7 +58,12 @@ stdenv.mkDerivation { postInstall = '' sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config - wrapProgram "$out/bin/ecl" --prefix PATH ':' "${gcc}/bin" + wrapProgram "$out/bin/ecl" --prefix PATH ':' "${ + lib.makeBinPath [ + gcc # for the C compiler + gcc.bintools.bintools # for ar + ] + }" ''; meta = with lib; { From d63e4e2367bd53089d51673236289468b0256daa Mon Sep 17 00:00:00 2001 From: r-burns <52847440+r-burns@users.noreply.github.com> Date: Sun, 8 Aug 2021 18:08:47 -0700 Subject: [PATCH 109/375] aws-sdk-cpp: fix cross-OS crosscompilation (#133182) The TARGET_ARCH cmake variable is used to specify the host OS, which if unspecified defaults to the same as the build OS. So to crosscompile aws-sdk-cpp to another OS, the TARGET_ARCH variable must be specified. Example hydra failure: https://hydra.nixos.org/build/149290553/nixlog/3 --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 1ba2d79dcec5..fa081ab3f24f 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -7,6 +7,14 @@ customMemoryManagement ? true }: +let + host_os = if stdenv.hostPlatform.isDarwin then "APPLE" + else if stdenv.hostPlatform.isAndroid then "ANDROID" + else if stdenv.hostPlatform.isWindows then "WINDOWS" + else if stdenv.hostPlatform.isLinux then "LINUX" + else throw "Unknown host OS"; +in + stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; version = "1.8.130"; @@ -49,6 +57,7 @@ stdenv.mkDerivation rec { "-DENABLE_TESTING=OFF" "-DCURL_HAS_H2=1" "-DCURL_HAS_TLS_PROXY=1" + "-DTARGET_ARCH=${host_os}" ] ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; From 8959f1d2e822c3775bb2503f400f145f57a04fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 18 Jul 2021 16:41:04 +0200 Subject: [PATCH 110/375] deltachat-desktop: init at unstable-2021-08-04 --- .../deltachat-desktop/default.nix | 95 + .../deltachat-desktop/package.json | 58 + .../deltachat-desktop/update.sh | 42 + pkgs/development/node-packages/default.nix | 4 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1526 ++++++++++++++++- pkgs/top-level/all-packages.nix | 4 + 7 files changed, 1664 insertions(+), 66 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json create mode 100755 pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix new file mode 100644 index 000000000000..a4f3a2212432 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -0,0 +1,95 @@ +{ lib +, copyDesktopItems +, electron +, esbuild +, fetchFromGitHub +, libdeltachat +, makeDesktopItem +, makeWrapper +, nodePackages +, pkg-config +, stdenv +, CoreServices +}: + +let + electronExec = if stdenv.isDarwin then + "${electron}/Applications/Electron.app/Contents/MacOS/Electron" + else + "${electron}/bin/electron"; +in nodePackages.deltachat-desktop.override rec { + pname = "deltachat-desktop"; + version = "unstable-2021-08-04"; + + src = fetchFromGitHub { + owner = "deltachat"; + repo = "deltachat-desktop"; + rev = "2c47d6b7e46f4f68c7eb45508ab9e145af489ea1"; + sha256 = "03b6j3cj2yanvsargh6q57bf1llg17yrqgmd14lp0wkam767kkfa"; + }; + + nativeBuildInputs = [ + esbuild + makeWrapper + pkg-config + ] ++ lib.optionals stdenv.isLinux [ + copyDesktopItems + ]; + + buildInputs = [ + libdeltachat + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ]; + + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + USE_SYSTEM_LIBDELTACHAT = "true"; + VERSION_INFO_GIT_REF = src.rev; + + postInstall = let + keep = lib.concatMapStringsSep " " (file: "! -name ${file}") [ + "_locales" "build" "html-dist" "images" "index.js" + "node_modules" "themes" "tsc-dist" + ]; + in '' + rm -r node_modules/deltachat-node/{deltachat-core-rust,prebuilds,src} + + patchShebangs node_modules/sass/sass.js + + npm run build + + npm prune --production + + find . -mindepth 1 -maxdepth 1 ${keep} -print0 | xargs -0 rm -r + + mkdir -p $out/share/icons/hicolor/scalable/apps + ln -s $out/lib/node_modules/deltachat-desktop/build/icon.png \ + $out/share/icons/hicolor/scalable/apps/deltachat.png + + makeWrapper ${electronExec} $out/bin/deltachat \ + --add-flags $out/lib/node_modules/deltachat-desktop + ''; + + desktopItems = lib.singleton (makeDesktopItem { + name = "deltachat"; + exec = "deltachat %u"; + icon = "deltachat"; + desktopName = "Delta Chat"; + genericName = "Delta Chat"; + comment = meta.description; + categories = "Network;InstantMessaging;Chat;"; + extraEntries = '' + StartupWMClass=DeltaChat + MimeType=x-scheme-handler/openpgp4fpr;x-scheme-handler/mailto; + ''; + }); + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Email-based instant messaging for Desktop"; + homepage = "https://github.com/deltachat/deltachat-desktop"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json new file mode 100644 index 000000000000..f332352e4b61 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -0,0 +1,58 @@ +{ + "name": "deltachat-desktop", + "version": "1.20.3", + "dependencies": { + "@blueprintjs/core": "^3.22.3", + "@mapbox/geojson-extent": "^1.0.0", + "application-config": "^1.0.1", + "array-differ": "^3.0.0", + "classnames": "^2.3.1", + "debounce": "^1.2.0", + "deltachat-node": "1.56.2", + "emoji-js-clean": "^4.0.0", + "emoji-mart": "^3.0.0", + "emoji-regex": "^9.2.2", + "error-stack-parser": "^2.0.6", + "filesize": "^6.1.0", + "fs-extra": "^8.1.0", + "mapbox-gl": "^1.12.0", + "mime-types": "^2.1.31", + "moment": "^2.27.0", + "node-fetch": "^2.6.1", + "path-browserify": "^1.0.1", + "punycode": "^2.1.1", + "rc": "^1.2.8", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "react-qr-reader": "^2.2.1", + "react-qr-svg": "^2.1.0", + "react-string-replace": "^0.4.4", + "react-virtualized": "^9.21.2", + "simple-markdown": "^0.7.1", + "source-map-support": "^0.5.19", + "tempy": "^0.3.0", + "url-parse": "^1.4.7", + "use-debounce": "^3.3.0", + "@babel/core": "^7.7.7", + "@types/debounce": "^1.2.0", + "@babel/preset-env": "^7.7.7", + "@babel/preset-react": "^7.7.4", + "@types/emoji-mart": "^3.0.2", + "@types/fs-extra": "^8.0.1", + "@types/mapbox-gl": "^0.54.5", + "@types/mime-types": "^2.1.0", + "@types/node": "^14.14.20", + "@types/node-fetch": "^2.5.7", + "@types/prop-types": "^15.7.3", + "@types/rc": "^1.1.0", + "@types/react": "^16.9.17", + "@types/react-dom": "^16.9.4", + "@types/react-virtualized": "^9.21.10", + "@types/url-parse": "^1.4.3", + "electron": "^13.1.6", + "glob-watcher": "^5.0.5", + "sass": "^1.26.5", + "typescript": "^3.9.7", + "xml-js": "^1.6.8" + } +} diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh new file mode 100755 index 000000000000..162de501e617 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh @@ -0,0 +1,42 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq nix-prefetch + +set -euo pipefail +cd "$(dirname "$0")" + +owner=deltachat +repo=deltachat-desktop +nixpkgs=../../../../.. + +rev=$( + curl -s "https://api.github.com/repos/$owner/$repo/releases" | + jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output +) +ver=$(echo "$rev" | sed 's/^v//') +old_ver=$(sed -n 's/.*\bversion = "\(.*\)".*/\1/p' default.nix) +if [ "$ver" = "$old_ver" ]; then + echo "Up to date: $ver" + exit +fi +echo "$old_ver -> $ver" + +sha256=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev") +sed -e "s#\\bversion = \".*\"#version = \"$ver\"#" \ + -e "s#\\bsha256 = \".*\"#sha256 = \"$sha256\"#" \ + -i default.nix +src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) + +jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@typescript-eslint/eslint-plugin","@typescript-eslint/parser","esbuild","electron-builder","electron-devtools-installer","electron-notarize","esbuild","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","prettier","tape","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","walk"]))) }' \ + "$src/package.json" > package.json.new + +if cmp --quiet package.json{.new,}; then + echo "package.json not changed, skip updating nodePackages" + rm package.json.new +else + echo "package.json changed, updating nodePackages" + mv package.json{.new,} + + pushd ../../../../development/node-packages + ./generate.sh + popd +fi diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index c632a4cbc1e2..fe1bdd6754cc 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -46,6 +46,10 @@ let ''; }; + deltachat-desktop = super."deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop".override { + meta.broken = true; # use the top-level package instead + }; + fast-cli = super.fast-cli.override ({ nativeBuildInputs = [ pkgs.makeWrapper ]; prePatch = '' diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index eacd0c89d90a..3ce357cecb23 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -78,6 +78,7 @@ , "csslint" , "dat" , "degit" +, {"deltachat-desktop": "../../applications/networking/instant-messengers/deltachat-desktop"} , "dhcp" , "diagnostic-languageserver" , "dockerfile-language-server-nodejs" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index e00b4d1081ef..35bb2db3f10f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -652,13 +652,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.15.0" = { + "@babel/parser-7.15.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.15.0"; + version = "7.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz"; - sha512 = "0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz"; + sha512 = "bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { @@ -1507,13 +1507,13 @@ let sha512 = "64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw=="; }; }; - "@babel/standalone-7.15.1" = { + "@babel/standalone-7.15.2" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.15.1"; + version = "7.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.1.tgz"; - sha512 = "OJvIUtmXWEnTFvm+/TSMFkJK9vmbOF1wNmu/vbU18/Hlj9E6JdrkWxTkwbrsM1UjLtyb4w+pwZ/A1C4XZXorXg=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.2.tgz"; + sha512 = "q/DsJPZ2v0PjH4UL0DaEOCT/pERnXPsfERLbILXuzS8BWF6NuBAxJwf2/h/XiyJZZ4X/7BVrmoW6H7u3H6nDYQ=="; }; }; "@babel/template-7.14.5" = { @@ -1552,6 +1552,24 @@ let sha512 = "OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ=="; }; }; + "@blueprintjs/core-3.47.0" = { + name = "_at_blueprintjs_slash_core"; + packageName = "@blueprintjs/core"; + version = "3.47.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.47.0.tgz"; + sha512 = "u+bfmCyPXwKZMnwY4+e/iWjO2vDUvr8hA8ydmV0afyvcEe7Sh85UPEorIgQ/CBuRIbVMNm8FpLsFzDxgkfrCNA=="; + }; + }; + "@blueprintjs/icons-3.27.0" = { + name = "_at_blueprintjs_slash_icons"; + packageName = "@blueprintjs/icons"; + version = "3.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.27.0.tgz"; + sha512 = "ItRioyrr2s70chclj5q38HS9omKOa15b3JZXv9JcMIFz+6w6rAcoAH7DA+5xIs27bFjax/SdAZp/eYXSw0+QpA=="; + }; + }; "@braintree/sanitize-url-3.1.0" = { name = "_at_braintree_slash_sanitize-url"; packageName = "@braintree/sanitize-url"; @@ -2929,6 +2947,15 @@ let sha512 = "TvRRRd//a3q+JhpSh5PaHJfnP4oLM/0eZikyDh2Z+eaJpIZP+vZwdlpPd10neTsPq1zfJX8weRjYLFHNpoMZVg=="; }; }; + "@hypnosphi/create-react-context-0.3.1" = { + name = "_at_hypnosphi_slash_create-react-context"; + packageName = "@hypnosphi/create-react-context"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz"; + sha512 = "V1klUed202XahrWJLLOT3EXNeCpFHCcJntdFGI15ntCwau+jfT386w7OFTMaCqOgXUH1fa0w/I1oZs+i/Rfr0A=="; + }; + }; "@iarna/toml-2.2.5" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; @@ -3784,6 +3811,78 @@ let sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; }; }; + "@mapbox/extent-0.4.0" = { + name = "_at_mapbox_slash_extent"; + packageName = "@mapbox/extent"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/extent/-/extent-0.4.0.tgz"; + sha1 = "3e591f32e1f0c3981c864239f7b0ac06e610f8a9"; + }; + }; + "@mapbox/geojson-coords-0.0.1" = { + name = "_at_mapbox_slash_geojson-coords"; + packageName = "@mapbox/geojson-coords"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/geojson-coords/-/geojson-coords-0.0.1.tgz"; + sha512 = "cdMlqmDl1vzAl2E0XC2zIuqM74vdet0Dq2el49haJEVbGpC8se40j5UcsnBK/gsvZzrume30fon1u/aSYMXG4Q=="; + }; + }; + "@mapbox/geojson-extent-1.0.0" = { + name = "_at_mapbox_slash_geojson-extent"; + packageName = "@mapbox/geojson-extent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/geojson-extent/-/geojson-extent-1.0.0.tgz"; + sha512 = "OWW/Tw7OkKHoogXjQJNILjLd2d4JZzO/elc5Qr08VNwFSIPpSnJgyaEGO2xRPqNuWDLr4RocuqmC0FcQWPgeOA=="; + }; + }; + "@mapbox/geojson-normalize-0.0.1" = { + name = "_at_mapbox_slash_geojson-normalize"; + packageName = "@mapbox/geojson-normalize"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/geojson-normalize/-/geojson-normalize-0.0.1.tgz"; + sha1 = "1da1e6b3a7add3ad29909b30f438f60581b7cd80"; + }; + }; + "@mapbox/geojson-rewind-0.5.1" = { + name = "_at_mapbox_slash_geojson-rewind"; + packageName = "@mapbox/geojson-rewind"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.1.tgz"; + sha512 = "eL7fMmfTBKjrb+VFHXCGv9Ot0zc3C0U+CwXo1IrP+EPwDczLoXv34Tgq3y+2mPSFNVUXgU42ILWJTC7145KPTA=="; + }; + }; + "@mapbox/geojson-types-1.0.2" = { + name = "_at_mapbox_slash_geojson-types"; + packageName = "@mapbox/geojson-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz"; + sha512 = "e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw=="; + }; + }; + "@mapbox/jsonlint-lines-primitives-2.0.2" = { + name = "_at_mapbox_slash_jsonlint-lines-primitives"; + packageName = "@mapbox/jsonlint-lines-primitives"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz"; + sha1 = "ce56e539f83552b58d10d672ea4d6fc9adc7b234"; + }; + }; + "@mapbox/mapbox-gl-supported-1.5.0" = { + name = "_at_mapbox_slash_mapbox-gl-supported"; + packageName = "@mapbox/mapbox-gl-supported"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz"; + sha512 = "/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg=="; + }; + }; "@mapbox/node-pre-gyp-1.0.5" = { name = "_at_mapbox_slash_node-pre-gyp"; packageName = "@mapbox/node-pre-gyp"; @@ -3793,6 +3892,51 @@ let sha512 = "4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA=="; }; }; + "@mapbox/point-geometry-0.1.0" = { + name = "_at_mapbox_slash_point-geometry"; + packageName = "@mapbox/point-geometry"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz"; + sha1 = "8a83f9335c7860effa2eeeca254332aa0aeed8f2"; + }; + }; + "@mapbox/tiny-sdf-1.2.5" = { + name = "_at_mapbox_slash_tiny-sdf"; + packageName = "@mapbox/tiny-sdf"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz"; + sha512 = "cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw=="; + }; + }; + "@mapbox/unitbezier-0.0.0" = { + name = "_at_mapbox_slash_unitbezier"; + packageName = "@mapbox/unitbezier"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz"; + sha1 = "15651bd553a67b8581fb398810c98ad86a34524e"; + }; + }; + "@mapbox/vector-tile-1.3.1" = { + name = "_at_mapbox_slash_vector-tile"; + packageName = "@mapbox/vector-tile"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz"; + sha512 = "MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw=="; + }; + }; + "@mapbox/whoots-js-3.1.0" = { + name = "_at_mapbox_slash_whoots-js"; + packageName = "@mapbox/whoots-js"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz"; + sha512 = "Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="; + }; + }; "@mark.probst/typescript-json-schema-0.32.0" = { name = "_at_mark.probst_slash_typescript-json-schema"; packageName = "@mark.probst/typescript-json-schema"; @@ -6412,6 +6556,15 @@ let sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; + "@types/debounce-1.2.0" = { + name = "_at_types_slash_debounce"; + packageName = "@types/debounce"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.0.tgz"; + sha512 = "bWG5wapaWgbss9E238T0R6bfo5Fh3OkeoSt245CM7JJwVwpw6MEBCbIxLq5z8KzsE3uJhzcIuQkyiZmzV3M/Dw=="; + }; + }; "@types/debug-4.1.7" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; @@ -6430,6 +6583,15 @@ let sha512 = "/C8kTMRTNiNuWGl5nEyKbPiMv6HA+0RbEXzFhFBEzASM6+oa4tJro9b8nj7eRlOFfuLdzUU+DS/GPDlvvzMOhA=="; }; }; + "@types/dom4-2.0.2" = { + name = "_at_types_slash_dom4"; + packageName = "@types/dom4"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.2.tgz"; + sha512 = "Rt4IC1T7xkCWa0OG1oSsPa0iqnxlDeQqKXZAHrQGLb7wFGncWm85MaxKUjAGejOrUynOgWlFi4c6S6IyJwoK4g=="; + }; + }; "@types/download-8.0.1" = { name = "_at_types_slash_download"; packageName = "@types/download"; @@ -6457,6 +6619,15 @@ let sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A=="; }; }; + "@types/emoji-mart-3.0.5" = { + name = "_at_types_slash_emoji-mart"; + packageName = "@types/emoji-mart"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.5.tgz"; + sha512 = "bsMEXVPrasIJ03u61msIKMMiL7Hh6dGQ3Gcz3CjytTxTQKQRdf/g0owWTSSL5mvKNgu9UfgornrF6qqClPk1Jw=="; + }; + }; "@types/emscripten-1.39.5" = { name = "_at_types_slash_emscripten"; packageName = "@types/emscripten"; @@ -6601,6 +6772,15 @@ let sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ=="; }; }; + "@types/fs-extra-8.1.2" = { + name = "_at_types_slash_fs-extra"; + packageName = "@types/fs-extra"; + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.2.tgz"; + sha512 = "SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg=="; + }; + }; "@types/fs-extra-9.0.12" = { name = "_at_types_slash_fs-extra"; packageName = "@types/fs-extra"; @@ -6610,6 +6790,15 @@ let sha512 = "I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw=="; }; }; + "@types/geojson-7946.0.8" = { + name = "_at_types_slash_geojson"; + packageName = "@types/geojson"; + version = "7946.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz"; + sha512 = "1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="; + }; + }; "@types/glob-7.1.4" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; @@ -6907,6 +7096,15 @@ let sha512 = "5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="; }; }; + "@types/mapbox-gl-0.54.5" = { + name = "_at_types_slash_mapbox-gl"; + packageName = "@types/mapbox-gl"; + version = "0.54.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-0.54.5.tgz"; + sha512 = "h0MqA7rtP88vuMepODf1oomJLeuRAZfOiYdeGS3NYO4TMQs237TkA+bNehy7V5nfyCjPRuKrb0fnWMjncHak0g=="; + }; + }; "@types/material-design-lite-1.1.16" = { name = "_at_types_slash_material-design-lite"; packageName = "@types/material-design-lite"; @@ -6934,6 +7132,15 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; + "@types/mime-types-2.1.0" = { + name = "_at_types_slash_mime-types"; + packageName = "@types/mime-types"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz"; + sha1 = "9ca52cda363f699c69466c2a6ccdaad913ea7a73"; + }; + }; "@types/minimatch-3.0.5" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; @@ -7213,6 +7420,15 @@ let sha512 = "a+fLdul8OczRvPWPf8eTb6wPhxzyWQwRGhNN0ugtOtk6yFOG53i2LwXaA0d2D6bsJlWxi6eCuGZLGoCcdOlWZA=="; }; }; + "@types/prop-types-15.7.4" = { + name = "_at_types_slash_prop-types"; + packageName = "@types/prop-types"; + version = "15.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz"; + sha512 = "rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="; + }; + }; "@types/pug-2.0.5" = { name = "_at_types_slash_pug"; packageName = "@types/pug"; @@ -7258,6 +7474,42 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; + "@types/rc-1.1.0" = { + name = "_at_types_slash_rc"; + packageName = "@types/rc"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rc/-/rc-1.1.0.tgz"; + sha512 = "qw1q31xPnaeExbOA1daA3nfeKW2uZQN4Xg8QqZDM3vsXPHK/lyDpjWXJQIcrByRDcBzZJ3ccchSMMTDtCWgFpA=="; + }; + }; + "@types/react-16.14.12" = { + name = "_at_types_slash_react"; + packageName = "@types/react"; + version = "16.14.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/react/-/react-16.14.12.tgz"; + sha512 = "7nOJgNsRbARhZhvwPm7cnzahtzEi5VJ9OvcQk8ExEEb1t+zaFklwLVkJz7G1kfxX4X/mDa/icTmzE0vTmqsqBg=="; + }; + }; + "@types/react-dom-16.9.14" = { + name = "_at_types_slash_react-dom"; + packageName = "@types/react-dom"; + version = "16.9.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.14.tgz"; + sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A=="; + }; + }; + "@types/react-virtualized-9.21.13" = { + name = "_at_types_slash_react-virtualized"; + packageName = "@types/react-virtualized"; + version = "9.21.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/react-virtualized/-/react-virtualized-9.21.13.tgz"; + sha512 = "tCIQ5wDKj+QJ3sMzjPKSLY0AXsznt+ovAUcq+JCLjPBOcAHbPt4FraGT9HKYEFfmp9E6+ELuN49i5bWtuBmi3w=="; + }; + }; "@types/request-2.48.5" = { name = "_at_types_slash_request"; packageName = "@types/request"; @@ -7348,6 +7600,15 @@ let sha512 = "iZUcRrGuz/Tbg3loODpW7vrQJkUtpY2fFSf4ELqqkApcS2TkZ1msk7ie8iZPB86lDOP8QOTTmuvWjc5S0R9OjQ=="; }; }; + "@types/scheduler-0.16.2" = { + name = "_at_types_slash_scheduler"; + packageName = "@types/scheduler"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"; + sha512 = "hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="; + }; + }; "@types/semver-7.3.8" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; @@ -7492,6 +7753,15 @@ let sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; }; }; + "@types/url-parse-1.4.3" = { + name = "_at_types_slash_url-parse"; + packageName = "@types/url-parse"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.3.tgz"; + sha512 = "4kHAkbV/OfW2kb5BLVUuUMoumB3CP8rHqlw48aHvFy5tf9ER0AfOonBlX29l/DD68G70DmyhRlSYfQPSYpC5Vw=="; + }; + }; "@types/uuid-8.3.1" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; @@ -10102,6 +10372,15 @@ let sha1 = "dcfca9e509300e4c3b2d467965fe50c56fc75e66"; }; }; + "application-config-1.0.1" = { + name = "application-config"; + packageName = "application-config"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/application-config/-/application-config-1.0.1.tgz"; + sha1 = "5aa2e2a5ed6abd2e5d1d473d3596f574044fe9e7"; + }; + }; "application-config-path-0.1.0" = { name = "application-config-path"; packageName = "application-config-path"; @@ -18014,31 +18293,31 @@ let sha512 = "SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw=="; }; }; - "core-js-3.16.0" = { + "core-js-3.16.1" = { name = "core-js"; packageName = "core-js"; - version = "3.16.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz"; - sha512 = "5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.16.1.tgz"; + sha512 = "AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw=="; }; }; - "core-js-compat-3.16.0" = { + "core-js-compat-3.16.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.16.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz"; - sha512 = "5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.1.tgz"; + sha512 = "NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ=="; }; }; - "core-js-pure-3.16.0" = { + "core-js-pure-3.16.1" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.16.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.0.tgz"; - sha512 = "wzlhZNepF/QA9yvx3ePDgNGudU5KDB8lu/TRPKelYA/QtSnkS/cLl2W+TIdEX1FAFcBr0YpY7tPDlcmXJ7AyiQ=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.1.tgz"; + sha512 = "TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg=="; }; }; "core-util-is-1.0.2" = { @@ -18752,6 +19031,15 @@ let sha1 = "a6602dff7e04a8306dc0db9a551e92e8b5662ad8"; }; }; + "csscolorparser-1.0.3" = { + name = "csscolorparser"; + packageName = "csscolorparser"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz"; + sha1 = "b34f391eea4da8f3e98231e2ccd8df9c041f171b"; + }; + }; "cssesc-3.0.0" = { name = "cssesc"; packageName = "cssesc"; @@ -18887,6 +19175,15 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; + "csstype-3.0.8" = { + name = "csstype"; + packageName = "csstype"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz"; + sha512 = "jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="; + }; + }; "csurf-1.11.0" = { name = "csurf"; packageName = "csurf"; @@ -20633,6 +20930,15 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; + "deltachat-node-1.56.2" = { + name = "deltachat-node"; + packageName = "deltachat-node"; + version = "1.56.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deltachat-node/-/deltachat-node-1.56.2.tgz"; + sha512 = "bM/fVTM1GVgXpvGZFiMB1qKxhnJvFx4ssqZVddsTjGTlzQ+9dRIZmkWIFvUzIGCyLWMcfNJZcUZgLgKdbz+liw=="; + }; + }; "denodeify-1.2.1" = { name = "denodeify"; packageName = "denodeify"; @@ -21515,6 +21821,24 @@ let sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; }; }; + "dom-helpers-3.4.0" = { + name = "dom-helpers"; + packageName = "dom-helpers"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz"; + sha512 = "LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA=="; + }; + }; + "dom-helpers-5.2.1" = { + name = "dom-helpers"; + packageName = "dom-helpers"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz"; + sha512 = "nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA=="; + }; + }; "dom-serialize-2.2.1" = { name = "dom-serialize"; packageName = "dom-serialize"; @@ -21578,6 +21902,15 @@ let sha512 = "6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="; }; }; + "dom4-2.1.6" = { + name = "dom4"; + packageName = "dom4"; + version = "2.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/dom4/-/dom4-2.1.6.tgz"; + sha512 = "JkCVGnN4ofKGbjf5Uvc8mmxaATIErKQKSgACdBXpsQ3fY6DlIpAyWfiBSrGkttATssbDCp3psiAKWXk5gmjycA=="; + }; + }; "domain-browser-1.2.0" = { name = "domain-browser"; packageName = "domain-browser"; @@ -22064,6 +22397,15 @@ let sha512 = "vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA=="; }; }; + "earcut-2.2.3" = { + name = "earcut"; + packageName = "earcut"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/earcut/-/earcut-2.2.3.tgz"; + sha512 = "iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug=="; + }; + }; "easy-stack-1.0.1" = { name = "easy-stack"; packageName = "easy-stack"; @@ -22172,6 +22514,15 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; + "electron-13.1.8" = { + name = "electron"; + packageName = "electron"; + version = "13.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/electron/-/electron-13.1.8.tgz"; + sha512 = "ei2ZyyG81zUOlvm5Zxri668TdH5GNLY0wF+XrC2FRCqa8AABAPjJIWTRkhFEr/H6PDVPNZjMPvSs3XhHyVVk2g=="; + }; + }; "electron-notarize-1.1.0" = { name = "electron-notarize"; packageName = "electron-notarize"; @@ -22318,6 +22669,24 @@ let sha512 = "3IqSwmO+N2ZGeuhDyhV/TIOJFUbkChi53bcasSNRE7Yd+4eorbbYz4e53TpMECt38NtYkZNupQCZRlwdAYA42A=="; }; }; + "emoji-js-clean-4.0.0" = { + name = "emoji-js-clean"; + packageName = "emoji-js-clean"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-js-clean/-/emoji-js-clean-4.0.0.tgz"; + sha512 = "6WZ/WH61ABR/s3TZpRW+nXBSRu6xMTdZSGjNTHo1ptv1vRjwOfbzEPQp9mtgbCi1vkFsFi1SZYz/UIliVxvLwg=="; + }; + }; + "emoji-mart-3.0.1" = { + name = "emoji-mart"; + packageName = "emoji-mart"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-mart/-/emoji-mart-3.0.1.tgz"; + sha512 = "sxpmMKxqLvcscu6mFn9ITHeZNkGzIvD0BSNFE/LJESPbCA8s1jM6bCDPjWbV31xHq7JXaxgpHxLB54RCbBZSlg=="; + }; + }; "emoji-named-characters-1.0.2" = { name = "emoji-named-characters"; packageName = "emoji-named-characters"; @@ -22372,6 +22741,15 @@ let sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; }; + "emoji-regex-9.2.2" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "9.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"; + sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; + }; + }; "emoji-server-1.0.0" = { name = "emoji-server"; packageName = "emoji-server"; @@ -24487,6 +24865,15 @@ let sha512 = "AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ=="; }; }; + "extract-zip-1.7.0" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz"; + sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; + }; + }; "extract-zip-2.0.1" = { name = "extract-zip"; packageName = "extract-zip"; @@ -26881,6 +27268,24 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; + "geojson-flatten-1.0.4" = { + name = "geojson-flatten"; + packageName = "geojson-flatten"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/geojson-flatten/-/geojson-flatten-1.0.4.tgz"; + sha512 = "PpscUXxO6dvvhZxtwuqiI5v+1C/IQYPJRMWoQeaF2oohJgfGYSHKVAe8L+yUqF34PH/hmq9JlwmO+juPw+95/Q=="; + }; + }; + "geojson-vt-3.2.1" = { + name = "geojson-vt"; + packageName = "geojson-vt"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz"; + sha512 = "EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg=="; + }; + }; "get-amd-module-type-3.0.0" = { name = "get-amd-module-type"; packageName = "get-amd-module-type"; @@ -27043,6 +27448,15 @@ let sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="; }; }; + "get-stdin-7.0.0" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz"; + sha512 = "zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ=="; + }; + }; "get-stdin-8.0.0" = { name = "get-stdin"; packageName = "get-stdin"; @@ -27367,6 +27781,15 @@ let sha512 = "0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw=="; }; }; + "gl-matrix-3.3.0" = { + name = "gl-matrix"; + packageName = "gl-matrix"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.3.0.tgz"; + sha512 = "COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA=="; + }; + }; "glob-3.2.11" = { name = "glob"; packageName = "glob"; @@ -28241,6 +28664,15 @@ let sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; }; }; + "grid-index-1.1.0" = { + name = "grid-index"; + packageName = "grid-index"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz"; + sha512 = "HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA=="; + }; + }; "gridsome-helper-json-1.0.3" = { name = "gridsome-helper-json"; packageName = "gridsome-helper-json"; @@ -34218,6 +34650,15 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; + "jsqr-1.4.0" = { + name = "jsqr"; + packageName = "jsqr"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsqr/-/jsqr-1.4.0.tgz"; + sha512 = "dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A=="; + }; + }; "jstat-1.9.4" = { name = "jstat"; packageName = "jstat"; @@ -34516,6 +34957,15 @@ let sha512 = "cCMcil4jwMm7behpXGiQfXJA29sko/Gd/26iCsr53Dv5Jn2iHbHyEb14dm9uVrIijUXx6Zz1WhlFhHE6DckvkQ=="; }; }; + "kdbush-3.0.0" = { + name = "kdbush"; + packageName = "kdbush"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz"; + sha512 = "hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew=="; + }; + }; "keep-alive-agent-0.0.1" = { name = "keep-alive-agent"; packageName = "keep-alive-agent"; @@ -37918,6 +38368,15 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; + "mapbox-gl-1.13.1" = { + name = "mapbox-gl"; + packageName = "mapbox-gl"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.1.tgz"; + sha512 = "GSyubcoSF5MyaP8z+DasLu5v7KmDK2pp4S5+VQ5WdVQUOaAqQY4jwl4JpcdNho3uWm2bIKs7x1l7q3ynGmW60g=="; + }; + }; "mark.js-8.11.1" = { name = "mark.js"; packageName = "mark.js"; @@ -40609,6 +41068,15 @@ let sha1 = "ca17e1eafb3b9155b5e4c21062210e348a9dbe91"; }; }; + "murmurhash-js-1.0.0" = { + name = "murmurhash-js"; + packageName = "murmurhash-js"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz"; + sha1 = "b06278e21fc6c37fa5313732b0412bcb6ae15f51"; + }; + }; "mustache-2.3.2" = { name = "mustache"; packageName = "mustache"; @@ -42339,6 +42807,15 @@ let sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; }; }; + "normalize.css-8.0.1" = { + name = "normalize.css"; + packageName = "normalize.css"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz"; + sha512 = "qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg=="; + }; + }; "now-and-later-2.0.1" = { name = "now-and-later"; packageName = "now-and-later"; @@ -45634,6 +46111,15 @@ let sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; }; }; + "pbf-3.2.1" = { + name = "pbf"; + packageName = "pbf"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz"; + sha512 = "ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ=="; + }; + }; "pbkdf2-3.1.2" = { name = "pbkdf2"; packageName = "pbkdf2"; @@ -46354,6 +46840,15 @@ let sha1 = "a93683ba41dc82fffccccb1c859ae40921f98229"; }; }; + "popper.js-1.16.1" = { + name = "popper.js"; + packageName = "popper.js"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz"; + sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="; + }; + }; "portfinder-1.0.28" = { name = "portfinder"; packageName = "portfinder"; @@ -47084,6 +47579,15 @@ let sha512 = "W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw=="; }; }; + "potpack-1.0.1" = { + name = "potpack"; + packageName = "potpack"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/potpack/-/potpack-1.0.1.tgz"; + sha512 = "15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw=="; + }; + }; "prebuild-install-5.3.0" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -49109,6 +49613,15 @@ let sha512 = "8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg=="; }; }; + "qr.js-0.0.0" = { + name = "qr.js"; + packageName = "qr.js"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz"; + sha1 = "cace86386f59a0db8050fa90d9b6b0e88a1e364f"; + }; + }; "qrcode-1.4.4" = { name = "qrcode"; packageName = "qrcode"; @@ -49379,6 +49892,15 @@ let sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; }; }; + "quickselect-2.0.0" = { + name = "quickselect"; + packageName = "quickselect"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz"; + sha512 = "RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="; + }; + }; "quicktask-1.0.1" = { name = "quicktask"; packageName = "quicktask"; @@ -49919,6 +50441,33 @@ let sha512 = "fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="; }; }; + "react-popper-1.3.11" = { + name = "react-popper"; + packageName = "react-popper"; + version = "1.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz"; + sha512 = "VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg=="; + }; + }; + "react-qr-reader-2.2.1" = { + name = "react-qr-reader"; + packageName = "react-qr-reader"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-2.2.1.tgz"; + sha512 = "EL5JEj53u2yAOgtpAKAVBzD/SiKWn0Bl7AZy6ZrSf1lub7xHwtaXe6XSx36Wbhl1VMGmvmrwYMRwO1aSCT2fwA=="; + }; + }; + "react-qr-svg-2.4.0" = { + name = "react-qr-svg"; + packageName = "react-qr-svg"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-qr-svg/-/react-qr-svg-2.4.0.tgz"; + sha512 = "3Q/LyjBi+eWjJ0WyZvBzyY3rCMlUBZyRnbTcKbXQ39J1bd0/vgqYhXoYai7XlDTS42Ro50BBY4TmeUVyIZh+nA=="; + }; + }; "react-reconciler-0.24.0" = { name = "react-reconciler"; packageName = "react-reconciler"; @@ -49946,6 +50495,15 @@ let sha512 = "2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ=="; }; }; + "react-string-replace-0.4.4" = { + name = "react-string-replace"; + packageName = "react-string-replace"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/react-string-replace/-/react-string-replace-0.4.4.tgz"; + sha512 = "FAMkhxmDpCsGTwTZg7p/2v+/GTmxAp73so3fbSvlAcBBX36ujiGRNEaM/1u+jiYQrArhns+7eE92g2pi5E5FUA=="; + }; + }; "react-tabs-3.2.2" = { name = "react-tabs"; packageName = "react-tabs"; @@ -49955,6 +50513,15 @@ let sha512 = "/o52eGKxFHRa+ssuTEgSM8qORnV4+k7ibW+aNQzKe+5gifeVz8nLxCrsI9xdRhfb0wCLdgIambIpb1qCxaMN+A=="; }; }; + "react-transition-group-2.9.0" = { + name = "react-transition-group"; + packageName = "react-transition-group"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz"; + sha512 = "+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg=="; + }; + }; "react-universal-component-4.5.0" = { name = "react-universal-component"; packageName = "react-universal-component"; @@ -49964,6 +50531,15 @@ let sha512 = "dBUC6afvSAQhDcE4oh1eTmfU29W0O2eZhcGXnfGUTulXkU8ejuWqlJWXXrSMx5iV1H6LNgj2NJMj3BtBMfBNhA=="; }; }; + "react-virtualized-9.22.3" = { + name = "react-virtualized"; + packageName = "react-virtualized"; + version = "9.22.3"; + src = fetchurl { + url = "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.22.3.tgz"; + sha512 = "MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw=="; + }; + }; "read-1.0.7" = { name = "read"; packageName = "read"; @@ -51881,6 +52457,15 @@ let sha1 = "00a0940f98cd501aeaaac316411d9adc52b31ab1"; }; }; + "resize-observer-polyfill-1.5.1" = { + name = "resize-observer-polyfill"; + packageName = "resize-observer-polyfill"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"; + sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; + }; + }; "resolve-1.20.0" = { name = "resolve"; packageName = "resolve"; @@ -52007,6 +52592,15 @@ let sha1 = "686f70b188bd7d675f5bbc4282ccda060abb9d27"; }; }; + "resolve-protobuf-schema-2.1.0" = { + name = "resolve-protobuf-schema"; + packageName = "resolve-protobuf-schema"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz"; + sha512 = "kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ=="; + }; + }; "resolve-url-0.2.1" = { name = "resolve-url"; packageName = "resolve-url"; @@ -52457,13 +53051,13 @@ let sha512 = "8xfDbAtBleXotb6qKEHWuo/jkn94a9dVqGc7Rwl3sqspCVlnCfbRek7ldhCARSi7h32H0xR4QThm1t9zHN+3uw=="; }; }; - "rollup-2.56.0" = { + "rollup-2.56.1" = { name = "rollup"; packageName = "rollup"; - version = "2.56.0"; + version = "2.56.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.56.0.tgz"; - sha512 = "weEafgbjbHCnrtJPNyCrhYnjP62AkF04P0BcV/1mofy1+gytWln4VVB1OK462cq2EAyWzRDpTMheSP/o+quoiA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.1.tgz"; + sha512 = "KkrsNjeiTfGJMUFBi/PNfj3fnt70akqdoNXOjlzwo98uA1qrlkmgt6SGaK5OwhyDYCVnJb6jb2Xa2wbI47P4Nw=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -52628,6 +53222,15 @@ let sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; }; }; + "rtcpeerconnection-shim-1.2.15" = { + name = "rtcpeerconnection-shim"; + packageName = "rtcpeerconnection-shim"; + version = "1.2.15"; + src = fetchurl { + url = "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.15.tgz"; + sha512 = "C6DxhXt7bssQ1nHb154lqeL0SXz5Dx4RczXZu2Aa/L1NJFnEVDxFwCBo3fqtuljhHIGceg5JKBV4XJ0gW5JKyw=="; + }; + }; "rttc-4.5.2" = { name = "rttc"; packageName = "rttc"; @@ -52718,6 +53321,15 @@ let sha512 = "cLgakCUf6PedEu15t8kbsjnwIFFR2D4RfL+W3iWFJ4iac7z4B0ZI8fxy4R3J956kAI68HclCFGL8MPoUVC3qVA=="; }; }; + "rw-0.1.4" = { + name = "rw"; + packageName = "rw"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rw/-/rw-0.1.4.tgz"; + sha1 = "4903cbd80248ae0ede685bf58fd236a7a9b29a3e"; + }; + }; "rw-1.3.3" = { name = "rw"; packageName = "rw"; @@ -53096,6 +53708,15 @@ let sha512 = "g3WxHrqSWCZHGHlSrF51VXFdjImhwvH8ZO/pryFH56Qi0cDsZfylQa/t0jCzVQFNbNvM00HfHjkDPEuarKDSWQ=="; }; }; + "sdp-2.12.0" = { + name = "sdp"; + packageName = "sdp"; + version = "2.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sdp/-/sdp-2.12.0.tgz"; + sha512 = "jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw=="; + }; + }; "sec-1.0.0" = { name = "sec"; packageName = "sec"; @@ -54149,6 +54770,15 @@ let sha512 = "ZmlNUGR1KI12sPHeQ7dQY1qM5KfOgFqClNNVO8zQ9Pg6u7gHLCPFGD+VC7MCwpGDMd1uw3Bb2TfFfR8d6bB34A=="; }; }; + "simple-markdown-0.7.3" = { + name = "simple-markdown"; + packageName = "simple-markdown"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-markdown/-/simple-markdown-0.7.3.tgz"; + sha512 = "uGXIc13NGpqfPeFJIt/7SHHxd6HekEJYtsdoCM06mEBPL9fQH/pSD7LRM6PZ7CKchpSvxKL4tvwMamqAaNDAyg=="; + }; + }; "simple-message-channels-1.2.1" = { name = "simple-message-channels"; packageName = "simple-message-channels"; @@ -57605,6 +58235,15 @@ let sha512 = "DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A=="; }; }; + "supercluster-7.1.3" = { + name = "supercluster"; + packageName = "supercluster"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/supercluster/-/supercluster-7.1.3.tgz"; + sha512 = "7+bR4FbF5SYsmkHfDp61QiwCKtwNDyPsddk9TzfsDA5DQr5Goii5CVD2SXjglweFCxjrzVZf945ahqYfUIk8UA=="; + }; + }; "superstatic-7.1.0" = { name = "superstatic"; packageName = "superstatic"; @@ -59127,6 +59766,15 @@ let sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; }; + "tinyqueue-2.0.3" = { + name = "tinyqueue"; + packageName = "tinyqueue"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz"; + sha512 = "ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="; + }; + }; "titleize-1.0.1" = { name = "titleize"; packageName = "titleize"; @@ -60009,6 +60657,15 @@ let sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; }; }; + "tslib-1.13.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; + sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; + }; + }; "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; @@ -60477,6 +61134,15 @@ let sha512 = "MyfKKYzk3I6/QQp6e1T50py4qg+c+9BzOEl2rBmQIpStwNUoqQ73An+Tkfy9YuV7O+o2mpVVJpe+fH//POZkbg=="; }; }; + "typed-styles-0.0.7" = { + name = "typed-styles"; + packageName = "typed-styles"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz"; + sha512 = "pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="; + }; + }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -62079,6 +62745,15 @@ let sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; + "use-debounce-3.4.3" = { + name = "use-debounce"; + packageName = "use-debounce"; + version = "3.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/use-debounce/-/use-debounce-3.4.3.tgz"; + sha512 = "nxy+opOxDccWfhMl36J5BSCTpvcj89iaQk2OZWLAtBJQj7ISCtx1gh+rFbdjGfMl6vtCZf6gke/kYvrkVfHMoA=="; + }; + }; "user-home-2.0.0" = { name = "user-home"; packageName = "user-home"; @@ -63880,6 +64555,15 @@ let sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; }; }; + "vt-pbf-3.1.3" = { + name = "vt-pbf"; + packageName = "vt-pbf"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz"; + sha512 = "2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA=="; + }; + }; "vue-2.6.14" = { name = "vue"; packageName = "vue"; @@ -64438,6 +65122,15 @@ let sha512 = "k1qRoSL/3BVuINzngj09nIwreD8wxV4grcuhHTD8VJgUbGcy8lQSPqv+bM00B7F+PffwIsQ8ISd4mIwRbr23eQ=="; }; }; + "webrtc-adapter-7.7.1" = { + name = "webrtc-adapter"; + packageName = "webrtc-adapter"; + version = "7.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-7.7.1.tgz"; + sha512 = "TbrbBmiQBL9n0/5bvDdORc6ZfRY/Z7JnEj+EYOD1ghseZdpJ+nF2yx14k3LgQKc7JZnG7HAcL+zHnY25So9d7A=="; + }; + }; "websocket-driver-0.6.5" = { name = "websocket-driver"; packageName = "websocket-driver"; @@ -68163,7 +68856,7 @@ in sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -68497,12 +69190,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.16.0" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.16.0" + sources."core-js-pure-3.16.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -69467,7 +70160,7 @@ in sources."@babel/generator-7.15.0" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/template-7.14.5" sources."@babel/types-7.15.0" sources."@webassemblyjs/ast-1.11.1" @@ -69570,7 +70263,7 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -71416,7 +72109,7 @@ in sources."@babel/code-frame-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/types-7.15.0" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -72500,7 +73193,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/template-7.14.5" sources."@babel/types-7.15.0" sources."@cdktf/hcl2cdk-0.5.0" @@ -72697,7 +73390,7 @@ in sources."convert-to-spaces-1.0.2" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-pure-3.16.0" + sources."core-js-pure-3.16.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."crc-32-1.2.0" @@ -74041,7 +74734,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.16.0" + sources."core-js-3.16.1" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -75055,7 +75748,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -77936,6 +78629,707 @@ in bypassCache = true; reconstructLock = true; }; + "deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage { + name = "deltachat-desktop"; + packageName = "deltachat-desktop"; + version = "1.20.3"; + src = ../../applications/networking/instant-messengers/deltachat-desktop; + dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.0" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/generator-7.15.0" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + sources."@babel/helper-compilation-targets-7.15.0" + sources."@babel/helper-create-class-features-plugin-7.15.0" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" + sources."@babel/helper-define-polyfill-provider-0.2.3" + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.15.0" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.15.0" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.15.0" + sources."@babel/helper-simple-access-7.14.8" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.8" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.15.2" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-jsx-7.14.5" + sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.9" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.0" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-react-display-name-7.15.1" + sources."@babel/plugin-transform-react-jsx-7.14.9" + sources."@babel/plugin-transform-react-jsx-development-7.14.5" + sources."@babel/plugin-transform-react-pure-annotations-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.6" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + sources."@babel/preset-env-7.15.0" + sources."@babel/preset-modules-0.1.4" + sources."@babel/preset-react-7.14.5" + sources."@babel/runtime-7.14.8" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.15.0" + sources."@babel/types-7.15.0" + sources."@blueprintjs/core-3.47.0" + sources."@blueprintjs/icons-3.27.0" + sources."@electron/get-1.12.4" + sources."@hypnosphi/create-react-context-0.3.1" + sources."@mapbox/extent-0.4.0" + sources."@mapbox/geojson-coords-0.0.1" + sources."@mapbox/geojson-extent-1.0.0" + sources."@mapbox/geojson-normalize-0.0.1" + sources."@mapbox/geojson-rewind-0.5.1" + sources."@mapbox/geojson-types-1.0.2" + sources."@mapbox/jsonlint-lines-primitives-2.0.2" + sources."@mapbox/mapbox-gl-supported-1.5.0" + sources."@mapbox/point-geometry-0.1.0" + sources."@mapbox/tiny-sdf-1.2.5" + sources."@mapbox/unitbezier-0.0.0" + sources."@mapbox/vector-tile-1.3.1" + sources."@mapbox/whoots-js-3.1.0" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/debounce-1.2.0" + sources."@types/dom4-2.0.2" + sources."@types/emoji-mart-3.0.5" + sources."@types/fs-extra-8.1.2" + sources."@types/geojson-7946.0.8" + sources."@types/mapbox-gl-0.54.5" + sources."@types/mime-types-2.1.0" + sources."@types/node-14.17.9" + sources."@types/node-fetch-2.5.12" + sources."@types/prop-types-15.7.4" + sources."@types/rc-1.1.0" + sources."@types/react-16.14.12" + sources."@types/react-dom-16.9.14" + sources."@types/react-virtualized-9.21.13" + sources."@types/scheduler-0.16.2" + sources."@types/url-parse-1.4.3" + sources."ansi-styles-3.2.1" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."application-config-1.0.1" + sources."application-config-path-0.1.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-differ-3.0.0" + sources."array-each-1.0.1" + sources."array-slice-1.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-done-1.3.2" + sources."async-each-1.0.3" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + sources."babel-plugin-dynamic-import-node-2.3.3" + sources."babel-plugin-polyfill-corejs2-0.2.2" + sources."babel-plugin-polyfill-corejs3-0.2.4" + sources."babel-plugin-polyfill-regenerator-0.2.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" + sources."boolean-3.1.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."browserslist-4.16.7" + sources."buffer-crc32-0.2.13" + sources."buffer-from-1.1.2" + sources."cache-base-1.0.1" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."call-bind-1.0.2" + sources."caniuse-lite-1.0.30001249" + sources."chalk-2.4.2" + sources."chokidar-2.1.8" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."classnames-2.3.1" + sources."clone-response-1.0.2" + sources."clsx-1.1.1" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colorette-1.2.2" + sources."combined-stream-1.0.8" + sources."component-emitter-1.3.0" + (sources."concat-stream-1.6.2" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."config-chain-1.1.13" + (sources."convert-source-map-1.8.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."copy-descriptor-0.1.1" + sources."core-js-3.16.1" + (sources."core-js-compat-3.16.1" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."crypto-random-string-1.0.0" + sources."csscolorparser-1.0.3" + sources."csstype-3.0.8" + sources."debounce-1.2.1" + sources."debug-4.3.2" + sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" + sources."deep-equal-1.1.1" + sources."deep-extend-0.6.0" + sources."defer-to-connect-1.1.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."delayed-stream-1.0.0" + sources."deltachat-node-1.56.2" + sources."detect-node-2.1.0" + sources."dom-helpers-3.4.0" + sources."dom4-2.1.6" + sources."duplexer3-0.1.4" + sources."earcut-2.2.3" + sources."electron-13.1.8" + sources."electron-to-chromium-1.3.799" + sources."emoji-js-clean-4.0.0" + sources."emoji-mart-3.0.1" + sources."emoji-regex-9.2.2" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."env-paths-2.2.1" + sources."error-stack-parser-2.0.6" + sources."es6-error-4.1.1" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."esutils-2.0.3" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extract-zip-1.7.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."fd-slicer-1.1.0" + sources."file-uri-to-path-1.0.0" + sources."filesize-6.4.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."for-in-1.0.2" + sources."for-own-1.0.0" + sources."form-data-3.0.1" + sources."fragment-cache-0.2.1" + sources."fs-extra-8.1.0" + sources."fsevents-1.2.13" + sources."function-bind-1.1.1" + sources."gensync-1.0.0-beta.2" + sources."geojson-flatten-1.0.4" + sources."geojson-vt-3.2.1" + sources."get-intrinsic-1.1.1" + sources."get-stdin-7.0.0" + sources."get-stream-6.0.1" + sources."get-value-2.0.6" + sources."gl-matrix-3.3.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."glob-watcher-5.0.5" + (sources."global-agent-2.2.0" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + sources."global-tunnel-ng-2.7.1" + sources."globals-11.12.0" + sources."globalthis-1.0.2" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) + sources."graceful-fs-4.2.8" + sources."grid-index-1.1.0" + sources."gud-1.0.0" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."http-cache-semantics-4.1.0" + sources."ieee754-1.2.1" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."is-accessor-descriptor-1.0.0" + sources."is-arguments-1.1.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-core-module-2.5.0" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.5" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-negated-glob-1.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-regex-1.1.4" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isobject-3.0.1" + sources."js-tokens-4.0.0" + sources."jsesc-2.5.2" + sources."json-buffer-3.0.0" + sources."json-stringify-safe-5.0.1" + sources."json5-2.2.0" + sources."jsonfile-4.0.0" + sources."jsqr-1.4.0" + sources."just-debounce-1.1.0" + sources."kdbush-3.0.0" + sources."keyv-3.1.0" + sources."kind-of-6.0.3" + sources."lodash-4.17.21" + sources."lodash.debounce-4.0.8" + sources."lodash.pick-4.4.0" + sources."loose-envify-1.4.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + (sources."mapbox-gl-1.13.1" // { + dependencies = [ + sources."rw-1.3.3" + ]; + }) + (sources."matcher-3.0.0" // { + dependencies = [ + sources."escape-string-regexp-4.0.0" + ]; + }) + sources."micromatch-3.1.10" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" + sources."mimic-response-1.0.1" + sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."moment-2.29.1" + sources."ms-2.1.2" + sources."murmurhash-js-1.0.0" + sources."nan-2.15.0" + sources."nanomatch-1.2.13" + sources."napi-macros-2.0.0" + sources."node-fetch-2.6.1" + sources."node-gyp-build-4.2.3" + sources."node-releases-1.1.73" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.1" + sources."normalize.css-8.0.1" + sources."npm-conf-1.1.3" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-is-1.1.5" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.2" + sources."object.defaults-1.1.0" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."p-cancelable-1.1.0" + sources."pascalcase-0.1.1" + sources."path-browserify-1.0.1" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.7" + sources."pbf-3.2.1" + sources."pend-1.2.0" + sources."picomatch-2.3.0" + sources."pify-3.0.0" + sources."popper.js-1.16.1" + sources."posix-character-classes-0.1.1" + sources."potpack-1.0.1" + sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."prop-types-15.7.2" + sources."proto-list-1.2.4" + sources."protocol-buffers-schema-3.5.1" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qr.js-0.0.0" + sources."querystringify-2.2.0" + sources."quickselect-2.0.0" + sources."rc-1.2.8" + sources."react-17.0.2" + sources."react-dom-17.0.2" + sources."react-is-16.13.1" + sources."react-lifecycles-compat-3.0.4" + sources."react-popper-1.3.11" + sources."react-qr-reader-2.2.1" + sources."react-qr-svg-2.4.0" + sources."react-string-replace-0.4.4" + sources."react-transition-group-2.9.0" + (sources."react-virtualized-9.22.3" // { + dependencies = [ + sources."dom-helpers-5.2.1" + ]; + }) + sources."readable-stream-3.6.0" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."regenerate-1.4.2" + sources."regenerate-unicode-properties-8.2.0" + sources."regenerator-runtime-0.13.9" + sources."regenerator-transform-0.14.5" + sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.3.1" + sources."regexpu-core-4.7.1" + sources."regjsgen-0.5.2" + (sources."regjsparser-0.6.9" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."requires-port-1.0.0" + sources."resize-observer-polyfill-1.5.1" + sources."resolve-1.20.0" + sources."resolve-protobuf-schema-2.1.0" + sources."resolve-url-0.2.1" + sources."responselike-1.0.2" + sources."ret-0.1.15" + sources."roarr-2.15.4" + sources."rtcpeerconnection-shim-1.2.15" + sources."rw-0.1.4" + sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" + (sources."sass-1.37.5" // { + dependencies = [ + sources."anymatch-3.1.2" + sources."binary-extensions-2.2.0" + sources."braces-3.0.2" + sources."chokidar-3.5.2" + sources."fill-range-7.0.1" + sources."fsevents-2.3.2" + sources."glob-parent-5.1.2" + sources."is-binary-path-2.1.0" + sources."is-number-7.0.0" + sources."readdirp-3.6.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."sax-1.2.4" + sources."scheduler-0.20.2" + sources."sdp-2.12.0" + sources."semver-6.3.0" + sources."semver-compare-1.0.0" + (sources."serialize-error-7.0.1" // { + dependencies = [ + sources."type-fest-0.13.1" + ]; + }) + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."simple-markdown-0.7.3" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + sources."source-map-0.5.7" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.6.1" + sources."source-map-resolve-0.5.3" + sources."source-map-support-0.5.19" + sources."source-map-url-0.4.1" + sources."split-string-3.1.0" + sources."split2-3.2.2" + sources."sprintf-js-1.1.2" + sources."stackframe-1.2.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."stream-exhaust-1.0.2" + sources."string_decoder-1.3.0" + sources."strip-json-comments-2.0.1" + sources."sumchecker-3.0.1" + sources."supercluster-7.1.3" + sources."supports-color-5.5.0" + sources."temp-dir-1.0.0" + sources."tempy-0.3.0" + sources."tinyqueue-2.0.3" + sources."to-fast-properties-2.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-readable-stream-1.0.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."traverse-0.6.6" + sources."tslib-1.13.0" + sources."tunnel-0.0.6" + sources."type-fest-0.3.1" + sources."typed-styles-0.0.7" + sources."typedarray-0.0.6" + sources."typescript-3.9.10" + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.2.0" + sources."unicode-property-aliases-ecmascript-1.1.0" + sources."union-value-1.0.1" + sources."unique-string-1.0.0" + sources."universalify-0.1.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."upath-1.2.0" + sources."urix-0.1.0" + sources."url-parse-1.5.3" + sources."url-parse-lax-3.0.0" + sources."use-3.1.1" + sources."use-debounce-3.4.3" + sources."util-deprecate-1.0.2" + sources."vt-pbf-3.1.3" + sources."warning-4.0.3" + sources."webrtc-adapter-7.7.1" + sources."wrappy-1.0.2" + sources."xml-js-1.6.11" + sources."yallist-4.0.0" + sources."yauzl-2.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; @@ -78379,7 +79773,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.16.0" + sources."core-js-3.16.1" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" (sources."cross-spawn-windows-exe-1.2.0" // { @@ -78939,7 +80333,7 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -81360,7 +82754,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-export-default-from-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" @@ -81912,7 +83306,7 @@ in sources."semver-6.3.0" ]; }) - (sources."core-js-compat-3.16.0" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."browserslist-4.16.7" sources."semver-7.0.0" @@ -83698,7 +85092,7 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -83960,7 +85354,7 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -86487,7 +87881,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" @@ -86496,7 +87890,7 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/runtime-7.14.8" - sources."@babel/standalone-7.15.1" + sources."@babel/standalone-7.15.2" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -90986,7 +92380,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" @@ -92270,7 +93664,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -96302,7 +97696,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" @@ -96641,7 +98035,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.0" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -97981,7 +99375,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" @@ -99283,7 +100677,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -99911,7 +101305,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.16.0" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -100876,7 +102270,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.56.0" + sources."rollup-2.56.1" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -103714,7 +105108,7 @@ in sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -103939,7 +105333,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.0" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -106136,10 +107530,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.12.0"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.12.0.tgz"; - sha512 = "3kBjfvJo6eFu6tKpXFhit/Mihd364cjaG4bblu4px8kVbSX+oGKmPBGver4zLG2dP0txtglNU+AS0e1OGEJQMw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.12.1.tgz"; + sha512 = "p2fowre11u8/f6rw6n1zadtpNLQd2XNux40sUUdcVQqwryUG0YO7xveP96iRTBSWi+RdyCRlXnDgppyvb31d8g=="; }; buildInputs = globalBuildInputs; meta = { @@ -107203,7 +108597,7 @@ in sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -107569,7 +108963,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.0" // { + (sources."core-js-compat-3.16.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -109092,7 +110486,7 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" @@ -109586,10 +110980,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.56.0"; + version = "2.56.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.56.0.tgz"; - sha512 = "weEafgbjbHCnrtJPNyCrhYnjP62AkF04P0BcV/1mofy1+gytWln4VVB1OK462cq2EAyWzRDpTMheSP/o+quoiA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.1.tgz"; + sha512 = "KkrsNjeiTfGJMUFBi/PNfj3fnt70akqdoNXOjlzwo98uA1qrlkmgt6SGaK5OwhyDYCVnJb6jb2Xa2wbI47P4Nw=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -112022,7 +113416,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.16.0" + sources."core-js-3.16.1" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -114576,7 +115970,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.0" + sources."@babel/parser-7.15.2" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -117198,7 +118592,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.16.0" + sources."core-js-3.16.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -120924,7 +122318,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.16.0" + sources."core-js-pure-3.16.1" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -123095,7 +124489,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.16.0" + sources."core-js-3.16.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6997047e1a05..1eb0528008a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1463,6 +1463,10 @@ with pkgs; deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; + deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + deltachat-electron = callPackage ../applications/networking/instant-messengers/deltachat-electron { }; From bc112ba47488603dd2ae243ec8ef252af772c6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 18 Jul 2021 19:29:16 +0200 Subject: [PATCH 111/375] deltachat-electron: make alias of deltachat-desktop --- .../deltachat-electron/default.nix | 40 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 -- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix diff --git a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix deleted file mode 100644 index ee43e4475d7d..000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: - -let - pname = "deltachat-electron"; - version = "1.20.3"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; - sha256 = "sha256-u0YjaXb+6BOBWaZANPcaxp7maqlBWAtecSsCGbr67dk="; - }; - - appimageContents = appimageTools.extract { inherit name src; }; - -in -appimageTools.wrapType2 { - inherit name src; - - profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; - - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D \ - ${appimageContents}/deltachat-desktop.desktop \ - $out/share/applications/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - - meta = with lib; { - description = "Electron client for DeltaChat"; - homepage = "https://delta.chat/"; - license = licenses.gpl3; - maintainers = with maintainers; [ ehmry ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ae0194850666..ec92bfeb5832 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -182,6 +182,7 @@ mapAliases ({ debian_devscripts = debian-devscripts; # added 2016-03-23 deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 + deltachat-electron = deltachat-desktop; # added 2021-07-18 desktop_file_utils = desktop-file-utils; # added 2018-02-25 devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1eb0528008a5..9de16ebc4e40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1467,9 +1467,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - deltachat-electron = callPackage - ../applications/networking/instant-messengers/deltachat-electron { }; - deskew = callPackage ../applications/graphics/deskew { }; detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { }; From 280d92039706add32e4c9e525a0c941e776af4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Aug 2021 11:41:34 +0200 Subject: [PATCH 112/375] kdeltachat: supports Linux --- .../networking/instant-messengers/kdeltachat/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 3266b36194f4..dabec65b3cd4 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -66,5 +66,6 @@ in mkDerivation rec { homepage = "https://git.sr.ht/~link2xt/kdeltachat"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.linux; }; } From 58647d0bbf47572e4a9c1eefbd53c2f31c4aeae2 Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Mon, 9 Aug 2021 04:54:36 +0000 Subject: [PATCH 113/375] vscode: 1.58.2 -> 1.59.0 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 908739b6aa30..338a1e23af2a 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "049spg4c1arkw97mg0h046kiirmcrjj97sy4ldiblwldjn510acw"; - x86_64-darwin = "0g6b1891ag4a6p7rlkfka5v4nbmpr4ckkmibhw8l3wa9zdzs77x6"; - aarch64-linux = "1qvk6cn5v9bz4vl5ifpdgrba94v6a54xx8s3fxdkj3lqvq27kpd1"; - aarch64-darwin = "1whgjkxy70ifx1vaddxr8f1xcg651fhca4x7rzidzbyyf3baghy0"; - armv7l-linux = "1k45s81s4ispc0vz7i17a7gss05d82vpymxgangg6f1yxwz944r4"; + x86_64-linux = "14j1bss4bqw39ijmyh0kyr5xgzq61bc0if7g94jkvdbngz6fa25f"; + x86_64-darwin = "0922r49475j1i8jrx5935bly7cv26hniz9iqf30qj6qs6d8kibci"; + aarch64-linux = "11kkys3fsf4a4hvqv524fkdl686addd3ygzz0mav09xh8wjqbisw"; + aarch64-darwin = "1xk56ww2ndksi6sqnr42zcqx2fl52aip3jb4fmdmqg1cvllfx0sd"; + armv7l-linux = "1jiyjknl2xxivifixcwvyi6qsq7kr71gbalzdj6xca2i6pc1gbvp"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.58.2"; + version = "1.59.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From ebc4dae8cb65706c5d91afe3dc39d1f6c0f17e5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 02:34:24 +0200 Subject: [PATCH 114/375] python310: 3.10.0b3 -> 3.10.0rc1 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index c8fbe340ac9e..73b8912027bf 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -198,9 +198,9 @@ in { major = "3"; minor = "10"; patch = "0"; - suffix = "b3"; + suffix = "rc1"; }; - sha256 = "05fc4mp2ysb372bzkwbn1b1z01bfldnaqig6rxmif58hs3aawrr2"; + sha256 = "0f76q6rsvbvrzcnsp0k7sp555krrgvjpcd09l1rybl4249ln2w3r"; inherit (darwin) configd; inherit passthruFun; }; From 94f9f61f64cec4cdb628ce633e7eea2a5cf83922 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Feb 2021 19:02:58 +0000 Subject: [PATCH 115/375] wxsqlite3: 4.6.2 -> 4.6.4 Update license. --- pkgs/development/libraries/wxsqlite3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 8acd4e99636b..5fdac25eb97f 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.6.2"; + version = "4.6.4"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha256 = "10jlb4p3ahck9apcy2c2mrrjynv4c1dfwwbf1vwd8dl17pgv4kgs"; + sha256 = "sha256-fIm8xbNP7pjzvfBn7NgYmUtbVVh2aiaXQVANJQnrWCs="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; - license = [ licenses.lgpl2 ]; + license = [ licenses.lgpl3Plus licenses.gpl3Plus ]; }; } From 40e4d4d50df435e6c26f8b6d88f31551d544ee9f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Aug 2021 09:01:01 +0300 Subject: [PATCH 116/375] lenmus: mark as broken for aarch64 --- pkgs/applications/misc/lenmus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index a9aef85753ec..1dac72bd0d74 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; + broken = stdenv.hostPlatform.isAarch64; }; } From 5c25004d57c3269a638a5d245854b214cc86d752 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 06:06:35 +0000 Subject: [PATCH 117/375] ircdHybrid: 8.2.36 -> 8.2.38 --- pkgs/servers/irc/ircd-hybrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index b4b567608f3e..f115b7109186 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ircd-hybrid"; - version = "8.2.36"; + version = "8.2.38"; src = fetchurl { url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz"; - sha256 = "0sg4g0znl8ic8vklpy96z88gjksc165kl945a6fr1j4xc1bf8gcv"; + sha256 = "sha256-xRA0hzowgjSQtb37Pnw7de1nPtlHAg2FwRMSaKdr+2M="; }; buildInputs = [ openssl zlib ]; From 03a7b232b0e2a0694f5ebbaaf244321229e65d15 Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Mon, 9 Aug 2021 04:54:59 +0000 Subject: [PATCH 118/375] vscodium: 1.58.2 -> 1.59.0 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 000c12bc72c7..0a1568b4e1e7 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "11h4c5ghgn3qrg66jh2par3cl3fqzn9xb7gdniww4badnyajnij8"; - x86_64-darwin = "0hd3qdxg4cknk3fxv509jlblwmfx65bm2a4arsg255224dpg64n2"; - aarch64-linux = "0waakj413kqf68sawajd3n24qdbx6b2svyb4lgbn0sy1apc96s3c"; - armv7l-linux = "1ij2bmsk601f1vjljj6gvxsxrcjqf2m74s9kc006hmcz7czjgk8f"; + x86_64-linux = "0yx0h7rd8v9j3yq863dj78bm587s8lpisbn1skb5whv6qv88x7c0"; + x86_64-darwin = "1b5jr08cgl49rh26id8iwi64d32ssr7kis72zcqg0jkw7larxvvh"; + aarch64-linux = "1a62krnilfi7nr7mmxyv3danj7h2yfdwg784q8vhrdjyqjd8gjbs"; + armv7l-linux = "1axazx7hf6iw0dq1m2049kfrmk8jndycz9pcn3csj6rm65plg746"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.58.2"; + version = "1.59.0"; pname = "vscodium"; executableName = "codium"; From e63d487cd80754ca9ce18d66fa09e0bcb7dce3f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 08:25:41 +0200 Subject: [PATCH 119/375] python3Packages.arcam-fmj: 0.7.0 -> 0.10.0 --- pkgs/development/python-modules/arcam-fmj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index 4c3ff7d85a57..55e629d9358e 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "0.7.0"; + version = "0.10.0"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = version; - sha256 = "0y4wvvbcsizjd9qz6iw4gjhq5qf0qcqs27hpx1cd90vhy6rclxm0"; + sha256 = "sha256-pPPBeOwB2HgyxxMnR5yU3ZwDaJVP0v7/fkeDkeGGhPM="; }; propagatedBuildInputs = [ From f745e88fdd899907c1846ab676950992ad77e486 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 08:31:29 +0200 Subject: [PATCH 120/375] python3Packages.soco: 0.22.3 -> 0.23.3 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index d45540ba85eb..2360cc81e39a 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.23.2"; + version = "0.23.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "0qq2k0xy8a5b54nk7h4ipkvq8dpzklhgcwcffhnlcnl1vhq2dh33"; + sha256 = "sha256-T6gDImH/HfHg8e1YzUYB8zr2GJHRtF6vdYm2cSiXSb0="; }; propagatedBuildInputs = [ From cef0116759fc2214cb74941d0cafd59b80cd9d9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 08:37:53 +0200 Subject: [PATCH 121/375] python3Packages.zeroconf: 0.33.4 -> 0.34.3 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index ad84bdd1c566..edd5819177ee 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.33.4"; + version = "0.34.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-ld8Mo465fJTVNSv6YvKcsPafiIij4PEmeycWB3M3ewU="; + sha256 = "sha256-HJSqQl7dd8sN490lqGHWg6QiJblGKKlVMn7UJDQb7ZA="; }; propagatedBuildInputs = [ From 8e6acb7588e282347a2375b7e93f1d7bd9c22f28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 08:38:21 +0200 Subject: [PATCH 122/375] python3Packages.types-decorator: 0.1.5 -> 0.1.7 --- pkgs/development/python-modules/types-decorator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index 54f531e0f52f..b0f857196d39 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "0.1.5"; + version = "0.1.7"; src = fetchPypi { inherit pname version; - sha256 = "0rfg2s4y23w1xk0502sg2jqbzswalkg6infblyzgf94i4bsg1j48"; + sha256 = "0pmcc8xpsmij4174ky81vp811yxgic2lj1dfj2fa0ii87nlcfwhp"; }; # Modules doesn't have tests From f57a3d0f9e3df95bef1f73faa943b0e97bfcdf6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 08:39:42 +0200 Subject: [PATCH 123/375] python3Packages.types-requests: 2.25.1 -> 2.25.6 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index a291b23d3e2e..2d7ccc052287 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.25.1"; + version = "2.25.6"; src = fetchPypi { inherit pname version; - sha256 = "0vyr1vgg03a1gkjcz59iwqc1q9mx4ij7slslsp08z2h8fbhlwl9d"; + sha256 = "1vh203dppi6457lwv7z46dc8rpanjlahk4v3394nq1jwyp0425g2"; }; # Modules doesn't have tests From 319556224cdf20bef78a7395de9fcc5ff06d2d79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 08:50:35 +0200 Subject: [PATCH 124/375] python3Packages.plugwise: 0.11.1 -> 0.11.2 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index c629e2d94515..3b37b236c48d 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = version; - sha256 = "sha256-b00jfPZTVRI7BRpUHI2NjcydkykC/1HjmVzDaIech8c="; + sha256 = "sha256-ywVCa6PfyQ1SiejE2IYkf/IpQM0iDXJPpCm0vDtlrw8="; }; propagatedBuildInputs = [ From b09e31159179854eb0abbabd7d5b60b8a53210c5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 9 Aug 2021 00:13:50 -0700 Subject: [PATCH 125/375] tailscale: fix runtime dependency on procps ``` sudo tailscale up --advertise-exit-node Warning: couldn't check net.ipv4.ip_forward (exec: "sysctl": executable file not found in $PATH). ``` --- pkgs/servers/tailscale/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 4e0d3d0b701f..d22d358d4480 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2 }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps }: buildGoModule rec { pname = "tailscale"; @@ -29,6 +29,10 @@ buildGoModule rec { wrapProgram $out/bin/tailscaled --prefix PATH : ${ lib.makeBinPath [ iproute2 iptables ] } + + wrapProgram $out/bin/tailscale --suffix PATH : ${ + lib.makeBinPath [ procps ] + } sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service ''; From 1884aebc9a777cb889638849b595c3574b6e42ec Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 9 Aug 2021 09:26:15 +0200 Subject: [PATCH 126/375] rewritefs: 2017-08-14 -> 2020-02-21 --- pkgs/os-specific/linux/rewritefs/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 161db99114b8..f7c79106c41d 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,18 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }: +{ lib, stdenv, fetchFromGitHub, pkg-config, fuse3, fuse, pcre }: stdenv.mkDerivation { pname = "rewritefs"; - version = "2017-08-14"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "sloonz"; repo = "rewritefs"; - rev = "33fb844d8e8ff441a3fc80d2715e8c64f8563d81"; - sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; + rev = "bc241c7f81e626766786b56cf71d32c1a6ad510c"; + sha256 = "0zj2560hcbg5az0r8apnv0zz9b22i9r9w6rlih0rbrn673xp7q2i"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse pcre ]; + # Note: fuse is needed solely because (unlike fuse3) it exports ulockmgr.h. + # This library was removed in fuse 3 to be distributed separately, but + # apparently it's not. + buildInputs = [ fuse3 fuse pcre ]; prePatch = '' # do not set sticky bit in nix store From 72a522e79562f435e38249d2a91a8fd94f44aa32 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 07:27:37 +0000 Subject: [PATCH 127/375] jmol: 14.31.46 -> 14.31.49 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index efea16692545..a3add93c8f70 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.46"; + version = "14.31.49"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-U8k8xQws0vIJ3ZICzZXxSbtl7boCzRqG9mFSTXvmCvg="; + sha256 = "sha256-P+bzimBVammX5LxE6Yd6CmvmBeG8WdyA1T9bHXd+ifI="; }; patchPhase = '' From f3bcf7c2068af2c3317eb1e86039d4011fec4046 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 10:12:19 +0200 Subject: [PATCH 128/375] python3Packages.pyupgrade: 2.23.1 -> 2.23.3 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 3d37dcae8720..411aa23254ce 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.23.1"; + version = "2.23.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "1jc0gh0y5fz02wab50v6m4x0pfycdkjvf1vw05d8d0yqsv7ld7fw"; + sha256 = "sha256-Z17Bs3Mr1PJ9bYP2vsXTaJ85jOoIIlKLWR6D6s7enFs="; }; checkInputs = [ pytestCheckHook ]; From 8b9bd1657a9da08a4e6666ab148f924154c06f35 Mon Sep 17 00:00:00 2001 From: Max Hille Date: Tue, 12 Jan 2021 15:23:20 +0100 Subject: [PATCH 129/375] aether: init at 2.0.0-dev.15 basically cloned the discord package as it is also electron --- .../networking/aether/default.nix | 115 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 117 insertions(+) create mode 100644 pkgs/applications/networking/aether/default.nix diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix new file mode 100644 index 000000000000..ddb137137cf3 --- /dev/null +++ b/pkgs/applications/networking/aether/default.nix @@ -0,0 +1,115 @@ +{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook +, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig +, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid +, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext +, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence +, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu +, fetchurl, fetchFromGitHub, imagemagick, copyDesktopItems +}: + +let + binaryName = "AetherP2P"; +in +stdenv.mkDerivation rec { + pname = "aether"; + version = "2.0.0-dev.15"; + + srcs = [ + (fetchurl { + url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; + sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; + # % in the url / canonical filename causes an error + name = "aether-tarball.tar.gz"; + }) + (fetchFromGitHub { + owner = "aethereans"; + repo = "aether-app"; + rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; + sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; + }) + ]; + + sourceRoot = "Aether-${version}+2011262249.19338c93"; + + # there is no logo in the tarball so we grab it from github and convert it in the build phase + buildPhase = '' + convert ../source/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png + ''; + + dontWrapGApps = true; + + buildInputs = [ + alsa-lib + cups + libdrm + libuuid + libXdamage + libX11 + libXScrnSaver + libXtst + libxcb + libxshmfence + mesa + nss + ]; + + nativeBuildInputs = [ + imagemagick + autoPatchelfHook + wrapGAppsHook + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = binaryName; + icon = pname; + desktopName = "Aether"; + genericName = meta.description; + categories = "Network;"; + mimeType = "x-scheme-handler/aether"; + }) + ]; + + installPhase = + let + libPath = lib.makeLibraryPath [ + libcxx systemd libpulseaudio libdrm mesa + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype + gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid + libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender + libXtst nspr nss libxcb pango systemd libXScrnSaver + libappindicator-gtk3 libdbusmenu + ]; + in + '' + mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/512x512/apps} + mv * $out/opt/${binaryName} + + chmod +x $out/opt/${binaryName}/${binaryName} + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + $out/opt/${binaryName}/${binaryName} + + wrapProgram $out/opt/${binaryName}/${binaryName} \ + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ + --prefix LD_LIBRARY_PATH : ${libPath} + + ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ + + ln -s $out/opt/${binaryName}/aether.png $out/share/icons/hicolor/512x512/apps/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Peer-to-peer ephemeral public communities"; + homepage = "https://getaether.net/"; + downloadPage = "https://getaether.net/download/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ maxhille ]; + # other platforms could be supported by building from source + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 174927ce3af4..bee0133878b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -174,6 +174,8 @@ in addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; + aether = callPackage ../applications/networking/aether { }; + alda = callPackage ../development/interpreters/alda { }; althttpd = callPackage ../servers/althttpd { }; From e1856e3955f44e66d555a25e02bcbe03444d8536 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 08:44:10 +0000 Subject: [PATCH 130/375] kube-router: 1.1.1 -> 1.2.2 --- pkgs/applications/networking/cluster/kube-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 586fc6cf806b..85b83c994df8 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "1.1.1"; + version = "1.2.2"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U7vjWtVXmyEPYFS1fAPOgV3WILGPhWsmoawV7B0pZaE="; + sha256 = "sha256-/VToLQexvRtcBU+k8WnGEcfLfxme/hgRnhU8723BEFU="; }; buildFlagsArray = '' From 0f2b0a583ad000eedb4fa1c03e26ebe5c6e2daf8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 09:01:48 +0000 Subject: [PATCH 131/375] libaudec: 0.2.4 -> 0.3.4 --- pkgs/development/libraries/libaudec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/development/libraries/libaudec/default.nix index a243e56c2fe3..78e4b5cfa404 100644 --- a/pkgs/development/libraries/libaudec/default.nix +++ b/pkgs/development/libraries/libaudec/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libaudec"; - version = "0.2.4"; + version = "0.3.4"; src = fetchFromGitHub { owner = "zrythm"; repo = "libaudec"; rev = "v${version}"; - sha256 = "1570m2dfia17dbkhd2qhx8jjihrpm7g8nnyg6n4wif4vv229s7dz"; + sha256 = "sha256-8morbrq8zG+2N3ruMeJa85ci9P0wPQOfZ5H56diFEAo="; }; buildInputs = [ libsndfile libsamplerate ]; From de5a1390bdb9b6e4fb1d385dcfade28f52225634 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 9 Aug 2021 10:07:10 +0100 Subject: [PATCH 132/375] wolfssl: remove myself from maintainers --- pkgs/development/libraries/wolfssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index f4bfa96a6ffc..d696961a4eb0 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://www.wolfssl.com/"; platforms = platforms.all; license = licenses.gpl2Plus; - maintainers = with maintainers; [ fab mcmtroffaes ]; + maintainers = with maintainers; [ fab ]; }; } From 26c6e505b0ef7d0a4531d5d0bbf98b20201b476f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 09:07:41 +0000 Subject: [PATCH 133/375] kodiPackages.inputstream-adaptive: 2.6.22 -> 2.6.23 --- .../video/kodi-packages/inputstream-adaptive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index 0230b6bcf2d0..f8d3054cc8b2 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.6.22"; + version = "2.6.23"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-WSFbDuUgw0WHWb3ZZVavwpu1TizU9lMA5JAC5haR7c0="; + sha256 = "sha256-3w/fMaGqaOHSE7GUJtYoWovBKSOv3sNOIX1UOcp8hQE="; }; extraNativeBuildInputs = [ gtest ]; From 732b2f8759f3f85ed7beba6f371abc15a2b4ad6e Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 9 Aug 2021 19:09:43 +0900 Subject: [PATCH 134/375] firefox-bin: fix parameter of updateScript --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 +- pkgs/applications/networking/browsers/firefox-bin/update.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 9f4923a7ec5f..e8d061bbfc31 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -187,7 +187,7 @@ stdenv.mkDerivation { # update with: # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { - inherit pname version channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; + inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; baseUrl = if channel == "devedition" then "http://archive.mozilla.org/pub/devedition/releases/" diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index a2fdb82ffec0..e5284c4097c9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -1,4 +1,4 @@ -{ name +{ pname , channel , writeScript , xidel @@ -17,7 +17,7 @@ let isBeta = channel != "release"; -in writeScript "update-${name}" '' +in writeScript "update-${pname}" '' #!${runtimeShell} PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin set -eux From 0282a1ef86bfcb2db9fea7fb886b0f26c1c466d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 12:18:24 +0200 Subject: [PATCH 135/375] python3Packages.coapthon3: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/coapthon3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coapthon3/default.nix b/pkgs/development/python-modules/coapthon3/default.nix index 6f22e8e9f296..643072269a36 100644 --- a/pkgs/development/python-modules/coapthon3/default.nix +++ b/pkgs/development/python-modules/coapthon3/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "CoAPthon3"; - version = "1.0.1"; + version = "1.0.2"; disabled = isPy27; src = fetchFromGitHub { owner = "Tanganelli"; repo = pname; rev = version; - sha256 = "1im35i5i72y1p9qj8ixkwq7q6ksbrmi42giqiyfgjp1ym38snl69"; + sha256 = "sha256-9QApoPUu3XFZY/lgjAsf5r2StFiRtUd1UXWDrzYUh6w="; }; propagatedBuildInputs = [ cachetools ]; From 06a8b080e58d4394d750aa5d1cb42e4262ed7bf2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 13:29:02 +0200 Subject: [PATCH 136/375] python3Packages.py-air-control-exporter: fix build and cleanup --- .../py-air-control-exporter/default.nix | 49 ++++++++++++++++--- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 869aea01a29a..1a8a52fd246e 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,6 +1,15 @@ -{ buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests -, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytest-runner -, setuptools-scm }: +{ lib +, buildPythonPackage +, click +, fetchPypi +, flask +, isPy27 +, nixosTests +, prometheus_client +, py-air-control +, pytestCheckHook +, setuptools-scm +}: buildPythonPackage rec { pname = "py-air-control-exporter"; @@ -12,14 +21,40 @@ buildPythonPackage rec { sha256 = "ece2e446273542e5c0352c9d6e80d8279132c6ada3649c59e87a711448801a3b"; }; - nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook pytest-cov pytest-runner ]; - propagatedBuildInputs = [ flask prometheus_client py-air-control ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click + flask + prometheus_client + py-air-control + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + substituteInPlace setup.cfg \ + --replace "--cov=py_air_control_exporter" "" + ''; + + disabledTests = [ + # Tests are outdated + "test_help" + "test_unknown_protocol" + ]; + + pythonImportsCheck = [ "py_air_control_exporter" ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; }; meta = with lib; { - description = "Exports Air Quality Metrics to Prometheus."; + description = "Exports Air Quality Metrics to Prometheus"; homepage = "https://github.com/urbas/py-air-control-exporter"; license = licenses.mit; maintainers = with maintainers; [ urbas ]; From 98ce437c4e4aea7912495b13d3159bfc549136ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 11:40:42 +0000 Subject: [PATCH 137/375] logseq: 0.2.10 -> 0.3.2 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 559538cdccd2..2bc2a54351db 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.2.10"; + version = "0.3.2"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "1YVOyaHDcv+GKx5nQq3cUrViKZ6CEuHQPiDvK0Jv+Qc="; + sha256 = "4gWpB3uTQsm9oRvT9rGizIU7xgrZim7jxjJGfME7WAg="; name = "${pname}-${version}.AppImage"; }; From a777419869c5be14082b03ac11eaae9cd76680b1 Mon Sep 17 00:00:00 2001 From: "Manuel F. Schmid" Date: Mon, 9 Aug 2021 12:55:49 +0200 Subject: [PATCH 138/375] zeroad: 0.0.24b -> 0.0.25 --- pkgs/games/0ad/data.nix | 2 +- pkgs/games/0ad/game.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 9533af21b15d..0a763bb2be89 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; - sha256 = "0b53jzl64i49rk3n3c3x0hibwbl7vih2xym8jq5s56klg61qdxa1"; + sha256 = "1d8c58s2fwdmjjpna57gk0d2ar17f2fqcrkgsn45x6s3ickf984p"; }; installPhase = '' diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index feaf4347329c..d5c483fa9f27 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "0ad"; - version = "0.0.24b"; + version = "0.0.25"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; - sha256 = "1a1py45hkh2cswi09vbf9chikgxdv9xplsmg6sv6xhdznv4j6p1j"; + sha256 = "03s38pknggsbzkhgj692yd3vm16ass7k4bgjn63qwn51q4vsnbjr"; }; nativeBuildInputs = [ python2 perl pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af6ed97f140..8b505e47a269 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30006,7 +30006,7 @@ with pkgs; keen4 = callPackage ../games/keen4 { }; zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { - wxGTK = wxGTK30; + wxGTK = wxGTK31; }); zeroad = zeroadPackages.zeroad; From 1eec3990a05c4225718093e48fb0e8033fad1a3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 12:05:55 +0000 Subject: [PATCH 139/375] lombok: 1.18.16 -> 1.18.20 --- pkgs/development/libraries/java/lombok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 5519a1fb7665..b4f0f4525f79 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { - name = "lombok-1.18.16"; + name = "lombok-1.18.20"; src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj"; + sha256 = "sha256-zpR75sL751n7vo7ztCtoJfgUyYyIU/EBPy2WMM7fdLA="; }; nativeBuildInputs = [ makeWrapper ]; From 938c221de58757fab556d50aecfc286963610634 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 12:10:09 +0000 Subject: [PATCH 140/375] lisgd: 0.3.0 -> 0.3.1 --- pkgs/tools/inputmethods/lisgd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/lisgd/default.nix b/pkgs/tools/inputmethods/lisgd/default.nix index 02344d153dbf..8b26e35c0541 100644 --- a/pkgs/tools/inputmethods/lisgd/default.nix +++ b/pkgs/tools/inputmethods/lisgd/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "lisgd"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromSourcehut { owner = "~mil"; repo = "lisgd"; rev = version; - sha256 = "0g2pwff2c6ipxz83l26kx4rs3vah9qlm4h0n4x1k80mzqzf15hb6"; + sha256 = "sha256-A8SsF5k4GwfVCj8JtodNWoLdPzaA9YsoP5EHHakUguc="; }; inherit patches; From 22fdabc4cbf2c80b9d040b75390da6bbde816d42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 12:14:56 +0000 Subject: [PATCH 141/375] liquibase: 4.4.2 -> 4.4.3 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 9b3a92fecc46..54ede5fc3451 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-qOKMyqf3KX7pWjslVgcPiGlTiwvMZLvm7DiatmSLd1U="; + sha256 = "sha256-td+mBf/JhTw5vvlupyllpZ2e4So7y1kEC1OdR4LUv/k="; }; nativeBuildInputs = [ makeWrapper ]; From 6ae576c8da48f5c824ad4b336781c8c969092a7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 14:40:54 +0200 Subject: [PATCH 142/375] home-assistant: 2021.8.3 -> 2021.8.4 --- pkgs/servers/home-assistant/component-packages.nix | 6 +++--- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 6925f4a76242..717f83d54870 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,14 +2,14 @@ # Do not edit! { - version = "2021.8.3"; + version = "2021.8.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ aiopulse ]; "actiontec" = ps: with ps; [ ]; - "adax" = ps: with ps; [ ]; # missing inputs: adax + "adax" = ps: with ps; [ adax ]; "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ advantage-air ]; @@ -659,7 +659,7 @@ "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; - "prosegur" = ps: with ps; [ ]; # missing inputs: pyprosegur + "prosegur" = ps: with ps; [ pyprosegur ]; "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; "proxmoxve" = ps: with ps; [ proxmoxer ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ce08141358b3..87dcd3f545d0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -138,7 +138,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.8.3"; + hassVersion = "2021.8.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -155,7 +155,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "02hm4x1qx9vd39d9l2gl2pnfnjmpk6p2w72lj45cvp3jimdg30fz"; + sha256 = "0xnw6a1wfk0br0lyplhbp64fqbywa3ld3ggj0czyi1c0n8pqx7cq"; }; # leave this in, so users don't have to constantly update their downstream patch handling From 2df8eb3d19a208b2b870cbf5e8ec108a6b1cfb54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Mar 2021 08:00:53 +0000 Subject: [PATCH 143/375] guile-lib: 0.2.6.1 -> 0.2.7 --- pkgs/development/guile-modules/guile-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 50c6a1daefb2..b5c358373fd2 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -10,11 +10,11 @@ assert stdenv ? cc && stdenv.cc.isGNU; stdenv.mkDerivation rec { pname = "guile-lib"; - version = "0.2.6.1"; + version = "0.2.7"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-bR09DxTbnSgLjUJ9bh3sRBfd0Cv/I71Zguy24mLrPyo="; + hash = "sha256-5O87hF8SGILHwM8E+BocuP02DG9ktWuGjeVUYhT5BN4="; }; nativeBuildInputs = [ From dc79d3b0da29cd63e4e8498feaec23db0bcb6f84 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Mon, 9 Aug 2021 09:34:27 -0400 Subject: [PATCH 144/375] emacsPackages: fix for missing passthru --- pkgs/top-level/emacs-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 30b834cc1116..ba1ed113ab60 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -79,7 +79,7 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ # Propagate overriden scope emacs = emacs'.overrideAttrs(old: { - passthru = old.passthru // { + passthru = (old.passthru or {}) // { pkgs = dontRecurseIntoAttrs self; }; }); From 14a6ba8e4750da6500f17bbda84fffc363ee5d7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 16:31:48 +0200 Subject: [PATCH 145/375] python3Packages.hstspreload: 2021.7.5 -> 2021.8.1 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 6833837b6968..7b92aeb269df 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.7.5"; + version = "2021.8.1"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-/89K41MrTdF68+BVkfnv+0d+6rBHdRGKpN2Psfr2Wog="; + sha256 = "0si22p461qydh874gkidiar89hrfx7lm7r7g6d1qi7lz8wlwcplv"; }; # tests require network connection From 10b2c83fcae0cfd48ed9899ee1d769986f42030f Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 9 Aug 2021 16:33:12 +0200 Subject: [PATCH 146/375] dasel: 1.16.1 -> 1.17.0 --- pkgs/applications/misc/dasel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index a6d7659531fe..afe7572cbf78 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BrtTBy/Tb4xfs7UHk1acRzKZWNZJqhufHG1ItcM8TPs="; + sha256 = "sha256-VZsYwsYec6Q9T8xkb60F0CvPVFd2WJgyOfegm5GuN8c="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; From c660c9342c551547ad51b1087f6400c8177a23ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 14:39:51 +0000 Subject: [PATCH 147/375] carla: 2.3.1 -> 2.3.2 --- pkgs/applications/audio/carla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index bdafb93955c6..5dca0da81fb2 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LM7wRvUg2Q3f4qBZN1MPvsLkdl1ziArCfhdalyD1G3w="; + sha256 = "sha256-en3eQtRUd2schpIccnuD42+wTYOAG9zsD6yNRA73bKE="; }; nativeBuildInputs = [ From 224e516ccb02ca1ed914fdbf695fe448737326a6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 24 Mar 2021 19:24:54 -0300 Subject: [PATCH 148/375] oh-my-fish: init at 7+unstable=2021-03-03 --- pkgs/shells/fish/oh-my-fish/default.nix | 60 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/shells/fish/oh-my-fish/default.nix diff --git a/pkgs/shells/fish/oh-my-fish/default.nix b/pkgs/shells/fish/oh-my-fish/default.nix new file mode 100644 index 000000000000..e0dca9419ebc --- /dev/null +++ b/pkgs/shells/fish/oh-my-fish/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, fish +, runtimeShell +, writeShellScript +}: + +stdenv.mkDerivation rec { + pname = "oh-my-fish"; + version = "7+unstable=2021-03-03"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "0b1396ad7962073fa25615bf03c43b53eddc2d56"; + hash = "sha256-lwMo4+PcYR9kYJPWK+ALiMfBdxFSgB2vjtSn8QrmmEA="; + }; + + buildInputs = [ + fish + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/bin $out/share/${pname} + cp -vr * $out/share/${pname} + + cat << EOF > $out/bin/omf-install + #!${runtimeShell} + + ${fish}/bin/fish \\ + $out/share/${pname}/bin/install \\ + --noninteractive \\ + --offline=$out/share/${pname} + + EOF + chmod +x $out/bin/omf-install + + runHook PostInstall + ''; + + meta = with lib; { + homepage = "https://github.com/oh-my-fish/oh-my-fish"; + description = "The Fish Shell Framework"; + longDescription = '' + Oh My Fish provides core infrastructure to allow you to install packages + which extend or modify the look of your shell. It's fast, extensible and + easy to use. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = fish.meta.platforms; + }; +} +# TODO: customize the omf-install script diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af6ed97f140..c9400596f359 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10544,6 +10544,8 @@ with pkgs; fish = callPackage ../shells/fish { }; + oh-my-fish = callPackage ../shells/fish/oh-my-fish { }; + wrapFish = callPackage ../shells/fish/wrapper.nix { }; fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); From 9d5be2dce43b583f0ea97bad7535ae67b857e12d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 15:35:52 +0000 Subject: [PATCH 149/375] checkstyle: 8.45 -> 8.45.1 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 998dce59a8da..c22f25fbc938 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.45"; + version = "8.45.1"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-XFeufPaMz5rk+Ym0zXFCitoi9+mDs/PZUByIeZrj538="; + sha256 = "sha256-H4w/rjVBhZCfBzLavd4/BkojwhCu05VsxrtzyS0wyk4="; }; nativeBuildInputs = [ makeWrapper ]; From 29850a46838eb46287bf003086cd08feee5e3d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 9 Aug 2021 12:39:09 -0300 Subject: [PATCH 150/375] marwaita: 10.0 -> 10.2 --- pkgs/data/themes/marwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index cdb7b4ed6e05..34f49955764b 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "10.0"; + version = "10.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "19xy6p3v4jqpw448ywmx1i6mbjpy06qa1rdwkdpxdlhf45fbdacr"; + sha256 = "09xh7yhnc7szk171n0qgr52xr7sw9qq4cb7qwrkhf0184idf0pik"; }; buildInputs = [ From f16321aad44d10cd45a3ef3453a3e98133d2f145 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 15:40:37 +0000 Subject: [PATCH 151/375] chrome-token-signing: 1.1.2-1 -> 1.1.5 --- pkgs/tools/security/chrome-token-signing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 5c2e6b4de152..18104aa7710d 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "chrome-token-signing"; - version = "1.1.2-1"; + version = "1.1.5"; src = fetchFromGitHub { owner = "open-eid"; repo = "chrome-token-signing"; rev = "v${version}"; - sha256 = "1vbghy12fjmq4m5l7hisq1ylnzy0rdnnd920xwamjamlx38jj3ln"; + sha256 = "sha256-wKy/RVR7jx5AkMJgHXsuV+jlzyfH5nDRggcIUgh2ML4="; }; buildInputs = [ qmake pcsclite pkg-config ]; From efbfe894e3380043d4b88cc5e95d807370818657 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Mon, 9 Aug 2021 22:45:12 +0700 Subject: [PATCH 152/375] yandex-browser: 21.5.3.753-1 -> 21.6.2.817-1 --- .../networking/browsers/yandex-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index 5c62dbb7e203..7fa9fb5237a9 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "21.5.3.753-1"; + version = "21.6.2.817-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-sI2p/fCaruUJ3qPMyy+12Bh5I1SH8m7sYX5yDex2rwg="; + sha256 = "sha256-xeZkQzVPPNABxa3/YBLoZl1obbFdzxdqIgLyoA4PN8U="; }; nativeBuildInputs = [ From 2c4cdfb6b221fe4c896d2f769c8501e1dc60488e Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 9 Aug 2021 11:56:25 -0400 Subject: [PATCH 153/375] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 186 ++++++++++++++-------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index be5a660f3c87..44df660f01fb 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "cc34310a99ece2a1bb8d626f77436e53d43fa18b"; - sha256 = "1gj2hg9qpkxnqks395a4rvgy40a7qg4q260xa8a8zymdf476h57f"; + rev = "a099fe24b2e898c93c0aa4391e5a5631932684a6"; + sha256 = "0gp764xcspvwmhqhjf8f94y2wxw32ids0zfy22r1z0s2zm85088r"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -281,12 +281,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "877ef78049d44eee8ebf4d0e6ec541ca23e4ab49"; - sha256 = "0m4yn8kkljn6m45ha7279wv7p9ppjyqrrpagmq92yrqnbfi87qa1"; + rev = "e5a10501b34a1a6a6d9499a7caccc788e41093ec"; + sha256 = "0l492f2kjzp521xwzihdiv8rhbmq2iql0qxhczk68nqy5lj2x7q0"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "455cf79d081afec70973819160edf3bcf3c6fd85"; - sha256 = "1kbda51padbi6qgykzwr1rf081p3154rs6zy7gzpzlhi9k61jqnh"; + rev = "0ec533cd84ee16a420ea50941f5c06faa433ec0a"; + sha256 = "1qxzg5yyz07d76msbbxyk1z1nn4p4si6p8cd00knla8mdyfg779p"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -798,12 +798,12 @@ final: prev: context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2021-07-25"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "89496f3c110d907605319355ea9fc2a560827719"; - sha256 = "09shjaxqr71nfq4yj15xkvkh204l7fjr7na0cyx3k3mflmldha8w"; + rev = "28768168261bca161c3f2599e0ed63c96aab6dea"; + sha256 = "1kyfl4xcx9brsnmqb19ibc2sai5zdrjd1vv7zn63halm2imdv2sj"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -978,12 +978,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-07-15"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "6ccd2d35581f5c497b2fe3e6a9ecbbb494210d6e"; - sha256 = "0fg8gv38xvsv7y739m1wix5a384zjn0hqnmkqiz244jxii1l0p8y"; + rev = "d4bf081bc6bdf062097fddbbcf9c8fdf5b8fb101"; + sha256 = "1sdkfij72z068h2fnhay1ppmf9my32jgzr1pf8liqs6647l90i1v"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1546,12 +1546,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-08-01"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "ff74cd42ca7e76691e826dbdc7efe7ab683e9856"; - sha256 = "0h7i45rwzf3b8xm1rbyly287769fq1xyvl51sa44nghdy6zhx7vi"; + rev = "ed2e422f047eb2cc8afcfecea9464984cfa801a0"; + sha256 = "0jr632pd274xhyji7b1l195i8avf20v4d9g8r4w1ryskirj1k3ry"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2640,12 +2640,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-08-04"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "9a9a28e58cb00935486acf49fba8683e8b2de22a"; - sha256 = "0m1y6lwr7gqwshmrr3yzvbbsbrva3h276cj2fnczgchqbix9jzvi"; + rev = "ec36e68de3b73fd20a02d0cebbb9fd370c2ad532"; + sha256 = "078b5ri8hg1vd15n7n8v90rpp4abp93sh2zvzn9ybdlk5wl5kn9g"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2724,12 +2724,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "dbd5f6a5116f74ccf89b2ea18d59b629397c7940"; - sha256 = "1mmm5h14p7jgalvgl68m9gj0dfl1r29kf5z7h4vmzy07q3nm8xq3"; + rev = "0381f3cb17f46c5e7a7277bb267d8f594da17430"; + sha256 = "1px2m3v9z2gw60i0vjd984b2v434bdkndihsw51nmvxl3w2mbgii"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2784,24 +2784,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "f4a2f500afde3624e41557781117d7f50ccc7223"; - sha256 = "08fflc2ky7zpb0wazim5v46fhqcm8sadpsvkjml544gv29yjx7f3"; + rev = "86bee9cd7b66237730789e872b952759d2f5b3ac"; + sha256 = "0ja7jlwlyjiw8imfqmd4m3i5xx6pkfh7sjm108g3k4fpp8xmpbl7"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-08-07"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "b665ea59600f91afe87b8665faec8155c09420f8"; - sha256 = "0s6n2dsbvr4qr79g8bcil8r80q931m4w6wp7qf4y2lxasjmnnf5g"; + rev = "08f64bcf46afc3a1116ef23c95822de914d14abe"; + sha256 = "02m0kshj9q61dihhgckp801gh6r2jz1hw5s3vx46ha2zvzxbvf93"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3516,12 +3516,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "2f7407775d532b17c3a67a1d948ec910674cd8b0"; - sha256 = "1jsrl0079jp0pfv4235b1ghhv911dlnrz0mshbbm8bby4jd3q3a4"; + rev = "07fd5abcab09a370f8d15fc437f79becb121e025"; + sha256 = "0p45wg4g28w6zlfz8cq9a5ypcsf0l6br98khf5gv81zfr4r7n68h"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3564,12 +3564,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "50fec950de31edc84bb7799b6a692a187037c03b"; - sha256 = "05gs9zws4g3y3nn5xyqd4j145f37j8ibax3lrash100jr2v7m8h6"; + rev = "13820ff0af7dec102b15c68f7c8fcd94302099f7"; + sha256 = "0b59ikp6z63mls64szk3bc7hzvmwrsb97k6b56vaylbx9g1wvlk6"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3612,12 +3612,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-08-03"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "3fb698aef5f48b660dacf8abd1bcdff6588dd2b8"; - sha256 = "15zzjyzz53w79j8jn8bsbxgdgs6qfpxm9pp5xvkkah53g34wfqwd"; + rev = "5c82307c64143ed2848e6ea1777ee51a40d3b978"; + sha256 = "07nid4wnd18bd26pl9y79427jsm4k602qph8090rkwl3h9b14w9x"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3648,12 +3648,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-07-23"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "73529ce61611c9ee3821e18ecc929c422416c462"; - sha256 = "1r55z5abg7ha3xh84ypbbnc3fs7a1718zqmypc49f3wa6ln2rjxz"; + rev = "8ed6999e005015251b6b05cb5c0bfe857785b1d4"; + sha256 = "0921vgji6n5hcb3z2cppz2gfbkww71yn7wqvh3wvgrw041ird3af"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3792,12 +3792,12 @@ final: prev: nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-05-27"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "f34927f8ec777f4e91e14afc709de9da1cd70116"; - sha256 = "1s1pvddgkdslh3r9p08r3xjdpi93d15i4k1jssh8apxzm37gw7lm"; + rev = "ae2f20d6938bab234815e0bc69dae1a991307b99"; + sha256 = "0ikim2zwrlc19bpshr1vzsk15wi5z7am59f4fi53rbh985jmncqr"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -3876,12 +3876,12 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-08-07"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "e5a534f51ba65e3a28742b640b6b4702726189a5"; - sha256 = "1m4sal8wz7z05kvim2c08clzqcqvzfw7jz8dmyk41nllpg2kppqr"; + rev = "6175d63eaecdc7d80105825f89a6c9864c4dd432"; + sha256 = "0q716l729flcnqkjs98bgjlqpibm8jpknq9h3izcnas2h5bgrmjj"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -3900,12 +3900,12 @@ final: prev: nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-08-06"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "bcc0fa0eb585b5639fbc756c1463cdc8d31f33e6"; - sha256 = "0ikdrsym0a2ik9rrsclp83gbj73r2chsbin7y54qy16dmii001gy"; + rev = "9c71ace8af7bfbfef3beb25c648c8d41f72bd09a"; + sha256 = "1jp4an8nni9m8528lza6vc0bj5pkmzfadzvqrgh6vi545ppmxihl"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -4236,12 +4236,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-08-03"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "d897b4d9fdbc51febd71a1f96c96001ae4fa6121"; - sha256 = "0rgqby4aakqamiw3ykvzhn3vd2grjkzgfxrpzjjp1ipkd2qak8mb"; + rev = "58a51d59999022fdc05a0b22428124b4f37c07ad"; + sha256 = "0yxydnvbzzfpyx8y6pqsnkb030nirdh12q138iixqy7l3j9p5jr9"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4273,24 +4273,24 @@ final: prev: popup-nvim = buildVimPluginFrom2Nix { pname = "popup-nvim"; - version = "2021-05-08"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "popup.nvim"; - rev = "5e3bece7b4b4905f4ec89bee74c09cfd8172a16a"; - sha256 = "1k6rz652fjkzhjd8ljr0l6vfispanrlpq0r4aya4qswzxni4rxhg"; + rev = "f91d80973f80025d4ed00380f2e06c669dfda49d"; + sha256 = "1pp1d6kbx8yn4cg2zs8rynvvpa8y89ryr8rial9csg26v2z22z95"; }; meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-07-28"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "f2a0dd50c67a62cea144775a120c1246a645f5ed"; - sha256 = "08di6dfzvn2jzr4ym2ikcf036ycm2pi4s4qwn36nfxyg3zbii71q"; + rev = "77227a06ecf84037277318758a8026524aa736ab"; + sha256 = "0x13p4pyby6g425cwm9b42qxknh1k27knf8hhn7jfgb4c5bdzk5a"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4513,12 +4513,12 @@ final: prev: riv-vim = buildVimPluginFrom2Nix { pname = "riv-vim"; - version = "2020-04-09"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "gu-fan"; repo = "riv.vim"; - rev = "e26c3e8dce4c1332e802cde84f83e61ec8a13986"; - sha256 = "1da3iwrpy08rayrsf8v0ml4khlp9j5i4cffpv9j3iyalcbhk2m9g"; + rev = "201ffc4e8dbfc3deeb26c6e278980f53d81d7f6a"; + sha256 = "1drl291lq44hf7qx1g6l5ivqclfb6ih9lj5qy5cmv9w9b3svwlv4"; }; meta.homepage = "https://github.com/gu-fan/riv.vim/"; }; @@ -4923,12 +4923,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "58db9ca9d92618af78440e05bc5fc2dac9311fcd"; - sha256 = "0wxgl7w2qp24ggq4z6s58jpw7cv1qlbxks7sc8vkfsyiyy5b89xl"; + rev = "653b3dea6f2703dc450621df0589e3665a007656"; + sha256 = "0ppn7mwv5n46dwhslrpdganrfikcz57v425c5az01nm16n57rp5i"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -6138,12 +6138,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-08-07"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "dffb352d5f49792a4df5653d7adab07a1c688928"; - sha256 = "1rqm6wsdpx5n6l4kkrxm8bw2837mm63b5n1igq1v4ji5zbjz6si2"; + rev = "865b453825f309a204909f13b5afa98d36f7369f"; + sha256 = "1zfbm81qnvz7rgi2awi29id5z0xr6qzv04pj0yaxyhyjmy7frjyk"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6858,12 +6858,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-07-14"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "daf9389e827dd19d804ffaad19cc8b64e389da6c"; - sha256 = "0kcjfi61md9n0fgnypamvqsc9k4mykr9wx978qna2xjb19vfkvad"; + rev = "20618a61bc74f3f1a7fa165431b69685c01048c6"; + sha256 = "1z7r3zvhr2zcspqxgwgqskf4w2vwmb3ymvk2kl5r0r3paf305jck"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -6918,12 +6918,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "55382eb722407daaebe1db1f7f7ed99d99302cf5"; - sha256 = "0nxcv69sicgbsns6x0ld9z33mlg2kv3dggvln1i99a0ljxr4p8xm"; + rev = "4adf054a3f6f6ecad303e3e90c169cdf37f6c0e9"; + sha256 = "1vgv4im6bp7688cdwnfvkh5p1fl69bk83d2rsx733l6n45pczzfv"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7038,12 +7038,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-08-02"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "2ee4f84fa9871ce666d89907d3a3985d5109647f"; - sha256 = "1554919qfr22831hw708hfvi006izzd66ygkymxjc3lsgywp1rl8"; + rev = "819cd8ff2006706b90f78da8fa4b5842b398bff9"; + sha256 = "1k0kz8s0km9k5cc0wagfbbclc21rjw29rzbrmd042ldv53ssq8ad"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -7784,12 +7784,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2021-08-05"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "339ab52b488b2d9ced5dde5ebd734b95bc6500f3"; - sha256 = "1191bdrlc2sxwfick7y82cvl2hsxai32sdspxpwskbigyzsd6xks"; + rev = "f5127b339a9d776f220cc0393783c55def9d8ce0"; + sha256 = "0svkpk46fvas5346af2cw2ga03mlwd3rn8pya41f9whybqxdrysg"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -8205,12 +8205,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-08-07"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "e2a6ec4fb91b38591445bdaa9972f54653dbcd49"; - sha256 = "031xy0h9a55ijfq6ni237x4xl2ywbwm3ad0r0h05dj8g1352s1vr"; + rev = "1189ef91c95f522159f9fd267a6bd1ea4b070195"; + sha256 = "12smb5p5lw3gakz6qbbdi11wcbyh8hap70csi8j0crr31fgjmsyf"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -8949,12 +8949,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-08-04"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "95c6f94bd5849e533542c2e375e3347c7faa1c58"; - sha256 = "023p5x6h8jwsxv724r6dgy0hh0bi0j0jfq68klm0shl68q4g5awq"; + rev = "75309fc96c49725cf9bbd7bc881b7b342a60aa9a"; + sha256 = "1k5n73dz60ds9ahgrkiypk0srh1ys39ahipsxkmm2k94gzmh6hj7"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9105,12 +9105,12 @@ final: prev: vim-swap = buildVimPluginFrom2Nix { pname = "vim-swap"; - version = "2021-04-07"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-swap"; - rev = "e75fb91c4940447758902f8cab95d13f8be84d0e"; - sha256 = "0z8mlcjhp1r2v9hs69h6kpk7yfyi7c2y7ck096y5y0hbcwrarn6n"; + rev = "9358bfdc5e377aa13e7c2c2dd8699ba32b0dcf83"; + sha256 = "1vi0d4mp3npyv1hz4zyillrw4dpq71b1cqc2lwc4ks5b6g83pf27"; }; meta.homepage = "https://github.com/machakann/vim-swap/"; }; @@ -9646,12 +9646,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-08-04"; + version = "2021-08-08"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "dd1a4d7e05c79a48ef4f22400af2aff1b2e09ddd"; - sha256 = "18sfwc36m7c901lfdk3f5mlx4bhk0vdg4qb54j4fr487hg89vnfc"; + rev = "da2b4d1094e7771cf2de671ce64bd086da9e8d57"; + sha256 = "0p48dzjvjb403dbn641h9p0jhip4dbd6w7r9zf73b3wbd2ym6y38"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; From 97d4432b0c88a0e3e0f5dc003e82022630f277c7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 9 Aug 2021 11:56:45 -0400 Subject: [PATCH 154/375] vimPlugins.bufdelete-nvim: init at 2021-07-24 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 44df660f01fb..9713d1e9cc33 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -363,6 +363,18 @@ final: prev: meta.homepage = "https://github.com/fruit-in/brainfuck-vim/"; }; + bufdelete-nvim = buildVimPluginFrom2Nix { + pname = "bufdelete-nvim"; + version = "2021-07-24"; + src = fetchFromGitHub { + owner = "famiu"; + repo = "bufdelete.nvim"; + rev = "f73ecffb790c9b1e356c5511ba6ae3b761331d8d"; + sha256 = "0lyc49c909r74q0pvzx0fmyzl3lvspq590vgkld8b3r6vyp44m2c"; + }; + meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; + }; + bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; version = "2021-04-20"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 492080a89e69..139df6fe6cb9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -138,6 +138,7 @@ esneider/YUNOcommit.vim euclidianAce/BetterLua.vim euclio/vim-markdown-composer f-person/git-blame.nvim +famiu/bufdelete.nvim famiu/feline.nvim farmergreg/vim-lastplace fatih/vim-go From 5fb27d46d987fe996fcdc64b058b938828cf508c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 9 Aug 2021 12:52:48 -0300 Subject: [PATCH 155/375] vimix-gtk-themes: 2021-04-25 -> 2021-08-09 --- pkgs/data/themes/vimix/default.nix | 24 +++++++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix index 1694063e4fef..5f08f2c445db 100644 --- a/pkgs/data/themes/vimix/default.nix +++ b/pkgs/data/themes/vimix/default.nix @@ -1,19 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: +{ lib +, stdenv +, fetchFromGitHub +, gnome-shell +, gtk-engine-murrine +, gtk_engines +}: stdenv.mkDerivation rec { pname = "vimix-gtk-themes"; - version = "2021-04-25"; + version = "2021-08-09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0ak763vs27h5z2pgcqpz1g1hypn5gl0p0ylffawc9zdi1wp2mpxb"; + sha256 = "0j6sq7z4zqc9q4hqcq4y9vh4qpgl0v1i353l6rcd6bh1r594rwjm"; }; - buildInputs = [ gtk_engines ]; + nativeBuildInputs = [ + gnome-shell # needed to determine the gnome-shell version + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + buildInputs = [ + gtk_engines + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; installPhase = '' runHook preInstall diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69b72f4895aa..7758d20e941d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23111,7 +23111,9 @@ with pkgs; victor-mono = callPackage ../data/fonts/victor-mono { }; - vimix-gtk-themes = callPackage ../data/themes/vimix {}; + vimix-gtk-themes = callPackage ../data/themes/vimix { + inherit (gnome) gnome-shell; + }; vistafonts = callPackage ../data/fonts/vista-fonts { }; From f57a20cb0f20741de7eebaaf8225a1018c36f0ef Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 9 Aug 2021 10:36:42 -0500 Subject: [PATCH 156/375] emacs.pkgs: Unmark various packages as broken A lot of the packages mark as broken are only actually broken for one melpa flavour. --- .../emacs/elisp-packages/melpa-packages.nix | 82 ++++++++++--------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 8ea98c2c3a7f..1e13c8bcaa10 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -70,7 +70,48 @@ let ) ); - overrides = { + overrides = lib.optionalAttrs (variant == "stable") { + + # upstream issue: missing file header + speech-tagger = markBroken super.speech-tagger; + + # upstream issue: missing file header + textmate = markBroken super.textmate; + + # upstream issue: missing file header + window-numbering = markBroken super.window-numbering; + + # upstream issue: missing file header + voca-builder = markBroken super.voca-builder; + + # upstream issue: missing file header + initsplit = markBroken super.initsplit; + + # upstream issue: missing file header + jsfmt = markBroken super.jsfmt; + + # upstream issue: missing file header + maxframe = markBroken super.maxframe; + + # upstream issue: missing file header + connection = markBroken super.connection; + + # upstream issue: missing file header + dictionary = markBroken super.dictionary; + + # upstream issue: missing file header + link = markBroken super.link; + + # upstream issue: missing file header + bufshow = markBroken super.bufshow; + + # upstream issue: missing file header + elmine = markBroken super.elmine; + + # upstream issue: missing file header + ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; + + } // { # Expects bash to be at /bin/bash ac-rtags = fix-rtags super.ac-rtags; @@ -391,33 +432,9 @@ let package-plus = super."package+"; rect-plus = super."rect+"; - # upstream issue: missing file header - bufshow = markBroken super.bufshow; - - # upstream issue: missing file header - connection = markBroken super.connection; - - # upstream issue: missing file header - dictionary = markBroken super.dictionary; - - # upstream issue: missing file header - elmine = markBroken super.elmine; - - # upstream issue: missing file header - ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; - - # upstream issue: missing file header - initsplit = markBroken super.initsplit; - # upstream issue: missing file header instapaper = markBroken super.instapaper; - # upstream issue: missing file header - jsfmt = markBroken super.jsfmt; - - # upstream issue: missing file header - maxframe = markBroken super.maxframe; - # upstream issue: doesn't build magit-stgit = markBroken super.magit-stgit; @@ -433,24 +450,9 @@ let # upstream issue: missing file header qiita = markBroken super.qiita; - # upstream issue: missing file header - speech-tagger = markBroken super.speech-tagger; - # upstream issue: missing file header sql-presto = markBroken super.sql-presto; - # upstream issue: missing file header - textmate = markBroken super.textmate; - - # upstream issue: missing file header - link = markBroken super.link; - - # upstream issue: missing file header - voca-builder = markBroken super.voca-builder; - - # upstream issue: missing file header - window-numbering = markBroken super.window-numbering; - editorconfig = super.editorconfig.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ pkgs.editorconfig-core-c ]; }); From 0066c05ae2cfa7b7d56b8bd47468bb34d45fb092 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 8 Aug 2021 04:20:00 +0000 Subject: [PATCH 157/375] nodejs-16_x: 16.5.0 -> 16.6.1 https://github.com/nodejs/node/releases/tag/v16.6.0 https://github.com/nodejs/node/releases/tag/v16.6.1 --- ...isable-darwin-v8-system-instrumentation.patch | 16 ++++++++++++++++ pkgs/development/web/nodejs/v16.nix | 15 ++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch diff --git a/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch b/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch new file mode 100644 index 000000000000..63e9107b33d0 --- /dev/null +++ b/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch @@ -0,0 +1,16 @@ +Disable v8 system instrumentation on Darwin + +On Darwin, the v8 system instrumentation requires the header "os/signpost.h" +which is available since apple_sdk 11+. See: https://github.com/nodejs/node/issues/39584 + +--- old/tools/v8_gypfiles/features.gypi ++++ new/tools/v8_gypfiles/features.gypi +@@ -62,7 +62,7 @@ + }, { + 'is_component_build': 0, + }], +- ['OS == "win" or OS == "mac"', { ++ ['OS == "win"', { + # Sets -DSYSTEM_INSTRUMENTATION. Enables OS-dependent event tracing + 'v8_enable_system_instrumentation': 1, + }, { diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 494edc1e997b..bee01d7aae2b 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, fetchpatch, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,14 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.5.0"; - sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; - patches = [ - # Fix CVE-2021-22930 https://github.com/nodejs/node/pull/39423. - # It should be fixed by Node.js 16.6.0, but currently it fails to build on Darwin - (fetchpatch { - url = "https://github.com/nodejs/node/commit/9d950a0956bf2c3dd87bacb56807f37e16a91db4.patch"; - sha256 = "1narhk5dqdkbndh9hg0dn5ghhgrd6gsamjqszpivmp33nl5hgsx3"; - }) - ]; + version = "16.6.1"; + sha256 = "0mz5wfhf2k1qf3d57h4r8b30izhyg93g5m9c8rljlzy6ih2ymcbr"; + patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From 3815d32010dc57a97fe8f6071a07c73aab7fd824 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Mon, 9 Aug 2021 16:43:27 +0000 Subject: [PATCH 158/375] ethminer: fix global-context --- .../misc/ethminer/add-global-context.patch | 25 +++++++++++++++++++ pkgs/tools/misc/ethminer/default.nix | 5 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/ethminer/add-global-context.patch diff --git a/pkgs/tools/misc/ethminer/add-global-context.patch b/pkgs/tools/misc/ethminer/add-global-context.patch new file mode 100644 index 000000000000..f0891e5a2758 --- /dev/null +++ b/pkgs/tools/misc/ethminer/add-global-context.patch @@ -0,0 +1,25 @@ +diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt +index 1a53de8..832e926 100644 +--- a/libethcore/CMakeLists.txt ++++ b/libethcore/CMakeLists.txt +@@ -7,7 +7,7 @@ set(SOURCES + include_directories(BEFORE ..) + + add_library(ethcore ${SOURCES}) +-target_link_libraries(ethcore PUBLIC devcore ethash::ethash PRIVATE hwmon) ++target_link_libraries(ethcore PUBLIC devcore ethash::ethash ethash-global-context PRIVATE hwmon) + + if(ETHASHCL) + target_link_libraries(ethcore PRIVATE ethash-cl) +diff --git a/libethcore/EthashAux.h b/libethcore/EthashAux.h +index d9aadc7..fe5c6cf 100644 +--- a/libethcore/EthashAux.h ++++ b/libethcore/EthashAux.h +@@ -22,6 +22,7 @@ + #include + + #include ++#include + + namespace dev + { diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 675147bc5d57..e159622bc8e1 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -64,6 +64,11 @@ stdenv.mkDerivation rec { cudatoolkit ]; + patches = [ + # global context library is separated from libethash + ./add-global-context.patch + ]; + preConfigure = '' sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt ''; From 2b2a534741cb19193230b9ea3defa925857d8341 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 17:24:52 +0000 Subject: [PATCH 159/375] dictu: 0.19.0 -> 0.20.0 --- pkgs/development/compilers/dictu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/development/compilers/dictu/default.nix index c67afee81dbe..ed142f658e6c 100644 --- a/pkgs/development/compilers/dictu/default.nix +++ b/pkgs/development/compilers/dictu/default.nix @@ -13,13 +13,13 @@ assert enableLTO -> stdenv.cc.isGNU; stdenv.mkDerivation rec { pname = "dictu"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "dictu-lang"; repo = pname; rev = "v${version}"; - sha256 = "5Sfmzz4I0dhcbz14LmXx5cHELRFENunLbZmU93uSEJo="; + sha256 = "sha256-GiiNIySrfpjYf5faNNml7ZRXT5pDU0SVvNvMyBh1K8E="; }; nativeBuildInputs = [ cmake ]; From 8f31366a8c36780bb29f3253496d6ed9d5e39fde Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 17:30:15 +0000 Subject: [PATCH 160/375] discordchatexporter-cli: 2.29 -> 2.30 --- pkgs/tools/backup/discordchatexporter-cli/default.nix | 4 ++-- pkgs/tools/backup/discordchatexporter-cli/deps.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index 770a64b841c3..9cf489c4db5d 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "discordchatexporter-cli"; - version = "2.29"; + version = "2.30"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "0hbhDlGEK2rxuCByW8RaT/0vne8Z+q0ZobCkW1FBoG8="; + sha256 = "uTOeRsEab4vaAwtfysUTM3xFP5UMxpUQnuuU8hv3nk8="; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ]; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index 9849e6c63662..a745a43591a0 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -31,13 +31,13 @@ }) (fetchNuGet { name = "MiniRazor.CodeGen"; - version = "2.1.2"; - sha256 = "0mg4zy4zq0ccrc9wchy796ln1znkmn3k1aax0kd2gha4fwa1d1fb"; + version = "2.1.4"; + sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; }) (fetchNuGet { name = "MiniRazor.Runtime"; - version = "2.1.2"; - sha256 = "1a6cm7j1f5n1bfzhg8w60xwa7cps2i82418k57dm2hgqla6p3rsp"; + version = "2.1.4"; + sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; }) (fetchNuGet { name = "Polly"; From 1bd9c358be41d7d9f6b9607f256a45ea3413040c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 9 Aug 2021 19:50:57 +0200 Subject: [PATCH 161/375] proxmark3-rrg: 4.9237 -> 4.13441 --- pkgs/tools/security/proxmark3/proxmark3-rrg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index 2ae344394724..085610f17994 100644 --- a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "proxmark3-rrg"; - version = "4.9237"; + version = "4.13441"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${version}"; - sha256 = "13xrhvrsm73rfgqpgca6a37c3jixdkxvfggmacnnx5fdfb393bfx"; + sha256 = "1ffchqnm8023zcm4ywncf1j6076s78226h72m9dfmi0zbj3pbj4m"; }; nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; From ad216be1b05d7946ce8d3fc7438c1125ea3a8faf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 18:10:05 +0000 Subject: [PATCH 162/375] fend: 0.1.23 -> 0.1.24 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index f4b32d70ebed..27352c83dee9 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.23"; + version = "0.1.24"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2jj5sWnkc8Jl9Hdm9NqtA0icg/4busXTn5bsqW2u8es="; + sha256 = "sha256-Oa/o2Jd0rf+fIVQCaCiSh+tI2KINh1Kx3NTVEULQlzI="; }; - cargoSha256 = "sha256-7+BdljkmaT/09PUIa10rZ5Ox2VRZR40zoauDzVxMjQM="; + cargoSha256 = "sha256-iFGw5mkeRGiMWe5wcrEcmH0WlHJ8p1D0rf1mh+1Mo+w="; doInstallCheck = true; From 0596bb2b1cfa3b082de83100d4fc641510754a1f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 19:23:25 +0000 Subject: [PATCH 163/375] go-chromecast: 0.2.9 -> 0.2.10 --- pkgs/applications/video/go-chromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 2e3d0221709f..5b0ddf717362 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "vishen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KhJMgr57pDnuFLhsbf0/4n9w0EfjuuKA46ENPLXox3A="; + sha256 = "sha256-8216YaDgjy9Fp94Y5SQwEQpAP4NwvEhsJHe6xpQLAk8="; }; vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; From 06684792fb7b739f4081e21824952911d35c1bc7 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 8 Aug 2021 16:55:24 +0200 Subject: [PATCH 164/375] vimPlugins.plenary: init from lua package This commit shows how to convert luarocks packages into (neo)vim ones. The advantage for neovim lua plugins to register their rockspec (aka package definition) is that the plugin can express its dependencies and a few metadata through it. --- maintainers/scripts/luarocks-packages.csv | 3 ++- pkgs/misc/vim-plugins/default.nix | 14 +++++++--- pkgs/misc/vim-plugins/overrides.nix | 4 +++ pkgs/misc/vim-plugins/vim-utils.nix | 33 ++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 6 ++++- pkgs/top-level/lua-packages.nix | 2 +- 6 files changed, 53 insertions(+), 9 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index b092a58b2d10..c5cee697c8fd 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,4 +1,4 @@ -# nix name, luarocks name, server, version,luaversion,maintainers +# nix name,luarocks name,server,version,luaversion,maintainers alt-getopt,,,,,arobyn ansicolors,,,,, argparse,,,,, @@ -16,6 +16,7 @@ cyrussasl,,,,, digestif,,,,lua5_3, dkjson,,,,, fifo,,,,, +gitsigns.nvim,,,,lua5_1, http,,,,,vcunat inspect,,,,, ldbus,,http://luarocks.org/dev,,, diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index cbc6ec7380ba..b56dced89717 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,5 +1,5 @@ # TODO check that no license information gets lost -{ callPackage, config, lib, vimUtils, vim, darwin, llvmPackages }: +{ callPackage, config, lib, vimUtils, vim, darwin, llvmPackages, luaPackages }: let @@ -7,7 +7,15 @@ let inherit (lib) extends; - initialPackages = self: {}; + initialPackages = self: { + # Convert derivation to a vim plugin. + toVimPlugin = drv: + drv.overrideAttrs(oldAttrs: { + passthru = (oldAttrs.passthru or {}) // { + vimPlugin = true; + }; + }); + }; plugins = callPackage ./generated.nix { inherit buildVimPluginFrom2Nix; @@ -22,7 +30,7 @@ let overrides = callPackage ./overrides.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; inherit buildVimPluginFrom2Nix; - inherit llvmPackages; + inherit llvmPackages luaPackages; }; aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else final: prev: {}; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 669ca2cb9eed..b2dd6f0f5f0d 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -86,6 +86,8 @@ , iferr , impl , reftools +# must be lua51Packages +, luaPackages }: self: super: { @@ -282,6 +284,8 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); + plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); + gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { dependencies = with self; [ lush-nvim ]; }); diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 5ca3aef23588..ca5381c59724 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -2,6 +2,7 @@ { lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin , nix-prefetch-hg, nix-prefetch-git , fetchFromGitHub, runtimeShell +, hasLuaModule }: /* @@ -186,7 +187,21 @@ let nativeImpl = packages: (let - link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}"); + # dir is "start" or "opt" + linkLuaPlugin = plugin: packageName: dir: '' + mkdir -p $out/pack/${packageName}/${dir}/${plugin.pname}/lua + ln -sf ${plugin}/share/lua/5.1/* $out/pack/${packageName}/${dir}/${plugin.pname}/lua + ln -sf ${plugin}/${plugin.pname}-${plugin.version}-rocks/${plugin.pname}/${plugin.version}/* $out/pack/${packageName}/${dir}/${plugin.pname}/ + ''; + + linkVimlPlugin = pluginPath: packageName: dir: + "ln -sf ${pluginPath}/${rtpPath}/* $out/pack/${packageName}/${dir}"; + + # (builtins.trace pluginPath ) + link = pluginPath: if hasLuaModule pluginPath + then linkLuaPlugin pluginPath + else linkVimlPlugin pluginPath; + packageLinks = (packageName: {start ? [], opt ? []}: let # `nativeImpl` expects packages to be derivations, not strings (as @@ -199,9 +214,9 @@ let [ "mkdir -p $out/pack/${packageName}/start" ] # To avoid confusion, even dependencies of optional plugins are added # to `start` (except if they are explicitly listed as optional plugins). - ++ (builtins.map (link packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins))) + ++ (builtins.map (x: link x packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins))) ++ ["mkdir -p $out/pack/${packageName}/opt"] - ++ (builtins.map (link packageName "opt") opt) + ++ (builtins.map (x: link x packageName "opt") opt) ); packDir = (packages: stdenv.mkDerivation { @@ -217,6 +232,18 @@ let set runtimepath^=${packDir packages} ''); + /* Generates a vimrc string + + packages is an attrset with {name: { start = [ vim derivations ]; opt = [ vim derivations ]; } + Example: + vimrcContent { + + packages = { home-manager = { start = [vimPlugins.vim-fugitive]; opt = [];}; + beforePlugins = ''; + customRc = ''let mapleader = " "''; + + }; + */ vimrcContent = { packages ? null, vam ? null, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3273d52d553..cf4e86402b87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32195,10 +32195,14 @@ with pkgs; viewnior = callPackage ../applications/graphics/viewnior { }; - vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; + + vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { + inherit (lua51Packages) hasLuaModule; + }; vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { llvmPackages = llvmPackages_6; + luaPackages = lua51Packages; }); vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 62ddc14ff93a..f16917a94394 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -83,7 +83,7 @@ with self; { }; - inherit toLuaModule lua-setup-hook; + inherit toLuaModule hasLuaModule lua-setup-hook; inherit buildLuarocksPackage buildLuaApplication; inherit requiredLuaModules luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT lua callPackage; From 817a0e1ab1f55f3261cbee1ee0485129070e1c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Sun, 8 Aug 2021 19:01:16 +0200 Subject: [PATCH 165/375] pleroma: 2.3.0 -> 2.4.0 Eblurhash has been released to hex, we do not need to manually fetch it from a git repository anymore. The rest of the diffs have been generated by mix2nix. A minor bug in mix2nix forced us to manually alter the base64url dependency. The bug was already fixed upstream and should be resolved for us once mix2nix branches off a new release. See https://github.com/ydlr/mix2nix/issues/11 for more infos. Release notes: https://pleroma.social/announcements/2021/08/08/pleroma-major-release-2-4-0/ --- pkgs/servers/pleroma/default.nix | 18 ++---------- pkgs/servers/pleroma/mix.nix | 47 ++++++++++++++++---------------- 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 01608f1ca464..356d320d4d1f 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.3.50"; + version = "2.4.0"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; - rev = "94687e23938b808a3fff95c92956ec337160cd0b"; - sha256 = "160ss6qhx3007lyb0f5cjzbm5dzxq9q8rfn83l8qfxgan8hliag6"; + rev = "v${version}"; + sha256 = "sha256-1zp/qVk2K3q8AtkfXab0MBAHaQnY5enVtfdu64FFPhg="; }; mixNixDeps = import ./mix.nix { @@ -36,18 +36,6 @@ beamPackages.mixRelease rec { }; beamDeps = with final; [ prometheus ]; }; - eblurhash = beamPackages.buildRebar3 rec { - name = "eblurhash"; - version = "0.0.0"; - - src = fetchFromGitHub { - owner = "zotonic"; - repo = "eblurhash"; - rev = "04a0b76eadf4de1be17726f39b6313b88708fd12"; - sha256 = "1b9r41scg9rn3skx65ssv1q5lczmg0ky6h1y39qajsvdi5w3swyx"; - }; - beamDeps = with final; [ ]; - }; captcha = beamPackages.buildMix rec { name = "captcha"; version = "0.1.0"; diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix index d32e20b31233..ccced19bf9fb 100644 --- a/pkgs/servers/pleroma/mix.nix +++ b/pkgs/servers/pleroma/mix.nix @@ -346,14 +346,27 @@ let beamDeps = []; }; - ecto = buildMix rec { - name = "ecto"; - version = "3.4.6"; + eblurhash = buildRebar3 rec { + name = "eblurhash"; + version = "1.1.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "02zpyd5mm2zfkz4b839nz1x3ias5av3by1vjzkfc4x9flviaj4vg"; + sha256 = "07dmkbyafpxffh8ar6af4riqfxiqc547rias7i73gpgx16fqhsrf"; + }; + + beamDeps = []; + }; + + ecto = buildMix rec { + name = "ecto"; + version = "3.6.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0kl893yi9jxzxnpd5gafivzazn96z2q24y04lfw8dyg60kxnvbgg"; }; beamDeps = [ decimal jason telemetry ]; @@ -372,27 +385,14 @@ let beamDeps = [ ecto ecto_sql postgrex ]; }; - ecto_explain = buildMix rec { - name = "ecto_explain"; - version = "0.1.2"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "0c3366grl2r7k29a7sxwgqmq670c98sya4p96k7g9v1hmsc7f3hx"; - }; - - beamDeps = []; - }; - ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.4.5"; + version = "3.6.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1hlar4r206szv84qbxc4igg2grvmqaa4mls110y6mcvr6mm0r69i"; + sha256 = "0syv5wjdkywaxx9mmps0x9sdawqp3nnakbnf7av3ksj2yzkdgjay"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -842,12 +842,12 @@ let linkify = buildMix rec { name = "linkify"; - version = "0.5.0"; + version = "0.5.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1mzjkn0f2svn44fhazkhpaxnwn9hbnqha7z2i4fcbrxfa21rbkac"; + sha256 = "0i7r9z49sdxs7nrnh2igmwzzmq9ih4fm02a046klmnps49z8q4m3"; }; beamDeps = []; @@ -1154,12 +1154,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.11.1"; + version = "1.10.4"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "07w83cx4xx90x4l1kmil4lpby55lpw83jfw3y08pqn5vxx7lwli3"; + sha256 = "1874ixvvjklg0hnxr6d990qzarvvfxhd4s35c5bfqbixwwzj67md"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1517,4 +1517,3 @@ let }; }; in self - From 885ab9286e4be1f353ee3883361d103791101d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Mon, 9 Aug 2021 18:40:56 +0200 Subject: [PATCH 166/375] nixosTests.pleroma: increase certificate validity duration Analogous to 6325d15e9001a5cfd3bb7ee901adeed28d844dd6. The test certificate expiration date was set to the default 30 days. This certificate is generated through its own derivation. As with every derivation, it gets cached by cache.nixos.org once we build it. In practice, we rebuild this derivation only if one of its input changes. The only inputs here being openssl and stdenv. While it's not an issue on the unstable branches, it can be problematic on a stable release: the test will fail after 30 days. Extending the certificate lifespan from 1 month to 100 years to prevent it from getting expired while being cached. --- nixos/tests/pleroma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index 797cac44f956..aacd9e01eb17 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -163,7 +163,7 @@ import ./make-test-python.nix ({ pkgs, ... }: ''; tls-cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' - openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' -days 36500 mkdir -p $out cp key.pem cert.pem $out ''; From 7b554c947764b14cec5d6b839a6d52666190e223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Mon, 9 Aug 2021 18:44:20 +0200 Subject: [PATCH 167/375] nixosTests.pleroma: increase server memory size The server VM machine is sometimes OOMing, making the test flaky. Increasing the memory size to 512MB fixes the issue. --- nixos/tests/pleroma.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index aacd9e01eb17..c1973f88f5d3 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -202,6 +202,7 @@ import ./make-test-python.nix ({ pkgs, ... }: security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; networking.firewall.enable = false; + virtualisation.memorySize = 512; environment.systemPackages = with pkgs; [ provision-db provision-secrets From a9bf9c44e516f1097cb3d13e62293bf14669560c Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 9 Aug 2021 21:31:04 +0200 Subject: [PATCH 168/375] linux_zen: 5.13.7 -> 5.13.9 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 2b91a259232b..712f3f08895a 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.13.7"; + version = "5.13.9"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-ZvB5Ejt9MXP4QK5cj9CGQgFJIfDV03IW5xcknCxDui0="; + sha256 = "sha256-RuY6ZIIKU56R+IGMtQDV6mIubGDqonRpsIdlrpAHFXM="; }; structuredExtraConfig = with lib.kernel; { From 560a4e4e086ea748a7836c62a167db959d3767d2 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 30 Jul 2021 02:25:15 +0200 Subject: [PATCH 169/375] update-luarocks-packages: use pluginupdate.py Trying to reuse the update scripts used by kakoune/vim to provide the user with an unified convergence. Some stuff doesn't work yet (parallel download, caching) but I (anyone else welcome to try too) will improve it in other PRs. --- doc/languages-frameworks/vim.section.md | 2 +- maintainers/scripts/luarocks-packages.csv | 176 +++-- maintainers/scripts/pluginupdate.py | 78 ++- maintainers/scripts/update-luarocks-packages | 273 ++++---- .../lua-modules/generated-packages.nix | 663 ++++++++++-------- pkgs/development/lua-modules/overrides.nix | 4 + 6 files changed, 672 insertions(+), 524 deletions(-) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 26a01a89aa51..cb5311fc95f1 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -309,7 +309,7 @@ Sample output2: ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} -Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. +Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index c5cee697c8fd..6ad159a7ffff 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,89 +1,87 @@ -# nix name,luarocks name,server,version,luaversion,maintainers -alt-getopt,,,,,arobyn -ansicolors,,,,, -argparse,,,,, -basexx,,,,, -binaryheap,,,,,vcunat -bit32,,,,lua5_1,lblasc -busted,,,,, -cassowary,,,,,marsam alerque -cjson,lua-cjson,,,, -compat53,,,,,vcunat -cosmo,,,,,marsam -coxpcall,,,1.17.0-1,, -cqueues,,,,,vcunat -cyrussasl,,,,, -digestif,,,,lua5_3, -dkjson,,,,, -fifo,,,,, -gitsigns.nvim,,,,lua5_1, -http,,,,,vcunat -inspect,,,,, -ldbus,,http://luarocks.org/dev,,, -ldoc,,,,, -lgi,,,,, -linenoise,,,,, -ljsyscall,,,,lua5_1,lblasc -lpeg,,,,,vyp -lpeg_patterns,,,,, -lpeglabel,,,,, -lpty,,,,, -lrexlib-gnu,,,,, -lrexlib-pcre,,,,,vyp -lrexlib-posix,,,,, -ltermbox,,,,, -lua-cmsgpack,,,,, -lua-iconv,,,,, -lua-lsp,,http://luarocks.org/dev,,, -lua-messagepack,,,,, -lua-resty-http,,,,, -lua-resty-jwt,,,,, -lua-resty-openidc,,,,, -lua-resty-openssl,,,,, -lua-resty-session,,,,, -lua-term,,,,, -lua-toml,,,,, -lua-zlib,,,,,koral -lua_cliargs,,,,, -luabitop,,,,, -luacheck,,,,, -luacov,,,,, -luadbi,,,,, -luadbi-mysql,,,,, -luadbi-postgresql,,,,, -luadbi-sqlite3,,,,, -luadoc,,,,, -luaepnf,,,,, -luaevent,,,,, -luaexpat,,,1.3.0-1,,arobyn flosse -luaffi,,http://luarocks.org/dev,,, -luafilesystem,,,1.7.0-2,,flosse -lualogging,,,,, -luaossl,,,,lua5_1, -luaposix,,,,,vyp lblasc -luarepl,,,,, -luasec,,,,,flosse -luasocket,,,,, -luasql-sqlite3,,,,,vyp -luassert,,,,, -luasystem,,,,, -luautf8,,,,,pstn -luazip,,,,, -lua-yajl,,,,,pstn -luuid,,,,, -luv,,,,, -lyaml,,,,,lblasc -markdown,,,,, -mediator_lua,,,,, -mpack,,,,, -moonscript,,,,,arobyn -nvim-client,,,,, -penlight,,,,, -plenary.nvim,,,,lua5_1, -rapidjson,,,,, -readline,,,,, -say,,,,, -std-_debug,std._debug,,,, -std_normalize,std.normalize,,,, -stdlib,,,,,vyp -vstruct,,,,, +name,server,version,luaversion,maintainers +bit32,,,lua5_1,lblasc +argparse,,,, +basexx,,,, +binaryheap,,,,vcunat +busted,,,, +cassowary,,,,marsam alerque +compat53,,,,vcunat +cosmo,,,,marsam +coxpcall,,1.17.0-1,, +cqueues,,,,vcunat +cyrussasl,,,, +digestif,,,lua5_3, +dkjson,,,, +fifo,,,, +gitsigns.nvim,,,lua5_1, +http,,,,vcunat +inspect,,,, +ldbus,http://luarocks.org/dev,,, +ldoc,,,, +lgi,,,, +linenoise,,,, +ljsyscall,,,lua5_1,lblasc +lpeg,,,,vyp +lpeg_patterns,,,, +lpeglabel,,,, +lpty,,,, +lrexlib-gnu,,,, +lrexlib-pcre,,,,vyp +lrexlib-posix,,,, +ltermbox,,,, +lua-cjson,,,, +lua-cmsgpack,,,, +lua-iconv,,,, +lua-lsp,http://luarocks.org/dev,,, +lua-messagepack,,,, +lua-resty-http,,,, +lua-resty-jwt,,,, +lua-resty-openidc,,,, +lua-resty-openssl,,,, +lua-resty-session,,,, +lua-term,,,, +lua-toml,,,, +lua-zlib,,,,koral +lua_cliargs,,,, +luabitop,,,, +luacheck,,,, +luacov,,,, +luadbi,,,, +luadbi-mysql,,,, +luadbi-postgresql,,,, +luadbi-sqlite3,,,, +luadoc,,,, +luaepnf,,,, +luaevent,,,, +luaexpat,,1.3.0-1,,arobyn flosse +luaffi,http://luarocks.org/dev,,, +luafilesystem,,1.7.0-2,,flosse +lualogging,,,, +luaossl,,,lua5_1, +luaposix,,,,vyp lblasc +luarepl,,,, +luasec,,,,flosse +luasocket,,,, +luasql-sqlite3,,,,vyp +luassert,,,, +luasystem,,,, +luautf8,,,,pstn +luazip,,,, +lua-yajl,,,,pstn +luuid,,,, +luv,,,, +lyaml,,,,lblasc +markdown,,,, +mediator_lua,,,, +mpack,,,, +moonscript,,,,arobyn +nvim-client,,,, +penlight,,,, +plenary.nvim,,,lua5_1, +rapidjson,,,, +readline,,,, +say,,,, +std._debug,,,, +std.normalize,,,, +stdlib,,,,vyp +vstruct,,,, diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 91c5214d1539..45511607b034 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -28,6 +28,7 @@ from pathlib import Path from typing import Dict, List, Optional, Tuple, Union, Any, Callable from urllib.parse import urljoin, urlparse from tempfile import NamedTemporaryFile +from dataclasses import dataclass import git @@ -82,6 +83,13 @@ def make_request(url: str) -> urllib.request.Request: headers["Authorization"] = f"token {token}" return urllib.request.Request(url, headers=headers) +@dataclass +class PluginDesc: + owner: str + repo: str + branch: str + alias: str + class Repo: def __init__( @@ -195,21 +203,46 @@ class Editor: name: str, root: Path, get_plugins: str, + # TODO modifier pour accepter un plugin generate_nix: Callable[[List[Tuple[str, str, Plugin]], str], None], default_in: Optional[Path] = None, default_out: Optional[Path] = None, deprecated: Optional[Path] = None, cache_file: Optional[str] = None, ): + log.debug("get_plugins:", get_plugins) self.name = name self.root = root self.get_plugins = get_plugins - self.generate_nix = generate_nix + self._generate_nix = generate_nix self.default_in = default_in or root.joinpath(f"{name}-plugin-names") self.default_out = default_out or root.joinpath("generated.nix") self.deprecated = deprecated or root.joinpath("deprecated.json") self.cache_file = cache_file or f"{name}-plugin-cache.json" + def get_current_plugins(self): + """To fill the cache""" + return get_current_plugins(self) + + def load_plugin_spec(self, plugin_file) -> List[PluginDesc]: + return load_plugin_spec(plugin_file) + + def generate_nix(self, plugins, outfile): + '''Returns nothing for now, writes directly to outfile''' + self._generate_nix(plugins, outfile) + + def get_update(self, input_file: str, outfile: str, proc: int): + return get_update(input_file, outfile, proc, editor=self) + + @property + def attr_path(self): + return self.name + "Plugins" + + def rewrite_input(self, *args, **kwargs): + return rewrite_input(*args, **kwargs) + + + class CleanEnvironment(object): def __enter__(self) -> None: @@ -228,7 +261,9 @@ class CleanEnvironment(object): def get_current_plugins(editor: Editor) -> List[Plugin]: with CleanEnvironment(): - out = subprocess.check_output(["nix", "eval", "--json", editor.get_plugins]) + cmd = ["nix", "eval", "--json", editor.get_plugins] + log.debug("Running command %s", cmd) + out = subprocess.check_output(cmd) data = json.loads(out) plugins = [] for name, attr in data.items(): @@ -244,12 +279,13 @@ def prefetch_plugin( alias: Optional[str], cache: "Optional[Cache]" = None, ) -> Tuple[Plugin, Dict[str, str]]: - log.info("Prefetching plugin %s", repo_name) + log.info(f"Fetching last commit for plugin {user}/{repo_name}@{branch}") repo = Repo(user, repo_name, branch, alias) commit, date = repo.latest_commit() has_submodules = repo.has_submodules() cached_plugin = cache[commit] if cache else None if cached_plugin is not None: + log.debug("Cache hit !") cached_plugin.name = alias or repo_name cached_plugin.date = date return cached_plugin, repo.redirect @@ -306,8 +342,7 @@ def check_results( sys.exit(1) - -def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]: +def parse_plugin_line(line: str) -> PluginDesc: branch = "master" alias = None name, repo = line.split("/") @@ -317,15 +352,15 @@ def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]: if "@" in repo: repo, branch = repo.split("@") - return (name.strip(), repo.strip(), branch.strip(), alias) + return PluginDesc(name.strip(), repo.strip(), branch.strip(), alias) -def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str, Optional[str]]]: +def load_plugin_spec(plugin_file: str) -> List[PluginDesc]: plugins = [] with open(plugin_file) as f: for line in f: plugin = parse_plugin_line(line) - if not plugin[0]: + if not plugin.owner: msg = f"Invalid repository {line}, must be in the format owner/repo[ as alias]" print(msg, file=sys.stderr) sys.exit(1) @@ -387,12 +422,11 @@ class Cache: def prefetch( - args: Tuple[str, str, str, Optional[str]], cache: Cache + args: PluginDesc, cache: Cache ) -> Tuple[str, str, Union[Exception, Plugin], dict]: - assert len(args) == 4 - owner, repo, branch, alias = args + owner, repo = args.owner, args.repo try: - plugin, redirect = prefetch_plugin(owner, repo, branch, alias, cache) + plugin, redirect = prefetch_plugin(owner, repo, args.branch, args.alias, cache) cache[plugin.commit] = plugin return (owner, repo, plugin, redirect) except Exception as e: @@ -433,7 +467,7 @@ def rewrite_input( with open(input_file, "w") as f: f.writelines(lines) - +# TODO move to Editor ? def parse_args(editor: Editor): parser = argparse.ArgumentParser( description=( @@ -446,7 +480,7 @@ def parse_args(editor: Editor): dest="add_plugins", default=[], action="append", - help=f"Plugin to add to {editor.name}Plugins from Github in the form owner/repo", + help=f"Plugin to add to {editor.attr_path} from Github in the form owner/repo", ) parser.add_argument( "--input-names", @@ -493,11 +527,11 @@ def commit(repo: git.Repo, message: str, files: List[Path]) -> None: def get_update(input_file: str, outfile: str, proc: int, editor: Editor): - cache: Cache = Cache(get_current_plugins(editor), editor.cache_file) + cache: Cache = Cache(editor.get_current_plugins(), editor.cache_file) _prefetch = functools.partial(prefetch, cache=cache) def update() -> dict: - plugin_names = load_plugin_spec(input_file) + plugin_names = editor.load_plugin_spec(input_file) try: pool = Pool(processes=proc) @@ -522,33 +556,33 @@ def update_plugins(editor: Editor): log.info("Start updating plugins") nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) - update = get_update(args.input_file, args.outfile, args.proc, editor) + update = editor.get_update(args.input_file, args.outfile, args.proc) redirects = update() - rewrite_input(args.input_file, editor.deprecated, redirects) + editor.rewrite_input(args.input_file, editor.deprecated, redirects) autocommit = not args.no_commit if autocommit: - commit(nixpkgs_repo, f"{editor.name}Plugins: update", [args.outfile]) + commit(nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) if redirects: update() if autocommit: commit( nixpkgs_repo, - f"{editor.name}Plugins: resolve github repository redirects", + f"{editor.attr_path}: resolve github repository redirects", [args.outfile, args.input_file, editor.deprecated], ) for plugin_line in args.add_plugins: - rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",)) + editor.rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",)) update() plugin = fetch_plugin_from_pluginline(plugin_line) if autocommit: commit( nixpkgs_repo, - "{editor}Plugins.{name}: init at {version}".format( + "{editor.attr_path}.{name}: init at {version}".format( editor=editor.name, name=plugin.normalized_name, version=plugin.version ), [args.outfile, args.input_file], diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index c7180083da20..2524b4c9b89e 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -1,140 +1,179 @@ #!/usr/bin/env nix-shell -#!nix-shell update-luarocks-shell.nix -i bash +#!nix-shell -p nix-prefetch-git luarocks-nix python3 python3Packages.GitPython nix -i python3 -# You'll likely want to use -# `` -# nixpkgs $ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix -# `` -# to update all libraries in that folder. -# to debug, redirect stderr to stdout with 2>&1 +# format: +# $ nix run nixpkgs.python3Packages.black -c black update.py +# type-check: +# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# linted: +# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py -# stop the script upon C-C -set -eu -o pipefail +import inspect +import os +import tempfile +import shutil +from dataclasses import dataclass +import subprocess +import csv +import logging -CSV_FILE="maintainers/scripts/luarocks-packages.csv" +from typing import List +from pathlib import Path + +LOG_LEVELS = { + logging.getLevelName(level): level for level in [ + logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR ] +} + +log = logging.getLogger() +log.addHandler(logging.StreamHandler()) + +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent +from pluginupdate import Editor, parse_args, update_plugins, PluginDesc, CleanEnvironment + +PKG_LIST="maintainers/scripts/luarocks-packages.csv" TMP_FILE="$(mktemp)" -# Set in the update-luarocks-shell.nix -NIXPKGS_PATH="$LUAROCKS_NIXPKGS_PATH" -export LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua" +GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix" +LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua" -# 10 is a pretty arbitrary number of simultaneous jobs, but it is generally -# impolite to hit a webserver with *too* many simultaneous connections :) -PARALLEL_JOBS=1 - -exit_trap() { - local lc="$BASH_COMMAND" rc=$? - test $rc -eq 0 || echo -e "*** error $rc: $lc.\nGenerated temporary file in $TMP_FILE" >&2 -} - -print_help() { - echo "Usage: $0 " - echo "(most likely pkgs/development/lua-modules/generated-packages.nix)" - echo "" - echo " -c to set the list of luarocks package to generate" - exit 1 -} - -if [ $# -lt 1 ]; then - print_help - exit 1 -fi - -trap exit_trap EXIT - -while getopts ":hc:" opt; do - case $opt in - h) - print_help - ;; - c) - echo "Loading package list from $OPTARG !" >&2 - CSV_FILE="$OPTARG" - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - ;; - esac - shift $((OPTIND - 1)) -done - -GENERATED_NIXFILE="$1" - -HEADER=" -/* ${GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! +HEADER = """ +/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! Regenerate it with: -nixpkgs$ ${0} ${GENERATED_NIXFILE} +nixpkgs$ ./maintainers/scripts/update-luarocks-packages -These packages are manually refined in lua-overrides.nix +You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args: +""".format(GENERATED_NIXFILE=GENERATED_NIXFILE) + +FOOTER=""" +} +/* GENERATED - do not edit this file */ +""" + +@dataclass +class LuaPlugin: + name: str + version: str + server: str + luaversion: str + maintainers: str + + @property + def normalized_name(self) -> str: + return self.name.replace(".", "-") + +# rename Editor to LangUpdate/ EcosystemUpdater +class LuaEditor(Editor): + def get_current_plugins(self): + return [] + + def load_plugin_spec(self, input_file) -> List[PluginDesc]: + luaPackages = [] + csvfilename=input_file + log.info("Loading package descriptions from %s", csvfilename) + + + with open(csvfilename, newline='') as csvfile: + reader = csv.DictReader(csvfile,) + for row in reader: + # name,server,version,luaversion,maintainers + plugin = LuaPlugin(**row) + luaPackages.append(plugin) + return luaPackages + + @property + def attr_path(self): + return "luaPackages" + + def get_update(self, input_file: str, outfile: str, _: int): + + def update() -> dict: + plugin_specs = self.load_plugin_spec(input_file) + + self.generate_nix(plugin_specs, outfile) + + redirects = [] + return redirects + + return update + + def rewrite_input(self, *args, **kwargs): + # not implemented yet + pass + +def generate_nix( + plugins: List[LuaPlugin], + outfilename: str + ): + sorted_plugins = sorted(plugins, key=lambda v: v.name.lower()) + + # plug = {} + # selon le manifest luarocks.org/manifest + def _generate_pkg_nix(plug): + cmd = [ "luarocks", "nix", plug.name] + if plug.server: + cmd.append(f"--only-server={plug.server}") + + if plug.maintainers: + cmd.append(f"--maintainers={plug.maintainers}") + + if plug.version: + cmd.append(plug.version) + + if plug.luaversion: + with CleanEnvironment(): + local_pkgs = str(ROOT.resolve()) + cmd2 = ["nix-build", "--no-out-link", local_pkgs, "-A", f"{plug.luaversion}"] + + log.debug("running %s", cmd2) + lua_drv_path=subprocess.check_output(cmd2, text=True).strip() + cmd.append(f"--lua-dir={lua_drv_path}/bin") + + log.debug("running %s", cmd) + output = subprocess.check_output(cmd, text=True) + return output + + with tempfile.NamedTemporaryFile("w+") as f: + f.write(HEADER) + f.write(""" +{ self, stdenv, lib, fetchurl, fetchgit, ... } @ args: self: super: with self; { -" +""") -FOOTER=" -} -/* GENERATED */ -" + for plugin in sorted_plugins: -function convert_pkg() { - nix_pkg_name="$1" - lua_pkg_name="$2" - server="$3" - pkg_version="$4" - lua_version="$5" - maintainers="$6" + nix_expr = _generate_pkg_nix(plugin) + f.write(f"{plugin.normalized_name} = {nix_expr}" + ) + f.write(FOOTER) + f.flush() - if [ "${nix_pkg_name:0:1}" == "#" ]; then - echo "Skipping comment ${*}" >&2 - return - fi + # if everything went fine, move the generated file to its destination + # using copy since move doesn't work across disks + shutil.copy(f.name, outfilename) - # Normalize package name - nix_pkg_name_normalized=$(sed 's/\./-/' <(echo "$nix_pkg_name")) + print(f"updated {outfilename}") - if [ -z "$lua_pkg_name" ]; then - echo "Using nix_name as lua_pkg_name for '$nix_pkg_name'" >&2 - lua_pkg_name="$nix_pkg_name" - fi +def load_plugin_spec(): + pass - echo "Building expression for $lua_pkg_name (version $pkg_version) from server [$server]" >&2 - luarocks_args=(nix) - if [[ -n $server ]]; then - luarocks_args+=("--only-server=$server") - fi - if [[ -n $maintainers ]]; then - luarocks_args+=("--maintainers=$maintainers") - fi - if [[ -n $lua_version ]]; then - lua_drv_path=$(nix-build --no-out-link "$NIXPKGS_PATH" -A "$lua_version") - luarocks_args+=("--lua-dir=$lua_drv_path/bin") - fi - luarocks_args+=("$lua_pkg_name") - if [[ -n $pkg_version ]]; then - luarocks_args+=("$pkg_version") - fi - echo "Running 'luarocks ${luarocks_args[*]}'" >&2 - if drv="$nix_pkg_name_normalized = $(luarocks "${luarocks_args[@]}")"; then - echo "$drv" - else - echo "Failed to convert $nix_pkg_name" >&2 - return 1 - fi -} -# params needed when called via callPackage -echo "$HEADER" | tee "$TMP_FILE" +def main(): -# Ensure parallel can run our bash function -export -f convert_pkg -export SHELL=bash -# Read each line in the csv file and run convert_pkg for each, in parallel -parallel --group --keep-order --halt now,fail=1 --jobs "$PARALLEL_JOBS" --colsep ',' convert_pkg {} <"$CSV_FILE" | tee -a "$TMP_FILE" + editor = LuaEditor("lua", ROOT, '', generate_nix, + default_in = ROOT.joinpath(PKG_LIST), + default_out = ROOT.joinpath(GENERATED_NIXFILE) + ) -# close the set -echo "$FOOTER" | tee -a "$TMP_FILE" + args = parse_args(editor) + log.setLevel(LOG_LEVELS[args.debug]) -cp "$TMP_FILE" "$GENERATED_NIXFILE" + update_plugins(editor) + + +if __name__ == "__main__": + + main() -# vim: set ts=4 sw=4 ft=sh: diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 5cd7a7c8fe79..2d5b633bb1a3 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1,59 +1,24 @@ /* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! Regenerate it with: -nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix +nixpkgs$ ./maintainers/scripts/update-luarocks-packages -These packages are manually refined in lua-overrides.nix +You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -{ self, lib, fetchurl, fetchgit, pkgs, ... } @ args: + +{ self, stdenv, lib, fetchurl, fetchgit, ... } @ args: self: super: with self; { - -alt-getopt = buildLuarocksPackage { - pname = "alt-getopt"; - version = "0.8.0-1"; - - src = fetchurl { - url = "mirror://luarocks/alt-getopt-0.8.0-1.src.rock"; - sha256 = "1mi97dqb97sf47vb6wrk12yf1yxcaz0asr9gbgwyngr5n1adh5i3"; - }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; - - meta = with lib; { - homepage = "https://github.com/cheusov/lua-alt-getopt"; - description = "Process application arguments the same way as getopt_long"; - maintainers = with maintainers; [ arobyn ]; - license.fullName = "MIT/X11"; - }; -}; -ansicolors = buildLuarocksPackage { - pname = "ansicolors"; - version = "1.0.2-3"; - - src = fetchurl { - url = "mirror://luarocks/ansicolors-1.0.2-3.src.rock"; - sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; - }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = with lib; { - homepage = "https://github.com/kikito/ansicolors.lua"; - description = "Library for color Manipulation."; - license.fullName = "MIT "; - }; -}; argparse = buildLuarocksPackage { pname = "argparse"; - version = "0.7.0-1"; + version = "0.7.1-1"; src = fetchurl { - url = "mirror://luarocks/argparse-0.7.0-1.src.rock"; - sha256 = "1jvar543d21x7wq8rxxaaf7h1ricd7zvxc16xwjblwa9ffgcmcs7"; + url = "https://luarocks.org/argparse-0.7.1-1.src.rock"; + sha256 = "0ybqh5jcb9v8f5xpq05av4hzrbk3vfvqrjj9cgmhm8l66mjd0c7a"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -62,12 +27,13 @@ argparse = buildLuarocksPackage { license.fullName = "MIT"; }; }; + basexx = buildLuarocksPackage { pname = "basexx"; version = "0.4.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/basexx-0.4.1-1.rockspec"; + url = "https://luarocks.org/basexx-0.4.1-1.rockspec"; sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; }).outPath; @@ -85,12 +51,13 @@ basexx = buildLuarocksPackage { license.fullName = "MIT"; }; }; + binaryheap = buildLuarocksPackage { pname = "binaryheap"; version = "0.4-1"; src = fetchurl { - url = "mirror://luarocks/binaryheap-0.4-1.src.rock"; + url = "https://luarocks.org/binaryheap-0.4-1.src.rock"; sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; }; disabled = (luaOlder "5.1"); @@ -103,30 +70,32 @@ binaryheap = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + bit32 = buildLuarocksPackage { pname = "bit32"; - version = "5.3.0-1"; + version = "5.3.5.1-1"; src = fetchurl { - url = "mirror://luarocks/bit32-5.3.0-1.src.rock"; - sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; + url = "https://luarocks.org/bit32-5.3.5.1-1.src.rock"; + sha256 = "0b517hkf3r7pdm78sqx9df9440k7wbml4mpckh7jfxxqy8kk89qf"; }; - disabled = (luaOlder "5.1"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = with lib; { homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; description = "Lua 5.2 bit manipulation library"; maintainers = with maintainers; [ lblasc ]; - license.fullName = "MIT/X11"; + license.fullName = "MIT"; }; }; + busted = buildLuarocksPackage { pname = "busted"; version = "2.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/busted-2.0.0-1.rockspec"; + url = "https://luarocks.org/busted-2.0.0-1.rockspec"; sha256 = "0cbw95bjxl667n9apcgng2kr5hq6bc7gp3vryw4dzixmfabxkcbw"; }).outPath; @@ -144,14 +113,16 @@ busted = buildLuarocksPackage { license.fullName = "MIT "; }; }; + cassowary = buildLuarocksPackage { pname = "cassowary"; - version = "2.2-1"; + version = "2.3.1-1"; src = fetchurl { - url = "mirror://luarocks/cassowary-2.2-1.src.rock"; - sha256 = "0laghzk5jbap5rfd8sasnrdrbda649sfciarba8rhygm0qni1azy"; + url = "https://luarocks.org/cassowary-2.3.1-1.src.rock"; + sha256 = "1whb2d0isp2ca3nlli1kyql8ig9ny4wrvm309a1pzk8q9nys3pf9"; }; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; meta = with lib; { @@ -161,32 +132,16 @@ cassowary = buildLuarocksPackage { license.fullName = "Apache 2"; }; }; -cjson = buildLuarocksPackage { - pname = "lua-cjson"; - version = "2.1.0.6-1"; - src = fetchurl { - url = "mirror://luarocks/lua-cjson-2.1.0.6-1.src.rock"; - sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; - }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = with lib; { - homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php"; - description = "A fast JSON encoding/parsing module"; - license.fullName = "MIT"; - }; -}; compat53 = buildLuarocksPackage { pname = "compat53"; - version = "0.7-1"; + version = "0.8-1"; src = fetchurl { - url = "mirror://luarocks/compat53-0.7-1.src.rock"; - sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; + url = "https://luarocks.org/compat53-0.8-1.src.rock"; + sha256 = "14lw4mxh6ksy7fav1hbspp4ir8bjb7mhnkqdxjhj6jggl1dyf4z5"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -196,12 +151,13 @@ compat53 = buildLuarocksPackage { license.fullName = "MIT"; }; }; + cosmo = buildLuarocksPackage { pname = "cosmo"; version = "16.06.04-1"; src = fetchurl { - url = "mirror://luarocks/cosmo-16.06.04-1.src.rock"; + url = "https://luarocks.org/cosmo-16.06.04-1.src.rock"; sha256 = "1adrk74j0x1yzhy0xz9k80hphxdjvm09kpwpbx00sk3kic6db0ww"; }; propagatedBuildInputs = [ lpeg ]; @@ -213,12 +169,13 @@ cosmo = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + coxpcall = buildLuarocksPackage { pname = "coxpcall"; version = "1.17.0-1"; src = fetchurl { - url = "mirror://luarocks/coxpcall-1.17.0-1.src.rock"; + url = "https://luarocks.org/coxpcall-1.17.0-1.src.rock"; sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; }; @@ -228,13 +185,14 @@ coxpcall = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + cqueues = buildLuarocksPackage { pname = "cqueues"; - version = "20190813.52-0"; + version = "20200726.52-0"; src = fetchurl { - url = "mirror://luarocks/cqueues-20190813.52-0.src.rock"; - sha256 = "1mfhana4xdfddzxmr7vkvm65679hx549f9k1rmsrz6is2gji5wvi"; + url = "https://luarocks.org/cqueues-20200726.52-0.src.rock"; + sha256 = "1mxs74gzs2xmgnrvhl1dlqy1m3m5m0wwiadack97r4pdd63dcp08"; }; disabled = (lua.luaversion != "5.2"); propagatedBuildInputs = [ lua ]; @@ -246,12 +204,13 @@ cqueues = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + cyrussasl = buildLuarocksPackage { pname = "cyrussasl"; version = "1.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/cyrussasl-1.1.0-1.rockspec"; + url = "https://luarocks.org/cyrussasl-1.1.0-1.rockspec"; sha256 = "0zy9l00l7kr3sq8phdm52jqhlqy35vdv6rdmm8mhjihcbx1fsplc"; }).outPath; @@ -259,31 +218,34 @@ cyrussasl = buildLuarocksPackage { "url": "git://github.com/JorjBauer/lua-cyrussasl", "rev": "78ceec610da76d745d0eff4e21a4fb24832aa72d", "date": "2015-08-21T18:24:54-04:00", + "path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl", "sha256": "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1", - "fetchSubmodules": true + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false } - '') ["date"]) ; + '') ["date" "path"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { - homepage = "https://github.com/JorjBauer/lua-cyrussasl"; + homepage = "http://github.com/JorjBauer/lua-cyrussasl"; description = "Cyrus SASL library for Lua 5.1+"; - maintainers = with maintainers; [ vcunat ]; license.fullName = "BSD"; }; }; + digestif = buildLuarocksPackage { pname = "digestif"; - version = "0.2-1"; + version = "0.4-1"; src = fetchurl { - url = "mirror://luarocks/digestif-0.2-1.src.rock"; - sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd"; + url = "https://luarocks.org/digestif-0.4-1.src.rock"; + sha256 = "1hsdr48akviv0l8ldf1km3xcs3i7kf00ws2d893w23nn8rlanv7y"; }; disabled = (luaOlder "5.3"); - propagatedBuildInputs = [ lua lpeg dkjson ]; + propagatedBuildInputs = [ lua lpeg ]; meta = with lib; { homepage = "https://github.com/astoff/digestif/"; @@ -291,12 +253,13 @@ digestif = buildLuarocksPackage { license.fullName = "MIT"; }; }; + dkjson = buildLuarocksPackage { pname = "dkjson"; version = "2.5-2"; src = fetchurl { - url = "mirror://luarocks/dkjson-2.5-2.src.rock"; + url = "https://luarocks.org/dkjson-2.5-2.src.rock"; sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -308,12 +271,13 @@ dkjson = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + fifo = buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; src = fetchurl { - url = "mirror://luarocks/fifo-0.2-0.src.rock"; + url = "https://luarocks.org/fifo-0.2-0.src.rock"; sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; }; propagatedBuildInputs = [ lua ]; @@ -324,13 +288,14 @@ fifo = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + http = buildLuarocksPackage { pname = "http"; - version = "0.3-0"; + version = "0.4-0"; src = fetchurl { - url = "mirror://luarocks/http-0.3-0.src.rock"; - sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; + url = "https://luarocks.org/http-0.4-0.src.rock"; + sha256 = "0a73rm097jw5rpc7zj5cavc9f79n52kck623kq2kgfczz2gv5qfv"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; @@ -342,12 +307,13 @@ http = buildLuarocksPackage { license.fullName = "MIT"; }; }; + inspect = buildLuarocksPackage { pname = "inspect"; version = "3.1.1-0"; src = fetchurl { - url = "mirror://luarocks/inspect-3.1.1-0.src.rock"; + url = "https://luarocks.org/inspect-3.1.1-0.src.rock"; sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; }; disabled = (luaOlder "5.1"); @@ -359,12 +325,13 @@ inspect = buildLuarocksPackage { license.fullName = "MIT "; }; }; + ldbus = buildLuarocksPackage { pname = "ldbus"; version = "scm-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/dev/ldbus-scm-0.rockspec"; + url = "mirror://luarocks/ldbus-scm-0.rockspec"; sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx"; }).outPath; @@ -372,10 +339,13 @@ ldbus = buildLuarocksPackage { "url": "git://github.com/daurnimator/ldbus.git", "rev": "9e176fe851006037a643610e6d8f3a8e597d4073", "date": "2019-08-16T14:26:05+10:00", + "path": "/nix/store/gg4zldd6kx048d6p65b9cimg3arma8yh-ldbus", "sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s", - "fetchSubmodules": true + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false } - '') ["date"]) ; + '') ["date" "path"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -386,12 +356,13 @@ ldbus = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + ldoc = buildLuarocksPackage { pname = "ldoc"; version = "1.4.6-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/ldoc-1.4.6-2.rockspec"; + url = "https://luarocks.org/ldoc-1.4.6-2.rockspec"; sha256 = "14yb0qihizby8ja0fa82vx72vk903mv6m7izn39mzfrgb8mha0pm"; }).outPath; @@ -408,29 +379,31 @@ ldoc = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + lgi = buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; src = fetchurl { - url = "mirror://luarocks/lgi-0.9.2-1.src.rock"; + url = "https://luarocks.org/lgi-0.9.2-1.src.rock"; sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { - homepage = "https://github.com/pavouk/lgi"; + homepage = "http://github.com/pavouk/lgi"; description = "Lua bindings to GObject libraries"; license.fullName = "MIT/X11"; }; }; + linenoise = buildLuarocksPackage { pname = "linenoise"; version = "0.9-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/linenoise-0.9-1.rockspec"; + url = "https://luarocks.org/linenoise-0.9-1.rockspec"; sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4"; }).outPath; @@ -448,12 +421,13 @@ linenoise = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + ljsyscall = buildLuarocksPackage { pname = "ljsyscall"; version = "0.12-1"; src = fetchurl { - url = "mirror://luarocks/ljsyscall-0.12-1.src.rock"; + url = "https://luarocks.org/ljsyscall-0.12-1.src.rock"; sha256 = "12gs81lnzpxi5d409lbrvjfflld5l2xsdkfhkz93xg7v65sfhh2j"; }; disabled = (lua.luaversion != "5.1"); @@ -466,12 +440,13 @@ ljsyscall = buildLuarocksPackage { license.fullName = "MIT"; }; }; + lpeg = buildLuarocksPackage { pname = "lpeg"; version = "1.0.2-1"; src = fetchurl { - url = "mirror://luarocks/lpeg-1.0.2-1.src.rock"; + url = "https://luarocks.org/lpeg-1.0.2-1.src.rock"; sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; }; disabled = (luaOlder "5.1"); @@ -484,12 +459,13 @@ lpeg = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + lpeg_patterns = buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; src = fetchurl { - url = "mirror://luarocks/lpeg_patterns-0.5-0.src.rock"; + url = "https://luarocks.org/lpeg_patterns-0.5-0.src.rock"; sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; }; propagatedBuildInputs = [ lua lpeg ]; @@ -500,12 +476,13 @@ lpeg_patterns = buildLuarocksPackage { license.fullName = "MIT"; }; }; + lpeglabel = buildLuarocksPackage { pname = "lpeglabel"; version = "1.6.0-1"; src = fetchurl { - url = "mirror://luarocks/lpeglabel-1.6.0-1.src.rock"; + url = "https://luarocks.org/lpeglabel-1.6.0-1.src.rock"; sha256 = "0mihrs0gcj40gsjbh4x9b5pm92w2vdwwd1f3fyibyd4a8r1h93r9"; }; disabled = (luaOlder "5.1"); @@ -517,12 +494,13 @@ lpeglabel = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + lpty = buildLuarocksPackage { pname = "lpty"; version = "1.2.2-1"; src = fetchurl { - url = "mirror://luarocks/lpty-1.2.2-1.src.rock"; + url = "https://luarocks.org/lpty-1.2.2-1.src.rock"; sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; }; disabled = (luaOlder "5.1"); @@ -534,64 +512,68 @@ lpty = buildLuarocksPackage { license.fullName = "MIT"; }; }; + lrexlib-gnu = buildLuarocksPackage { pname = "lrexlib-gnu"; - version = "2.9.0-1"; + version = "2.9.1-1"; src = fetchurl { - url = "mirror://luarocks/lrexlib-gnu-2.9.0-1.src.rock"; - sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; + url = "https://luarocks.org/lrexlib-gnu-2.9.1-1.src.rock"; + sha256 = "07ppl5ib2q08mcy1nd4pixp58i0v0m9zv3y6ppbrzv105v21wdvi"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { - homepage = "https://github.com/rrthomas/lrexlib"; + homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (GNU flavour)."; license.fullName = "MIT/X11"; }; }; + lrexlib-pcre = buildLuarocksPackage { pname = "lrexlib-pcre"; - version = "2.9.0-1"; + version = "2.9.1-1"; src = fetchurl { - url = "mirror://luarocks/lrexlib-pcre-2.9.0-1.src.rock"; - sha256 = "1nqai27lbd85mcjf5cb05dbdfg460vmp8cr0lmb8dd63ivk8cbvx"; + url = "https://luarocks.org/lrexlib-pcre-2.9.1-1.src.rock"; + sha256 = "0rsar13nax5r8f96pqjr0hf3civ1f1ijg4k7y69y5gi4wqd376lz"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { - homepage = "https://github.com/rrthomas/lrexlib"; + homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; maintainers = with maintainers; [ vyp ]; license.fullName = "MIT/X11"; }; }; + lrexlib-posix = buildLuarocksPackage { pname = "lrexlib-posix"; - version = "2.9.0-1"; + version = "2.9.1-1"; src = fetchurl { - url = "mirror://luarocks/lrexlib-posix-2.9.0-1.src.rock"; - sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; + url = "https://luarocks.org/lrexlib-posix-2.9.1-1.src.rock"; + sha256 = "0ajbzs3d6758f2hs95akirymw46nxcyy2prbzlaqq45ynzq02psb"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { - homepage = "https://github.com/rrthomas/lrexlib"; + homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (POSIX flavour)."; license.fullName = "MIT/X11"; }; }; + ltermbox = buildLuarocksPackage { pname = "ltermbox"; version = "0.2-1"; src = fetchurl { - url = "mirror://luarocks/ltermbox-0.2-1.src.rock"; + url = "https://luarocks.org/ltermbox-0.2-1.src.rock"; sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; }; disabled = (luaOlder "5.1"); @@ -603,12 +585,31 @@ ltermbox = buildLuarocksPackage { license.fullName = "New BSD License"; }; }; + +lua-cjson = buildLuarocksPackage { + pname = "lua-cjson"; + version = "2.1.0.6-1"; + + src = fetchurl { + url = "https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock"; + sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with lib; { + homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php"; + description = "A fast JSON encoding/parsing module"; + license.fullName = "MIT"; + }; +}; + lua-cmsgpack = buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-cmsgpack-0.4.0-0.rockspec"; + url = "https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec"; sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; }).outPath; @@ -616,26 +617,30 @@ lua-cmsgpack = buildLuarocksPackage { "url": "git://github.com/antirez/lua-cmsgpack.git", "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", "date": "2018-06-14T11:56:56+02:00", + "path": "/nix/store/ndjf00i9r45gvy8lh3vp218y4w4md33p-lua-cmsgpack", "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", - "fetchSubmodules": true + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false } - '') ["date"]) ; + '') ["date" "path"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { - homepage = "https://github.com/antirez/lua-cmsgpack"; + homepage = "http://github.com/antirez/lua-cmsgpack"; description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license.fullName = "Two-clause BSD"; }; }; + lua-iconv = buildLuarocksPackage { pname = "lua-iconv"; version = "7-3"; src = fetchurl { - url = "mirror://luarocks/lua-iconv-7-3.src.rock"; + url = "https://luarocks.org/lua-iconv-7-3.src.rock"; sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; }; disabled = (luaOlder "5.1"); @@ -647,39 +652,44 @@ lua-iconv = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + lua-lsp = buildLuarocksPackage { pname = "lua-lsp"; - version = "scm-2"; + version = "scm-5"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-lsp-scm-2.rockspec"; - sha256 = "0qk3i6j0km4d1fs61fxhkmnbxmgpq24nygr8wknl6hbj2kya25rb"; + url = "mirror://luarocks/lua-lsp-scm-5.rockspec"; + sha256 = "19nlnglg50vpz3wmqvnqafajjkqp8f2snqnfmihz3zi5rpdvzjya"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "git://github.com/Alloyed/lua-lsp", - "rev": "905e71f9a97ea6366deb386503f9d976c87d9bab", - "date": "2019-09-22T09:46:00-04:00", - "sha256": "1mlgb2dp1ah76hjkbkwz0dp2y5mn491v5wf81nm086rb2fa3rzcg", - "fetchSubmodules": true + "rev": "91d4772d1cd264f8501c6da2326fc214ab0934f2", + "date": "2020-10-31T00:55:09-04:00", + "path": "/nix/store/awwwz5wq8v57kv69cfriivg7f6ipdx67-lua-lsp", + "sha256": "10filff5vani6ligv7ls5dgq70k56hql26gv3x101snmw9fkjz57", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false } - '') ["date"]) ; + '') ["date" "path"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua dkjson lpeglabel inspect ]; meta = with lib; { homepage = "https://github.com/Alloyed/lua-lsp"; - description = "No summary"; + description = "A Language Server implementation for lua, the language"; license.fullName = "MIT"; }; }; + lua-messagepack = buildLuarocksPackage { pname = "lua-messagepack"; version = "0.5.2-1"; src = fetchurl { - url = "mirror://luarocks/lua-messagepack-0.5.2-1.src.rock"; + url = "https://luarocks.org/lua-messagepack-0.5.2-1.src.rock"; sha256 = "0hqahc84ncl8g4miif14sdkzyvnpqip48886sagz9drl52qvgcfb"; }; disabled = (luaOlder "5.1"); @@ -691,12 +701,13 @@ lua-messagepack = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + lua-resty-http = buildLuarocksPackage { pname = "lua-resty-http"; version = "0.16.1-0"; src = fetchurl { - url = "mirror://luarocks/lua-resty-http-0.16.1-0.src.rock"; + url = "https://luarocks.org/lua-resty-http-0.16.1-0.src.rock"; sha256 = "0n5hiablpc0dsccs6h76zg81wc3jb4mdvyfn9lfxnhls3yqwrgkj"; }; disabled = (luaOlder "5.1"); @@ -705,16 +716,16 @@ lua-resty-http = buildLuarocksPackage { meta = with lib; { homepage = "https://github.com/ledgetech/lua-resty-http"; description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua."; - maintainers = with maintainers; [ bbigras ]; license.fullName = "2-clause BSD"; }; }; + lua-resty-jwt = buildLuarocksPackage { pname = "lua-resty-jwt"; version = "0.2.3-0"; src = fetchurl { - url = "mirror://luarocks/lua-resty-jwt-0.2.3-0.src.rock"; + url = "https://luarocks.org/lua-resty-jwt-0.2.3-0.src.rock"; sha256 = "0s7ghldwrjnhyc205pvcvgdzrgg46qz42v449vrri0cysh8ad91y"; }; disabled = (luaOlder "5.1"); @@ -723,16 +734,16 @@ lua-resty-jwt = buildLuarocksPackage { meta = with lib; { homepage = "https://github.com/cdbattags/lua-resty-jwt"; description = "JWT for ngx_lua and LuaJIT."; - maintainers = with maintainers; [ bbigras ]; license.fullName = "Apache License Version 2"; }; }; + lua-resty-openidc = buildLuarocksPackage { pname = "lua-resty-openidc"; version = "1.7.4-1"; src = fetchurl { - url = "mirror://luarocks/lua-resty-openidc-1.7.4-1.src.rock"; + url = "https://luarocks.org/lua-resty-openidc-1.7.4-1.src.rock"; sha256 = "07ny9rl8zir1c3plrbdmd2a23ysrx45qam196nhqsz118xrbds78"; }; disabled = (luaOlder "5.1"); @@ -741,32 +752,32 @@ lua-resty-openidc = buildLuarocksPackage { meta = with lib; { homepage = "https://github.com/zmartzone/lua-resty-openidc"; description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality"; - maintainers = with maintainers; [ bbigras ]; license.fullName = "Apache 2.0"; }; }; + lua-resty-openssl = buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "0.7.2-1"; + version = "0.7.4-1"; src = fetchurl { - url = "mirror://luarocks/lua-resty-openssl-0.7.2-1.src.rock"; - sha256 = "00z6adib31ax4givq4zrhbfxa6l99l2hhlxnjpb6rfl4gf8h82kq"; + url = "https://luarocks.org/lua-resty-openssl-0.7.4-1.src.rock"; + sha256 = "16rzcf6z9rgln4sc0v785awn2f3mi9yrswsk5xsfdsb2y1sdxdc0"; }; meta = with lib; { homepage = "https://github.com/fffonion/lua-resty-openssl"; description = "No summary"; - maintainers = with maintainers; [ bbigras ]; license.fullName = "BSD"; }; }; + lua-resty-session = buildLuarocksPackage { pname = "lua-resty-session"; version = "3.8-1"; src = fetchurl { - url = "mirror://luarocks/lua-resty-session-3.8-1.src.rock"; + url = "https://luarocks.org/lua-resty-session-3.8-1.src.rock"; sha256 = "1x4l6n0dnm4br4p376r8nkg53hwm6a48xkhrzhsh9fcd5xqgqvxz"; }; disabled = (luaOlder "5.1"); @@ -775,16 +786,16 @@ lua-resty-session = buildLuarocksPackage { meta = with lib; { homepage = "https://github.com/bungle/lua-resty-session"; description = "Session Library for OpenResty – Flexible and Secure"; - maintainers = with maintainers; [ bbigras ]; license.fullName = "BSD"; }; }; + lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-term-0.7-1.rockspec"; + url = "https://luarocks.org/lua-term-0.7-1.rockspec"; sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; }).outPath; @@ -800,12 +811,13 @@ lua-term = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + lua-toml = buildLuarocksPackage { pname = "lua-toml"; version = "2.0-1"; src = fetchurl { - url = "mirror://luarocks/lua-toml-2.0-1.src.rock"; + url = "https://luarocks.org/lua-toml-2.0-1.src.rock"; sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; }; disabled = (luaOlder "5.1"); @@ -817,17 +829,50 @@ lua-toml = buildLuarocksPackage { license.fullName = "MIT"; }; }; -lua-zlib = buildLuarocksPackage { - pname = "lua-zlib"; - version = "1.2-0"; + +lua-yajl = buildLuarocksPackage { + pname = "lua-yajl"; + version = "2.0-1"; src = fetchurl { - url = "mirror://luarocks/lua-zlib-1.2-0.src.rock"; - sha256 = "0qa0vnx45nxdj6fqag6fr627zsnd2bmrr9bdbm8jv6lcnyi6nhs2"; + url = "https://luarocks.org/lua-yajl-2.0-1.src.rock"; + sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; + meta = with lib; { + homepage = "http://github.com/brimworks/lua-yajl"; + description = "Integrate the yajl JSON library with Lua."; + maintainers = with maintainers; [ pstn ]; + license.fullName = "MIT/X11"; + }; +}; + +lua-zlib = buildLuarocksPackage { + pname = "lua-zlib"; + version = "1.2-1"; + + knownRockspec = (fetchurl { + url = "https://luarocks.org/lua-zlib-1.2-1.rockspec"; + sha256 = "18rpbg9b4vsnh3svapiqrvwwshw1abb5l5fd7441byx1nm3fjq9w"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/brimworks/lua-zlib.git", + "rev": "82d0fdfe8ddd8645970f55011c13d87469501615", + "date": "2021-03-08T06:04:09-08:00", + "path": "/nix/store/2wr6l2djjl2l63wq1fddfm9ljrrkplr5-lua-zlib", + "sha256": "18q9a5f21fp8hxvpp4sq23wi7m2h0v3p3kydslz140mnryazridj", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua ]; + meta = with lib; { homepage = "https://github.com/brimworks/lua-zlib"; description = "Simple streaming interface to zlib for Lua."; @@ -835,12 +880,13 @@ lua-zlib = buildLuarocksPackage { license.fullName = "MIT"; }; }; + lua_cliargs = buildLuarocksPackage { pname = "lua_cliargs"; version = "3.0-2"; src = fetchurl { - url = "mirror://luarocks/lua_cliargs-3.0-2.src.rock"; + url = "https://luarocks.org/lua_cliargs-3.0-2.src.rock"; sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; }; disabled = (luaOlder "5.1"); @@ -852,12 +898,13 @@ lua_cliargs = buildLuarocksPackage { license.fullName = "MIT "; }; }; + luabitop = buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luabitop-1.0.2-3.rockspec"; + url = "https://luarocks.org/luabitop-1.0.2-3.rockspec"; sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; }).outPath; @@ -865,10 +912,13 @@ luabitop = buildLuarocksPackage { "url": "git://github.com/LuaDist/luabitop.git", "rev": "81bb23b0e737805442033535de8e6d204d0e5381", "date": "2013-02-18T16:36:42+01:00", + "path": "/nix/store/jm7mls5zwkgkkf1hiwgbbwy94c55ir43-luabitop", "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", - "fetchSubmodules": true + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false } - '') ["date"]) ; + '') ["date" "path"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; @@ -879,32 +929,34 @@ luabitop = buildLuarocksPackage { license.fullName = "MIT/X license"; }; }; + luacheck = buildLuarocksPackage { pname = "luacheck"; - version = "0.23.0-1"; + version = "0.24.0-2"; src = fetchurl { - url = "mirror://luarocks/luacheck-0.23.0-1.src.rock"; - sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; + url = "https://luarocks.org/luacheck-0.24.0-2.src.rock"; + sha256 = "0in09mnhcbm84ia22qawn9mmfmaj0z6zqyii8xwz3llacss0mssq"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua argparse luafilesystem ]; meta = with lib; { - homepage = "https://github.com/mpeterv/luacheck"; + homepage = "https://github.com/luarocks/luacheck"; description = "A static analyzer and a linter for Lua"; license.fullName = "MIT"; }; }; + luacov = buildLuarocksPackage { pname = "luacov"; - version = "0.14.0-1"; + version = "0.15.0-1"; src = fetchurl { - url = "mirror://luarocks/luacov-0.14.0-1.src.rock"; - sha256 = "18wj4l55wxwvaimvmkg3g5c6amzz9czdpl57z56wmdb284454kca"; + url = "https://luarocks.org/luacov-0.15.0-1.src.rock"; + sha256 = "14y79p62m1l7jwj8ay0b8nkarr6hdarjycr6qfzlc4v676h38ikq"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -913,12 +965,13 @@ luacov = buildLuarocksPackage { license.fullName = "MIT"; }; }; + luadbi = buildLuarocksPackage { pname = "luadbi"; version = "0.7.2-1"; src = fetchurl { - url = "mirror://luarocks/luadbi-0.7.2-1.src.rock"; + url = "https://luarocks.org/luadbi-0.7.2-1.src.rock"; sha256 = "0mj9ggyb05l03gs38ds508620mqaw4fkrzz9861n4j0zxbsbmfwy"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -930,12 +983,13 @@ luadbi = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + luadbi-mysql = buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.2-1"; src = fetchurl { - url = "mirror://luarocks/luadbi-mysql-0.7.2-1.src.rock"; + url = "https://luarocks.org/luadbi-mysql-0.7.2-1.src.rock"; sha256 = "1f8i5p66halws8qsa7g09110hwzg7pv29yi22mkqd8sjgjv42iq4"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -947,12 +1001,13 @@ luadbi-mysql = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + luadbi-postgresql = buildLuarocksPackage { pname = "luadbi-postgresql"; version = "0.7.2-1"; src = fetchurl { - url = "mirror://luarocks/luadbi-postgresql-0.7.2-1.src.rock"; + url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.src.rock"; sha256 = "0nmm1hdzl77wk8p6r6al6mpkh2n332a8r3iqsdi6v4nxamykdh28"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -964,12 +1019,13 @@ luadbi-postgresql = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + luadbi-sqlite3 = buildLuarocksPackage { pname = "luadbi-sqlite3"; version = "0.7.2-1"; src = fetchurl { - url = "mirror://luarocks/luadbi-sqlite3-0.7.2-1.src.rock"; + url = "https://luarocks.org/luadbi-sqlite3-0.7.2-1.src.rock"; sha256 = "17wd2djzk5x4l4pv2k3c7b8dcvl46s96kqyk8dp3q6ll8gdl7c65"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -981,12 +1037,13 @@ luadbi-sqlite3 = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + luadoc = buildLuarocksPackage { pname = "luadoc"; version = "3.0.1-1"; src = fetchurl { - url = "mirror://luarocks/luadoc-3.0.1-1.src.rock"; + url = "https://luarocks.org/luadoc-3.0.1-1.src.rock"; sha256 = "112zqjbzkrhx3nvavrxx3vhpv2ix85pznzzbpa8fq4piyv5r781i"; }; propagatedBuildInputs = [ lualogging luafilesystem ]; @@ -997,15 +1054,16 @@ luadoc = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + luaepnf = buildLuarocksPackage { pname = "luaepnf"; - version = "0.3-1"; + version = "0.3-2"; src = fetchurl { - url = "mirror://luarocks/luaepnf-0.3-1.src.rock"; - sha256 = "12z7radxk1dkyjqflr85sghywgc82xdg4mzb9mbwbrrqbnjw8mp5"; + url = "https://luarocks.org/luaepnf-0.3-2.src.rock"; + sha256 = "01vghy965hkmycbvffb1rbgy16fp74103r2ihy3q78dzia4fbfvs"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua lpeg ]; meta = with lib; { @@ -1014,12 +1072,13 @@ luaepnf = buildLuarocksPackage { license.fullName = "MIT"; }; }; + luaevent = buildLuarocksPackage { pname = "luaevent"; version = "0.4.6-1"; src = fetchurl { - url = "mirror://luarocks/luaevent-0.4.6-1.src.rock"; + url = "https://luarocks.org/luaevent-0.4.6-1.src.rock"; sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; }; disabled = (luaOlder "5.1"); @@ -1031,15 +1090,16 @@ luaevent = buildLuarocksPackage { license.fullName = "MIT"; }; }; + luaexpat = buildLuarocksPackage { pname = "luaexpat"; - version = "1.3.0-1"; + version = "1.3.3-1"; src = fetchurl { - url = "mirror://luarocks/luaexpat-1.3.0-1.src.rock"; - sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; + url = "https://luarocks.org/luaexpat-1.3.3-1.src.rock"; + sha256 = "0ahpfnby9qqgj22bajmrqvqq70nx19388lmjm9chljfzszy0hndm"; }; - disabled = (luaOlder "5.1"); + disabled = (luaOlder "5.0"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -1049,6 +1109,7 @@ luaexpat = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + luaffi = buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; @@ -1066,13 +1127,14 @@ luaffi = buildLuarocksPackage { license.fullName = "BSD"; }; }; + luafilesystem = buildLuarocksPackage { pname = "luafilesystem"; - version = "1.7.0-2"; + version = "1.8.0-1"; src = fetchurl { - url = "mirror://luarocks/luafilesystem-1.7.0-2.src.rock"; - sha256 = "0xhmd08zklsgpnpjr9rjipah35fbs8jd4v4va36xd8bpwlvx9rk5"; + url = "https://luarocks.org/luafilesystem-1.8.0-1.src.rock"; + sha256 = "1kqr1vwazrysgxamx9x89vn3fparfffx986bq9a452ajayjp0qjp"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1080,67 +1142,70 @@ luafilesystem = buildLuarocksPackage { meta = with lib; { homepage = "git://github.com/keplerproject/luafilesystem"; description = "File System Library for the Lua Programming Language"; - maintainers = with maintainers; [ flosse vcunat ]; + maintainers = with maintainers; [ flosse ]; license.fullName = "MIT/X11"; }; }; + lualogging = buildLuarocksPackage { pname = "lualogging"; - version = "1.3.0-1"; + version = "1.5.1-1"; src = fetchurl { - url = "mirror://luarocks/lualogging-1.3.0-1.src.rock"; - sha256 = "13fm1vlig3zmbfkmlq1vk3xfqhlvv5xf24b0p4k4d08395y858vc"; + url = "https://luarocks.org/lualogging-1.5.1-1.src.rock"; + sha256 = "1c98dnpfa2292g9xhpgsrfdvm80r1fhndrpay1hcgnq0qnz1sibh"; }; propagatedBuildInputs = [ luasocket ]; meta = with lib; { - homepage = "https://github.com/Neopallium/lualogging"; + homepage = "https://github.com/lunarmodules/lualogging"; description = "A simple API to use logging features"; license.fullName = "MIT/X11"; }; }; + luaossl = buildLuarocksPackage { pname = "luaossl"; - version = "20190731-0"; + version = "20200709-0"; src = fetchurl { - url = "mirror://luarocks/luaossl-20190731-0.src.rock"; - sha256 = "0gardlh547hah5w4kfsdg05jmxzrxr21macqigcmp5hw1l67jn5m"; + url = "https://luarocks.org/luaossl-20200709-0.src.rock"; + sha256 = "0y6dqf560j2bq2rjlm5572m82pj627fd2p9mjc5y6fbram764vga"; }; propagatedBuildInputs = [ lua ]; meta = with lib; { homepage = "http://25thandclement.com/~william/projects/luaossl.html"; description = "Most comprehensive OpenSSL module in the Lua universe."; - maintainers = with maintainers; [ vcunat ]; license.fullName = "MIT/X11"; }; }; + luaposix = buildLuarocksPackage { pname = "luaposix"; - version = "34.1.1-1"; + version = "35.0-1"; src = fetchurl { - url = "mirror://luarocks/luaposix-34.1.1-1.src.rock"; - sha256 = "1l9pkn3g0nzlbmmfj12rhfwvkqb06c21ydqxqgmnmd3w9z4ck53w"; + url = "https://luarocks.org/luaposix-35.0-1.src.rock"; + sha256 = "1da27fsz6v2asxifr4yv0r8rp80g6bg021piqrabqk9lq23hvjks"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ bit32 lua ]; + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua ]; meta = with lib; { - homepage = "https://github.com/luaposix/luaposix/"; + homepage = "http://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; }; }; + luarepl = buildLuarocksPackage { pname = "luarepl"; version = "0.9-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarepl-0.9-1.rockspec"; + url = "https://luarocks.org/luarepl-0.9-1.rockspec"; sha256 = "1409lanxv4s8kq5rrh46dvld77ip33qzfn3vac3i9zpzbmgb5i8z"; }).outPath; @@ -1158,13 +1223,14 @@ luarepl = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + luasec = buildLuarocksPackage { pname = "luasec"; - version = "0.9-1"; + version = "1.0.1-1"; src = fetchurl { - url = "mirror://luarocks/luasec-0.9-1.src.rock"; - sha256 = "00npxdwr3s4638i1jzmhyvss796rhbqk43zrzkb5lzzhqlxpsz5q"; + url = "https://luarocks.org/luasec-1.0.1-1.src.rock"; + sha256 = "0384afx1w124ljs3hpp31ldqlrrgsa2xl625sxrx79yddilgk48f"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; @@ -1176,12 +1242,13 @@ luasec = buildLuarocksPackage { license.fullName = "MIT"; }; }; + luasocket = buildLuarocksPackage { pname = "luasocket"; version = "3.0rc1-2"; src = fetchurl { - url = "mirror://luarocks/luasocket-3.0rc1-2.src.rock"; + url = "https://luarocks.org/luasocket-3.0rc1-2.src.rock"; sha256 = "1isin9m40ixpqng6ds47skwa4zxrc6w8blza8gmmq566w6hz50iq"; }; disabled = (luaOlder "5.1"); @@ -1193,23 +1260,27 @@ luasocket = buildLuarocksPackage { license.fullName = "MIT"; }; }; + luasql-sqlite3 = buildLuarocksPackage { pname = "luasql-sqlite3"; - version = "2.5.0-1"; + version = "2.6.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasql-sqlite3-2.5.0-1.rockspec"; - sha256 = "1r0x21i6n18x6915iaj9n309lqqqk1b30bg9h2a6y8jzk839hk09"; + url = "https://luarocks.org/luasql-sqlite3-2.6.0-1.rockspec"; + sha256 = "0w32znsfcaklcja6avqx7daaxbf0hr2v8g8bmz0fysb3401lmp02"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "git://github.com/keplerproject/luasql.git", - "rev": "5496d60185db0c4578e8abe0c74343e99b799311", - "date": "2019-06-14T10:54:41-03:00", - "sha256": "1jdm1abj2ngklg7syq1ijj142ai9nmdl9370dk2bgamzlxc41pqm", - "fetchSubmodules": true + "rev": "8c58fd6ee32faf750daf6e99af015a31402578d1", + "date": "2020-09-16T13:25:07+01:00", + "path": "/nix/store/62g3f835iry7la34pw09dbqy2b7mn4q5-luasql", + "sha256": "0jad5fin58mv36mdfz5jwg6hbcd7s32x39lyqymn1j9mxzjc2m2y", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false } - '') ["date"]) ; + '') ["date" "path"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1221,12 +1292,13 @@ luasql-sqlite3 = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + luassert = buildLuarocksPackage { pname = "luassert"; version = "1.8.0-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luassert-1.8.0-0.rockspec"; + url = "https://luarocks.org/luassert-1.8.0-0.rockspec"; sha256 = "1194y81nlkq4qmrrgl7z82i6vgvhqvp1p673kq0arjix8mv3zyz1"; }).outPath; @@ -1244,12 +1316,13 @@ luassert = buildLuarocksPackage { license.fullName = "MIT "; }; }; + luasystem = buildLuarocksPackage { pname = "luasystem"; version = "0.2.1-0"; src = fetchurl { - url = "mirror://luarocks/luasystem-0.2.1-0.src.rock"; + url = "https://luarocks.org/luasystem-0.2.1-0.src.rock"; sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; }; disabled = (luaOlder "5.1"); @@ -1261,30 +1334,32 @@ luasystem = buildLuarocksPackage { license.fullName = "MIT "; }; }; + luautf8 = buildLuarocksPackage { pname = "luautf8"; - version = "0.1.2-2"; + version = "0.1.3-1"; src = fetchurl { - url = "mirror://luarocks/luautf8-0.1.2-2.src.rock"; - sha256 = "1q0qpr87alfzwwx5x0v9cggnz5fqi20jlqdh1a3i5cijjaj6xwdn"; + url = "https://luarocks.org/luautf8-0.1.3-1.src.rock"; + sha256 = "1yp4j1r33yvsqf8cggmf4mhaxhz5lqzxhl9mnc0q5lh01yy5di48"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { - homepage = "https://github.com/starwing/luautf8"; + homepage = "http://github.com/starwing/luautf8"; description = "A UTF-8 support module for Lua"; maintainers = with maintainers; [ pstn ]; license.fullName = "MIT"; }; }; + luazip = buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; src = fetchurl { - url = "mirror://luarocks/luazip-1.2.7-1.src.rock"; + url = "https://luarocks.org/luazip-1.2.7-1.src.rock"; sha256 = "1yprlr1ap6bhshhy88qfphmmyg9zp1py2hj2158iw6vsva0fk03l"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1296,30 +1371,13 @@ luazip = buildLuarocksPackage { license.fullName = "MIT"; }; }; -lua-yajl = buildLuarocksPackage { - pname = "lua-yajl"; - version = "2.0-1"; - src = fetchurl { - url = "mirror://luarocks/lua-yajl-2.0-1.src.rock"; - sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f"; - }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = with lib; { - homepage = "https://github.com/brimworks/lua-yajl"; - description = "Integrate the yajl JSON library with Lua."; - maintainers = with maintainers; [ pstn ]; - license.fullName = "MIT/X11"; - }; -}; luuid = buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; src = fetchurl { - url = "mirror://luarocks/luuid-20120509-2.src.rock"; + url = "https://luarocks.org/luuid-20120509-2.src.rock"; sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; }; disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); @@ -1331,13 +1389,14 @@ luuid = buildLuarocksPackage { license.fullName = "Public domain"; }; }; + luv = buildLuarocksPackage { pname = "luv"; - version = "1.30.0-0"; + version = "1.41.1-0"; src = fetchurl { - url = "https://luarocks.org/luv-1.30.0-0.src.rock"; - sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; + url = "https://luarocks.org/luv-1.41.1-0.src.rock"; + sha256 = "0l1v07nhrkzsddbcc4bak382b5flyw6x8g4i394ylbfl25zwcmai"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1348,30 +1407,32 @@ luv = buildLuarocksPackage { license.fullName = "Apache 2.0"; }; }; + lyaml = buildLuarocksPackage { pname = "lyaml"; - version = "6.2.5-1"; + version = "6.2.7-1"; src = fetchurl { - url = "mirror://luarocks/lyaml-6.2.5-1.src.rock"; - sha256 = "00pnz27sqi84arwkzjabz9v7w37h7xvwb5njk690cfmaknb1dfz6"; + url = "https://luarocks.org/lyaml-6.2.7-1.src.rock"; + sha256 = "1sh1q84n109j4sammgbzyr69ni7fxnrjfwqb49fsbrhhd49vw7ca"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = with lib; { - homepage = "https://github.com/gvvaughan/lyaml"; + homepage = "http://github.com/gvvaughan/lyaml"; description = "libYAML binding for Lua"; maintainers = with maintainers; [ lblasc ]; license.fullName = "MIT/X11"; }; }; + markdown = buildLuarocksPackage { pname = "markdown"; version = "0.33-1"; src = fetchurl { - url = "mirror://luarocks/markdown-0.33-1.src.rock"; + url = "https://luarocks.org/markdown-0.33-1.src.rock"; sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1383,12 +1444,13 @@ markdown = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + mediator_lua = buildLuarocksPackage { pname = "mediator_lua"; version = "1.1.2-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/mediator_lua-1.1.2-0.rockspec"; + url = "https://luarocks.org/mediator_lua-1.1.2-0.rockspec"; sha256 = "0frzvf7i256260a1s8xh92crwa2m42972qxfq29zl05aw3pyn7bm"; }).outPath; @@ -1406,12 +1468,32 @@ mediator_lua = buildLuarocksPackage { license.fullName = "MIT "; }; }; + +moonscript = buildLuarocksPackage { + pname = "moonscript"; + version = "0.5.0-1"; + + src = fetchurl { + url = "https://luarocks.org/moonscript-0.5.0-1.src.rock"; + sha256 = "09vv3ayzg94bjnzv5fw50r683ma0x3lb7sym297145zig9aqb9q9"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ]; + + meta = with lib; { + homepage = "http://moonscript.org"; + description = "A programmer friendly language that compiles to Lua"; + maintainers = with maintainers; [ arobyn ]; + license.fullName = "MIT"; + }; +}; + mpack = buildLuarocksPackage { pname = "mpack"; version = "1.0.8-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/mpack-1.0.8-0.rockspec"; + url = "https://luarocks.org/mpack-1.0.8-0.rockspec"; sha256 = "0hhpamw2bydnfrild274faaan6v48918nhslnw3kvi9y36b4i5ha"; }).outPath; @@ -1427,30 +1509,13 @@ mpack = buildLuarocksPackage { license.fullName = "MIT"; }; }; -moonscript = buildLuarocksPackage { - pname = "moonscript"; - version = "0.5.0-1"; - src = fetchurl { - url = "mirror://luarocks/moonscript-0.5.0-1.src.rock"; - sha256 = "09vv3ayzg94bjnzv5fw50r683ma0x3lb7sym297145zig9aqb9q9"; - }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ]; - - meta = with lib; { - homepage = "http://moonscript.org"; - description = "A programmer friendly language that compiles to Lua"; - maintainers = with maintainers; [ arobyn ]; - license.fullName = "MIT"; - }; -}; nvim-client = buildLuarocksPackage { pname = "nvim-client"; version = "0.2.2-1"; src = fetchurl { - url = "mirror://luarocks/nvim-client-0.2.2-1.src.rock"; + url = "https://luarocks.org/nvim-client-0.2.2-1.src.rock"; sha256 = "0bgx94ziiq0004zw9lz2zb349xaqs5pminqd8bwdrfdnfjnbp8x0"; }; disabled = (luaOlder "5.1"); @@ -1462,38 +1527,39 @@ nvim-client = buildLuarocksPackage { license.fullName = "Apache"; }; }; + penlight = buildLuarocksPackage { pname = "penlight"; - version = "1.8.0-1"; + version = "1.10.0-1"; src = fetchurl { - url = "mirror://luarocks/penlight-1.8.0-1.src.rock"; - sha256 = "05x00dgsa79wzq187ww6i8j0s74nh2c852awni7xfshxgihwhc42"; + url = "https://luarocks.org/penlight-1.10.0-1.src.rock"; + sha256 = "1awd87833688wjdq8ynbzy1waia8ggaz573h9cqg1g2zm6d2mxvp"; }; propagatedBuildInputs = [ luafilesystem ]; meta = with lib; { - homepage = "http://tieske.github.io/Penlight"; + homepage = "https://lunarmodules.github.io/penlight"; description = "Lua utility libraries loosely based on the Python standard libraries"; - maintainers = with maintainers; [ alerque ]; license.fullName = "MIT/X11"; }; }; + plenary-nvim = buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/plenary.nvim-scm-1.rockspec"; + url = "https://luarocks.org/plenary.nvim-scm-1.rockspec"; sha256 = "1cp2dzf3010q85h300aa7zphyz75qn67lrwf9v6b0p534nzvmash"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "git://github.com/nvim-lua/plenary.nvim", - "rev": "8bae2c1fadc9ed5bfcfb5ecbd0c0c4d7d40cb974", - "date": "2021-07-12T11:07:18-04:00", - "path": "/nix/store/djp9yacizsxs9hiz786fb900fri0m2l8-plenary.nvim", - "sha256": "1axvjv6n77afkjqk914dpc020kxd7mig6m5sr916k1n1q35jc4ny", + "rev": "4a30ce31e3132bc268dee6879b20cad28c0fe8fa", + "date": "2021-08-02T15:17:10-04:00", + "path": "/nix/store/1qfg23iylmj9j2kfs7px1nknm81saw7i-plenary.nvim", + "sha256": "0iwrw88vjsnkij1mdm1d7pg1wwksssd6jpngps2qb5cddh43d2c0", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1509,13 +1575,14 @@ plenary-nvim = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + rapidjson = buildLuarocksPackage { pname = "rapidjson"; - version = "0.6.1-1"; + version = "0.7.1-1"; src = fetchurl { - url = "mirror://luarocks/rapidjson-0.6.1-1.src.rock"; - sha256 = "106zdkmqspwjw6ywzi7ya9zss52p9zggh53rg0i36sk19z0xmp6j"; + url = "https://luarocks.org/rapidjson-0.7.1-1.src.rock"; + sha256 = "010y1n7nlajdsm351fyqmi916v5x8kzp5hbynwlx5xc9r9480w81"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1526,29 +1593,31 @@ rapidjson = buildLuarocksPackage { license.fullName = "MIT"; }; }; + readline = buildLuarocksPackage { pname = "readline"; - version = "2.6-0"; + version = "3.0-0"; src = fetchurl { - url = mirror://luarocks/readline-2.6-0.src.rock; - sha256 = "1fvz7nqvkdazp30wn5n62n8i97qrfgznbykdpf8cnflqfpd1shms"; + url = "https://luarocks.org/readline-3.0-0.src.rock"; + sha256 = "0qpa60llcgvc5mj67a2w3il9i7700lvimraxjpk0lx44zkabh6c8"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua luaposix ]; meta = with lib; { - homepage = "http://www.pjb.com.au/comp/lua/readline.html"; + homepage = "http://pjb.com.au/comp/lua/readline.html"; description = "Interface to the readline library"; license.fullName = "MIT/X11"; }; }; + say = buildLuarocksPackage { pname = "say"; version = "1.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/say-1.3-1.rockspec"; + url = "https://luarocks.org/say-1.3-1.rockspec"; sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; }).outPath; @@ -1566,12 +1635,13 @@ say = buildLuarocksPackage { license.fullName = "MIT "; }; }; -std__debug = buildLuarocksPackage { + +std-_debug = buildLuarocksPackage { pname = "std._debug"; version = "1.0.1-1"; src = fetchurl { - url = "mirror://luarocks/std._debug-1.0.1-1.src.rock"; + url = "https://luarocks.org/std._debug-1.0.1-1.src.rock"; sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); @@ -1583,16 +1653,17 @@ std__debug = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; -std_normalize = buildLuarocksPackage { + +std-normalize = buildLuarocksPackage { pname = "std.normalize"; version = "2.0.3-1"; src = fetchurl { - url = "mirror://luarocks/std.normalize-2.0.3-1.src.rock"; + url = "https://luarocks.org/std.normalize-2.0.3-1.src.rock"; sha256 = "00pq2y5w8i052gxmyhgri5ibijksnfmc24kya9y3d5rjlin0n11s"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua std__debug ]; + propagatedBuildInputs = [ lua std-_debug ]; meta = with lib; { homepage = "https://lua-stdlib.github.io/normalize"; @@ -1600,12 +1671,13 @@ std_normalize = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + stdlib = buildLuarocksPackage { pname = "stdlib"; version = "41.2.2-1"; src = fetchurl { - url = "mirror://luarocks/stdlib-41.2.2-1.src.rock"; + url = "https://luarocks.org/stdlib-41.2.2-1.src.rock"; sha256 = "1kricll40xy75j72lrbp2jpyxsj9v8b9d7qjf3m3fq1bpg6dmsk7"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); @@ -1618,15 +1690,16 @@ stdlib = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; + vstruct = buildLuarocksPackage { pname = "vstruct"; - version = "2.0.2-1"; + version = "2.1.1-1"; src = fetchurl { - url = "mirror://luarocks/vstruct-2.0.2-1.src.rock"; - sha256 = "05k1685618wh7vg8av92mh1i1rjqg15x12gifbp9kyqzc2nk3kzq"; + url = "https://luarocks.org/vstruct-2.1.1-1.src.rock"; + sha256 = "0hdlq8dr27k32n5qr87yisl14wg0k0zqd990xqvjqdxrf8d7iypw"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -1635,6 +1708,6 @@ vstruct = buildLuarocksPackage { }; }; -} -/* GENERATED */ +} +/* GENERATED - do not edit this file */ diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 288f4fc078ba..33a4b26d82df 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -347,4 +347,8 @@ with super; sourceRoot=./readline-2.6 ''; }); + + + # aliases + cjson = super.lua-cjson; } From fa1dedee47f37c5df65589fcf47f307f9bfabd9e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 3 Aug 2021 00:24:05 +0200 Subject: [PATCH 170/375] doc: updated lua doc mentions lua 5.4 + fixed an error --- doc/languages-frameworks/lua.section.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index ea893ce3a4a7..41fe0de04b4d 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -139,11 +139,9 @@ the whitelist maintainers/scripts/luarocks-packages.csv and updated by running m [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock). The automation only goes so far though and some packages need to be customized. These customizations go in `pkgs/development/lua-modules/overrides.nix`. -For instance if the rockspec defines `external_dependencies`, these need to be manually added in its rockspec file then it won't work. +For instance if the rockspec defines `external_dependencies`, these need to be manually added to the overrides.nix. You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`. -Nix rely on luarocks to install lua packages, basically it runs: -`luarocks make --deps-mode=none --tree $out` #### Packaging a library manually {#packaging-a-library-manually} @@ -161,8 +159,8 @@ are not packaged for luarocks. You can see a few examples at `pkgs/top-level/lua ### Lua interpreters {#lua-interpreters} -Versions 5.1, 5.2 and 5.3 of the lua interpreter are available as -respectively `lua5_1`, `lua5_2` and `lua5_3`. Luajit is available too. +Versions 5.1, 5.2, 5.3 and 5.4 of the lua interpreter are available as +respectively `lua5_1`, `lua5_2`, `lua5_3` and `lua5_4`. Luajit is available too. The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/lua-5`. #### Attributes on lua interpreters packages {#attributes-on-lua-interpreters-packages} From 8b4f1e4111ac62e43c03200c65c5212d5b6ded07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 19:02:40 +0200 Subject: [PATCH 171/375] python3Packages.testfixtures: 6.17.1 -> 6.18.0 --- .../python-modules/testfixtures/default.nix | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index cd08fe58dcab..525f23f290ba 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -1,25 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy27 -, mock, pytest, sybil, zope_component, twisted }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, isPy27 +, mock +, pytestCheckHook +, sybil +, twisted +, zope_component +}: buildPythonPackage rec { pname = "testfixtures"; - version = "6.17.1"; + version = "6.18.0"; src = fetchPypi { inherit pname version; - sha256 = "5ec3a0dd6f71cc4c304fbc024a10cc293d3e0b852c868014b9f233203e149bda"; + sha256 = "sha256-1L0cT5DqyQpz4b3FnDHQOUPyGNaH88WgnkhHiEGor18="; }; - checkInputs = [ pytest mock sybil zope_component twisted ]; + checkInputs = [ + pytestCheckHook + mock + sybil + zope_component + twisted + ]; doCheck = !isPy27; - checkPhase = '' - # django is too much hasle to setup at the moment - pytest -W ignore::DeprecationWarning \ - --ignore=testfixtures/tests/test_django \ - -k 'not (log_then_patch or our_wrap_dealing_with_mock_patch or patch_with_dict)' \ - testfixtures/tests - ''; + + disabledTestPaths = [ + # Django is too much hasle to setup at the moment + "testfixtures/tests/test_django" + ]; + + pytestFlagsArray = [ + "testfixtures/tests" + ]; + + pythonImportsCheck = [ "testfixtures" ]; meta = with lib; { homepage = "https://github.com/Simplistix/testfixtures"; From b02c26519027b227c268fb4cde0cd5057fa85b67 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 3 Aug 2021 18:55:47 +0200 Subject: [PATCH 172/375] luaPackages: update Several updates --- maintainers/scripts/luarocks-packages.csv | 14 ++- maintainers/scripts/pluginupdate.py | 1 - .../lua-modules/generated-packages.nix | 107 ++++++++++++------ pkgs/development/lua-modules/overrides.nix | 2 +- 4 files changed, 81 insertions(+), 43 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 6ad159a7ffff..48a9d0e3d3a9 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,20 +1,22 @@ name,server,version,luaversion,maintainers -bit32,,,lua5_1,lblasc +alt-getopt,,,,arobyn +ansicolors,,,, +bit32,,5.3.0-1,lua5_1,lblasc argparse,,,, basexx,,,, binaryheap,,,,vcunat busted,,,, cassowary,,,,marsam alerque -compat53,,,,vcunat +compat53,,0.7-1,,vcunat cosmo,,,,marsam coxpcall,,1.17.0-1,, cqueues,,,,vcunat cyrussasl,,,, -digestif,,,lua5_3, +digestif,,0.2-1,lua5_3, dkjson,,,, fifo,,,, gitsigns.nvim,,,lua5_1, -http,,,,vcunat +http,,0.3-0,,vcunat inspect,,,, ldbus,http://luarocks.org/dev,,, ldoc,,,, @@ -58,7 +60,7 @@ luaffi,http://luarocks.org/dev,,, luafilesystem,,1.7.0-2,,flosse lualogging,,,, luaossl,,,lua5_1, -luaposix,,,,vyp lblasc +luaposix,,34.1.1-1,,vyp lblasc luarepl,,,, luasec,,,,flosse luasocket,,,, @@ -69,7 +71,7 @@ luautf8,,,,pstn luazip,,,, lua-yajl,,,,pstn luuid,,,, -luv,,,, +luv,,1.30.0-0,, lyaml,,,,lblasc markdown,,,, mediator_lua,,,, diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 45511607b034..0d656556557f 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -203,7 +203,6 @@ class Editor: name: str, root: Path, get_plugins: str, - # TODO modifier pour accepter un plugin generate_nix: Callable[[List[Tuple[str, str, Plugin]], str], None], default_in: Optional[Path] = None, default_out: Optional[Path] = None, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2d5b633bb1a3..782084c19957 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -10,6 +10,43 @@ You can customize the generated packages in pkgs/development/lua-modules/overrid self: super: with self; { +alt-getopt = buildLuarocksPackage { + pname = "alt-getopt"; + version = "0.8.0-1"; + + src = fetchurl { + url = "https://luarocks.org/alt-getopt-0.8.0-1.src.rock"; + sha256 = "1mi97dqb97sf47vb6wrk12yf1yxcaz0asr9gbgwyngr5n1adh5i3"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + + meta = with lib; { + homepage = "https://github.com/cheusov/lua-alt-getopt"; + description = "Process application arguments the same way as getopt_long"; + maintainers = with maintainers; [ arobyn ]; + license.fullName = "MIT/X11"; + }; +}; + +ansicolors = buildLuarocksPackage { + pname = "ansicolors"; + version = "1.0.2-3"; + + src = fetchurl { + url = "https://luarocks.org/ansicolors-1.0.2-3.src.rock"; + sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with lib; { + homepage = "https://github.com/kikito/ansicolors.lua"; + description = "Library for color Manipulation."; + license.fullName = "MIT "; + }; +}; + argparse = buildLuarocksPackage { pname = "argparse"; version = "0.7.1-1"; @@ -73,20 +110,20 @@ binaryheap = buildLuarocksPackage { bit32 = buildLuarocksPackage { pname = "bit32"; - version = "5.3.5.1-1"; + version = "5.3.0-1"; src = fetchurl { - url = "https://luarocks.org/bit32-5.3.5.1-1.src.rock"; - sha256 = "0b517hkf3r7pdm78sqx9df9440k7wbml4mpckh7jfxxqy8kk89qf"; + url = "https://luarocks.org/bit32-5.3.0-1.src.rock"; + sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; description = "Lua 5.2 bit manipulation library"; maintainers = with maintainers; [ lblasc ]; - license.fullName = "MIT"; + license.fullName = "MIT/X11"; }; }; @@ -135,13 +172,13 @@ cassowary = buildLuarocksPackage { compat53 = buildLuarocksPackage { pname = "compat53"; - version = "0.8-1"; + version = "0.7-1"; src = fetchurl { - url = "https://luarocks.org/compat53-0.8-1.src.rock"; - sha256 = "14lw4mxh6ksy7fav1hbspp4ir8bjb7mhnkqdxjhj6jggl1dyf4z5"; + url = "https://luarocks.org/compat53-0.7-1.src.rock"; + sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -238,14 +275,14 @@ cyrussasl = buildLuarocksPackage { digestif = buildLuarocksPackage { pname = "digestif"; - version = "0.4-1"; + version = "0.2-1"; src = fetchurl { - url = "https://luarocks.org/digestif-0.4-1.src.rock"; - sha256 = "1hsdr48akviv0l8ldf1km3xcs3i7kf00ws2d893w23nn8rlanv7y"; + url = "mirror://luarocks/digestif-0.2-1.src.rock"; + sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd"; }; disabled = (luaOlder "5.3"); - propagatedBuildInputs = [ lua lpeg ]; + propagatedBuildInputs = [ lua lpeg dkjson ]; meta = with lib; { homepage = "https://github.com/astoff/digestif/"; @@ -291,11 +328,11 @@ fifo = buildLuarocksPackage { http = buildLuarocksPackage { pname = "http"; - version = "0.4-0"; + version = "0.3-0"; src = fetchurl { - url = "https://luarocks.org/http-0.4-0.src.rock"; - sha256 = "0a73rm097jw5rpc7zj5cavc9f79n52kck623kq2kgfczz2gv5qfv"; + url = "https://luarocks.org/http-0.3-0.src.rock"; + sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; @@ -1093,13 +1130,13 @@ luaevent = buildLuarocksPackage { luaexpat = buildLuarocksPackage { pname = "luaexpat"; - version = "1.3.3-1"; + version = "1.3.0-1"; src = fetchurl { - url = "https://luarocks.org/luaexpat-1.3.3-1.src.rock"; - sha256 = "0ahpfnby9qqgj22bajmrqvqq70nx19388lmjm9chljfzszy0hndm"; + url = "https://luarocks.org/luaexpat-1.3.0-1.src.rock"; + sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; }; - disabled = (luaOlder "5.0"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with lib; { @@ -1130,11 +1167,11 @@ luaffi = buildLuarocksPackage { luafilesystem = buildLuarocksPackage { pname = "luafilesystem"; - version = "1.8.0-1"; + version = "1.7.0-2"; src = fetchurl { - url = "https://luarocks.org/luafilesystem-1.8.0-1.src.rock"; - sha256 = "1kqr1vwazrysgxamx9x89vn3fparfffx986bq9a452ajayjp0qjp"; + url = "https://luarocks.org/luafilesystem-1.7.0-2.src.rock"; + sha256 = "0xhmd08zklsgpnpjr9rjipah35fbs8jd4v4va36xd8bpwlvx9rk5"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1183,14 +1220,14 @@ luaossl = buildLuarocksPackage { luaposix = buildLuarocksPackage { pname = "luaposix"; - version = "35.0-1"; + version = "34.1.1-1"; src = fetchurl { - url = "https://luarocks.org/luaposix-35.0-1.src.rock"; - sha256 = "1da27fsz6v2asxifr4yv0r8rp80g6bg021piqrabqk9lq23hvjks"; + url = "https://luarocks.org/luaposix-34.1.1-1.src.rock"; + sha256 = "1l9pkn3g0nzlbmmfj12rhfwvkqb06c21ydqxqgmnmd3w9z4ck53w"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ bit32 lua ]; meta = with lib; { homepage = "http://github.com/luaposix/luaposix/"; @@ -1392,11 +1429,11 @@ luuid = buildLuarocksPackage { luv = buildLuarocksPackage { pname = "luv"; - version = "1.41.1-0"; + version = "1.30.0-0"; src = fetchurl { - url = "https://luarocks.org/luv-1.41.1-0.src.rock"; - sha256 = "0l1v07nhrkzsddbcc4bak382b5flyw6x8g4i394ylbfl25zwcmai"; + url = "https://luarocks.org/luv-1.30.0-0.src.rock"; + sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1556,10 +1593,10 @@ plenary-nvim = buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "git://github.com/nvim-lua/plenary.nvim", - "rev": "4a30ce31e3132bc268dee6879b20cad28c0fe8fa", - "date": "2021-08-02T15:17:10-04:00", - "path": "/nix/store/1qfg23iylmj9j2kfs7px1nknm81saw7i-plenary.nvim", - "sha256": "0iwrw88vjsnkij1mdm1d7pg1wwksssd6jpngps2qb5cddh43d2c0", + "rev": "d897b4d9fdbc51febd71a1f96c96001ae4fa6121", + "date": "2021-08-03T08:49:43-04:00", + "path": "/nix/store/nwarm7lh0r1rzmx92srq73x3r40whyw1-plenary.nvim", + "sha256": "0rgqby4aakqamiw3ykvzhn3vd2grjkzgfxrpzjjp1ipkd2qak8mb", "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 33a4b26d82df..8f3cce77ef22 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -344,7 +344,7 @@ with super; })).overrideAttrs (old: { # Without this, source root is wrongly set to ./readline-2.6/doc setSourceRoot = '' - sourceRoot=./readline-2.6 + sourceRoot=./readline-3.0 ''; }); From a71cb740fc9233d2ee5fdb304dc62726e49319ad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 19:43:38 +0000 Subject: [PATCH 173/375] goxel: 0.10.7 -> 0.10.8 --- pkgs/applications/graphics/goxel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 64ea533eefd2..325d1bcf083d 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goxel"; - version = "0.10.7"; + version = "0.10.8"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "1v6m6nhl1if8ik5bmblhq46bip6y2qz18a04s8a9awb4yh9ls039"; + sha256 = "sha256-M9H9SV8xmU7Jw5rEdV0gfloIEBvWmWSuH+BCrowpf2M="; }; patches = [ ./disable-imgui_ini.patch ]; From f8c133f9776560031bb55ea84db5d0b12ab256ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 19:56:53 +0000 Subject: [PATCH 174/375] grafana-agent: 0.18.0 -> 0.18.1 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 318b945a5927..6b9067d65da9 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-FUAaM4jYjyYeu5TX5I8icuzjGv80ZzZPWSsNwE5w84U="; + sha256 = "sha256-sKD9ulA6iaaI5yMja0ohDlXDNH4jZzyJWlXdvJo3Q2g="; }; - vendorSha256 = "sha256-xQNsRL0hFuJ/gm1K/1IpzAGIqpyN2CF1EeX/cEfcBBM="; + vendorSha256 = "sha256-MZGOZB/mS3pmZuI35E/QkaNLLhbuW2DfZiih9OCXMj0="; patches = [ # https://github.com/grafana/agent/issues/731 From 12e3001dadb1f08db7ec13ba232894d3874964eb Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 9 Aug 2021 22:10:14 +0200 Subject: [PATCH 175/375] sdcc: honour dontStrip even with 'dontStrip', the sdcc binary was stipped anyway. specifying STRIP=none will convince ./configure to use 'none' as the strip tool, which 'make install' conveniently ignores. --- pkgs/development/compilers/sdcc/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index d0ebb57920bc..28a461b09883 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { configureFlags = map (f: "--disable-${f}-port") excludedPorts; + preConfigure = '' + if test -n "''${dontStrip-}"; then + export STRIP=none + fi + ''; + meta = { description = "Small Device C Compiler"; longDescription = '' From 9153df24d579f5853ef362b540fe7fb7254b64e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 22:21:10 +0200 Subject: [PATCH 176/375] python3Packages.sopel: 7.1.0 -> 7.1.2 --- pkgs/development/python-modules/sopel/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index f74fa560adc4..54fc243be262 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.0"; + version = "7.1.2"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "74057d4c86cff744b1f1062f3a9c4ae99eb4f1b17048ceb083293d5f4c7e989b"; + sha256 = "sha256-8RhIw3Qt0BclH1Ws16JNuFfwiRxJ14lM6MBUK9OvNKA="; }; propagatedBuildInputs = [ @@ -36,7 +36,8 @@ buildPythonPackage rec { # remove once https://github.com/sopel-irc/sopel/pull/1653 lands postPatch = '' substituteInPlace requirements.txt \ - --replace "praw>=4.0.0,<6.0.0" "praw" + --replace "praw>=4.0.0,<6.0.0" "praw" \ + --replace "sqlalchemy<1.4" "sqlalchemy" ''; checkInputs = [ pytestCheckHook ]; From a794c51c07e28ca6f3f33c630fbe7216eb53f3f8 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Tue, 10 Aug 2021 08:28:41 +1200 Subject: [PATCH 177/375] haskell.compiler.ghcHEAD: 9.3.20210504 -> 9.3.20210806 --- pkgs/development/compilers/ghc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 2ea14b78cc4a..685497b3037a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -40,7 +40,7 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "9.3.20210504" +, version ? "9.3.20210806" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -152,8 +152,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "049c3a83fbce67e58e70c727d89e8331608a4e04"; - sha256 = "0dk7c9ywam9fj33lqzpwxhiwz017m58j6ixvc8b07kzp7kskaxq7"; + rev = "5d651c78fed7e55b3b3cd21a04499d1a2f75204d"; + sha256 = "1z9xg8jsqr9id985wxfhkjyb3kpyrmr7vjdqzfv42cpxynd483r8"; }; enableParallelBuilding = true; From c756b732d40da2a9bc656c3c01fd86ba4effd205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 9 Aug 2021 21:32:33 +0100 Subject: [PATCH 178/375] ledger-live-desktop: 2.31.1 -> 2.32.2 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 6e97c51afce4..4b3ba00fb960 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.31.1"; + version = "2.32.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "0cxf4i58l0kg9c13j7mf0w5ijrkkf9z1375vn6xghd0r8g5hvws5"; + sha256 = "14agkl6xf0f9s5qldla6p6kzl8zlx61q5m8qy63lq215hrzh9d50"; }; appimageContents = appimageTools.extractType2 { From 8c701f580525fb480f94f92eee125b8fd6ea6da5 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 9 Aug 2021 22:35:13 +0200 Subject: [PATCH 179/375] minio-client: 2021-06-13T17-48-22Z -> 2021-07-27T06-46-19Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 06ec1b5a83f7..893537e167ad 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-06-13T17-48-22Z"; + version = "2021-07-27T06-46-19Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-u0WO7KSalDqlRwbN3b74FOb632fIGPZ2F0T8qLrvt+U="; + sha256 = "1h0r8c22v94w2hhbc0hv9rc9jyr5ar7gpa76lhr9l8ra0k3qra43"; }; - vendorSha256 = "sha256-BadW8AKHcrkCS3sXR7bqdgNhRYkfXIQOteMxIbiLvwg="; + vendorSha256 = "1s1bq166dlhqll0r5lcdjpd2446cwi1slbi895582jgs38zpkzvw"; subPackages = [ "." ]; From 922791fbc64f8f99f6a9e18ddf9c18ba9681da52 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:19:43 +0200 Subject: [PATCH 180/375] python3Packages.scrapy: fix build --- pkgs/development/python-modules/scrapy/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 4ca073106586..e19e502af269 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -113,6 +113,10 @@ buildPythonPackage rec { "test_custom_loop_asyncio" "test_custom_loop_asyncio_deferred_signal" "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157 + # Fails with AssertionError + "test_peek_fifo" + "test_peek_one_element" + "test_peek_lifo" ] ++ lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" "test_download" From 3f7771d65cca13a229e11f4aeaaf9245414a2134 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 7 Aug 2021 14:54:00 +0200 Subject: [PATCH 181/375] unifi6: 6.2.25 -> 6.2.26 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 0cca27a6be9d..070324a5a15a 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -52,7 +52,7 @@ in rec { }; unifi6 = generic { - version = "6.2.25"; - sha256 = "14pfy9cxjyaczdp9lk56by8s5485sjsz2414x7wshf1x76yfjh27"; + version = "6.2.26"; + sha256 = "15mwl02v50j30vvsmky9kp42i04y38kipapczyi5srhbd9jddyh3"; }; } From 8d347b14190550c5d3cbf998137f5af3b51e6785 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 21:56:42 +0000 Subject: [PATCH 182/375] bitcoin-unlimited: 1.9.1.1 -> 1.9.2.0 --- pkgs/applications/blockchains/bitcoin-unlimited/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index f1825b0cbda8..802a19167a97 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.9.1.1"; + version = "1.9.2.0"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "BCHunlimited${version}"; - sha256 = "sha256-K15SI1F/xI4SkX4a41QHLn89YaHCgrlv+wcbkpwGKhI="; + sha256 = "sha256-qUf/GWZHpI57ATTlvRhjDtAjRa8a4uvUb0G9Xcf0j7w="; }; nativeBuildInputs = [ pkg-config autoreconfHook python3 ] From 65db4268d056afefac988705bae2f65651b1f7c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Aug 2021 03:10:51 +0000 Subject: [PATCH 183/375] gpsd: 3.22 -> 3.23 Clean up unnecessary dependencies, update license. Add todo to generate asciidoctor documentation. --- pkgs/servers/gpsd/default.nix | 78 ++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 62b711af67a0..d6f7fbea3ded 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -1,40 +1,71 @@ -{ stdenv, lib ,fetchurl, scons, pkg-config, dbus, ncurses -, libusb1, docbook_xml_dtd_412, docbook_xsl, bc +{ stdenv +, lib +, fetchurl + +# nativeBuildInputs +, scons +, pkg-config + +# buildInputs +, dbus +, libusb1 +, ncurses +, pps-tools +, python3Packages # optional deps for GUI packages , guiSupport ? true -, dbus-glib ? null, libX11 ? null, libXt ? null, libXpm ? null, libXaw ? null, libXext ? null -, gobject-introspection ? null, pango ? null, gdk-pixbuf ? null, atk ? null, wrapGAppsHook ? null +, dbus-glib ? null +, libX11 ? null +, libXt ? null +, libXpm ? null +, libXaw ? null +, libXext ? null +, gobject-introspection ? null +, pango ? null +, gdk-pixbuf ? null +, atk ? null +, wrapGAppsHook ? null -, libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" -, pps-tools -, python3Packages +, gpsdUser ? "gpsd", gpsdGroup ? "dialout" }: - stdenv.mkDerivation rec { pname = "gpsd"; - version = "3.22"; + version = "3.23"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "18rplv1cd76ndb2wc91jarjmfm2nk508pykv1hir79bqbwmdygvq"; + sha256 = "sha256-UiwjYqfrLXrDfqoVBPEq3tHDc0eah7oGzGeVl0tWe7w="; }; + # TODO: render & install HTML documentation using asciidoctor nativeBuildInputs = [ - scons pkg-config docbook_xml_dtd_412 docbook_xsl xmlto bc - python3Packages.python + pkg-config python3Packages.wrapPython - ] - ++ lib.optionals guiSupport [ wrapGAppsHook gobject-introspection ]; + scons + ] ++ lib.optionals guiSupport [ + gobject-introspection + wrapGAppsHook + ]; buildInputs = [ - python3Packages.python dbus ncurses - libxslt libusb1 pps-tools - ] - ++ lib.optionals guiSupport [ - dbus-glib libX11 libXt libXpm libXaw libXext - gobject-introspection pango gdk-pixbuf atk + dbus + libusb1 + ncurses + pps-tools + python3Packages.python + ] ++ lib.optionals guiSupport [ + atk + dbus-glib + gdk-pixbuf + gobject-introspection + libX11 + libXaw + libXext + libXpm + libXt + pango ]; pythonPath = lib.optionals guiSupport [ @@ -46,8 +77,6 @@ stdenv.mkDerivation rec { ./sconstruct-env-fixes.patch ]; - # - leapfetch=no disables going online at build time to fetch leap-seconds - # info. See /build.txt for more info. preBuild = '' patchShebangs . sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConscript @@ -57,6 +86,8 @@ stdenv.mkDerivation rec { sconsFlags+=" python_libdir=$out/lib/${python3Packages.python.libPrefix}/site-packages" ''; + # - leapfetch=no disables going online at build time to fetch leap-seconds + # info. See /build.txt for more info. sconsFlags = [ "leapfetch=no" "gpsd_user=${gpsdUser}" @@ -73,6 +104,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p "$out/lib/udev/rules.d" ''; + installTargets = [ "install" "udev-install" ]; # remove binaries for x-less install because xgps sconsflag is partially broken @@ -103,7 +135,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gpsd.gitlab.io/gpsd/index.html"; changelog = "https://gitlab.com/gpsd/gpsd/-/blob/release-${version}/NEWS"; - license = licenses.bsd3; + license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor rasendubi ]; }; From 8f54273f1e1ac72f7e095c36889561b811ff2928 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 00:21:34 +0200 Subject: [PATCH 184/375] python3Packages.mutesync: 0.0.1 -> 0.0.2 --- .../python-modules/mutesync/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mutesync/default.nix b/pkgs/development/python-modules/mutesync/default.nix index 98bf6ce07458..382f09ca6d0a 100644 --- a/pkgs/development/python-modules/mutesync/default.nix +++ b/pkgs/development/python-modules/mutesync/default.nix @@ -2,17 +2,16 @@ , aiohttp , async-timeout , buildPythonPackage -, fetchpatch , fetchPypi }: buildPythonPackage rec { pname = "mutesync"; - version = "0.0.1"; + version = "0.0.2"; src = fetchPypi { inherit pname version; - sha256 = "05r8maq59glwgysg98y1vrysfb1mkh9jpbag3ixl13n8jw8clp85"; + sha256 = "1lz3q3q9lw8qxxb8jyrak77v6hkxwi39akyx96j8hd5jjaq2k5qc"; }; propagatedBuildInputs = [ @@ -20,17 +19,9 @@ buildPythonPackage rec { async-timeout ]; - patches = [ - # Don't parse requirements.txt, https://github.com/currentoor/pymutesync/pull/1 - (fetchpatch { - name = "add-requirements.patch"; - url = "https://github.com/currentoor/pymutesync/commit/d66910fc83b1ae3060cdb3fe22a6f91fb70a67f0.patch"; - sha256 = "0axhgriyyv31b1r1yidxcrv0nyrqbb63xw5qrmv2iy2h0v96ijsk"; - }) - ]; - # Project has not published tests yet doCheck = false; + pythonImportsCheck = [ "mutesync" ]; meta = with lib; { From ab94e3d2001823e0c327e8ea8e8fb314660afe3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 00:18:42 +0200 Subject: [PATCH 185/375] usbredir: 0.9.0 -> 0.10.0 --- .../libraries/usbredir/default.nix | 45 ++++++++++++++----- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 0313b8c81ef2..00a16e15b032 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,27 +1,50 @@ -{ lib, stdenv, fetchurl, pkg-config, libusb1 }: +{ lib +, stdenv +, cmake +, fetchFromGitLab +, pkg-config +, meson +, ninja +, glib +, libusb1 +}: stdenv.mkDerivation rec { pname = "usbredir"; - version = "0.8.0"; + version = "0.10.0"; - src = fetchurl { - url = "https://spice-space.org/download/usbredir/${pname}-${version}.tar.bz2"; - sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "spice"; + repo = "usbredir"; + rev = "${pname}-${version}"; + sha256 = "1dz8jms9l6gg2hw0k6p1p1lnchc9mcgmskgvm5gbdvw3j7wrhdbz"; }; - NIX_CFLAGS_COMPILE = "-Wno-error"; + nativeBuildInputs = [ + glib + meson + ninja + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ libusb1 ]; + propagatedBuildInputs = [ + libusb1 + ]; + + mesonFlags = [ + "-Dgit_werror=disabled" + "-Dtools=enabled" + "-Dfuzzing=disabled" + ]; outputs = [ "out" "dev" ]; meta = with lib; { description = "USB traffic redirection protocol"; homepage = "https://www.spice-space.org/usbredir.html"; - license = licenses.lgpl21; - - maintainers = [ maintainers.offline ]; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ offline ]; platforms = platforms.linux; }; } From a1161b3dc0d56407465d88ff18b0a1d64ef298b0 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 23 Jul 2021 21:15:38 -0400 Subject: [PATCH 186/375] vscode-extensions.vadimcn.vscode-lldb: Fix build on Darwin --- pkgs/misc/vscode-extensions/vscode-lldb/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 0ef98818dbd1..819650bdb01a 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -31,7 +31,7 @@ let buildAndTestSubdir = "adapter"; - cargoFlags = [ + cargoBuildFlags = [ "--lib" "--bin=codelldb" "--features=weak-linkage" @@ -99,6 +99,5 @@ in stdenv.mkDerivation { license = with licenses; [ mit ]; maintainers = with maintainers; [ oxalica ]; platforms = platforms.all; - broken = stdenv.isDarwin; # Build failed on x86_64-darwin currently. }; } From 810b03602b7c51c120503a1dbfa2a33c67a6f8d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 11:57:36 +0200 Subject: [PATCH 187/375] firefox: 90.0.2 -> 91.0 --- pkgs/applications/networking/browsers/firefox/common.nix | 4 ++-- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c7632ad338db..514447931f38 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,7 +8,7 @@ , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification , libvpx_1_8 -, icu67, libpng, jemalloc, glib, pciutils +, icu69, libpng, jemalloc, glib, pciutils , autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 @@ -173,7 +173,7 @@ buildStdenv.mkDerivation ({ xorg.libXext libevent libstartup_notification /* cairo */ libpng jemalloc glib - nasm icu67 libvpx_1_8 + nasm icu69 libvpx_1_8 # >= 66 requires nasm for the AV1 lib dav1d # yasm can potentially be removed in future versions # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 109c757c15f1..2fd79a2a4530 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "90.0.2"; + ffversion = "91.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "4fda0b1e666fb0b1d846708fad2b48a5b53d48e7fc2a5da1f234b5b839c55265b41f6509e6b506d5e8a7455f816dfa5ab538589bc9e83b7e3846f0f72210513e"; + sha512 = "a02486a3996570e0cc815e92c98890bca1d27ce0018c2ee3d4bff9a6e54dbc8f5926fea8b5864f208e15389d631685b2add1e4e9e51146e40224d16d5c02f730"; }; meta = { From afb0e73ebc17e558416491307ccfb02d585e4436 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 11:57:57 +0200 Subject: [PATCH 188/375] firefox-esr-91: init at 91.0esr --- nixos/tests/all-tests.nix | 5 ++-- nixos/tests/firefox.nix | 9 +++--- .../networking/browsers/firefox/packages.nix | 28 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 3 ++ 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index dd9390e382b3..e94259d07cad 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -126,8 +126,9 @@ in fancontrol = handleTest ./fancontrol.nix {}; fcitx = handleTest ./fcitx {}; ferm = handleTest ./ferm.nix {}; - firefox = handleTest ./firefox.nix {}; - firefox-esr = handleTest ./firefox.nix { esr = true; }; + firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; + firefox-esr-78 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-78; }; + firefox-esr-91 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-91; }; firejail = handleTest ./firejail.nix {}; firewall = handleTest ./firewall.nix {}; fish = handleTest ./fish.nix {}; diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 2e27ac302af5..4ad45c022407 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, esr ? false, ... }: { +import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { name = "firefox"; meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; @@ -8,9 +8,10 @@ import ./make-test-python.nix ({ pkgs, esr ? false, ... }: { { pkgs, ... }: { imports = [ ./common/x11.nix ]; - environment.systemPackages = - (if esr then [ pkgs.firefox-esr ] else [ pkgs.firefox ]) - ++ [ pkgs.xdotool ]; + environment.systemPackages = [ + firefoxPackage + pkgs.xdotool + ]; # Need some more memory to record audio. virtualisation.memorySize = "500"; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 2fd79a2a4530..33186ccba471 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -31,6 +31,32 @@ rec { }; }; + firefox-esr-91 = common rec { + pname = "firefox-esr"; + ffversion = "91.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + sha512 = "e518e1536094a1da44eb45b3b0f3adc1b5532f17da2dbcc994715419ec4fcec40574fdf633349a8e5de6382942f5706757a35f1b96b11de4754855b9cf7946ae"; + }; + + meta = { + description = "A web browser built from Firefox Extended Support Release source tree"; + homepage = "http://www.mozilla.com/en-US/firefox/"; + maintainers = with lib.maintainers; [ hexa ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + license = lib.licenses.mpl20; + }; + tests = [ nixosTests.firefox-esr-91 ]; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-91-unwrapped"; + versionSuffix = "esr"; + versionKey = "ffversion"; + }; + }; + firefox-esr-78 = common rec { pname = "firefox-esr"; ffversion = "78.12.0esr"; @@ -49,7 +75,7 @@ rec { # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; }; - tests = [ nixosTests.firefox-esr ]; + tests = [ nixosTests.firefox-esr-78 ]; updateScript = callPackage ./update.nix { attrPath = "firefox-esr-78-unwrapped"; versionSuffix = "esr"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf4e86402b87..b6ca82f1f2b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24443,9 +24443,12 @@ with pkgs; firefox-unwrapped = firefoxPackages.firefox; firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78; + firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; + firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; + firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; firefox-esr = firefox-esr-78; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { From 7ed340a58586337896b28a0a02954afa982a36d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 12:19:07 +0200 Subject: [PATCH 189/375] firefox-bin: 90.0.2 -> 91.0 --- .../browsers/firefox-bin/release_sources.nix | 788 +++++++++--------- 1 file changed, 399 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 93eef40afae3..b59fab089535 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,985 @@ { - version = "90.0.2"; + version = "91.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ach/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ach/firefox-91.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "ee3f5f5e5fef9b41a075569515467ae53706d1b456afc34acc3e73cb53ad7549"; + sha256 = "2994fee72d674891a4e05fb32e210f8b2c9f7bf4d3a0a8309bda91f7f3643880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/af/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/af/firefox-91.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "0c6178c97b21580038495444500cd9cbd8de980ba64ab9345366d2eb43ff7c9d"; + sha256 = "dc3e1370fba43b34513104acfb6027ae16b675649ccccfdf57b95fbb9c969e6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/an/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/an/firefox-91.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "6dd2b6b3219f1ef39e0d204dc346ff750d045bcfe16cfc55efc15ee3dcd74b85"; + sha256 = "c6f9c813bf1ea4d5e9b5f2facea73cee5345c2ce53e6bdc8d9ccef2cc1c11e14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ar/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ar/firefox-91.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "efb5dae74218823b3550d716be8b6aa907c9daa2611588d254c3ffd24923a1e6"; + sha256 = "343e6dac789d95f4c3fd247a62a820289e9829f8e5c183e760137686d3a6a4ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ast/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ast/firefox-91.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "ef665e2ace9a41650d873cbc5562b2072c9de013f8a48a5ce72b735c9e76e883"; + sha256 = "e7befd2ac2ffd2a03df135c2ed511823996eb00c6ed38b7a53a02f99909d0156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/az/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/az/firefox-91.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "2eac97a8216725732ad9e79451e23af0a4f6688d248fb12f17e0ddfdbcbe8766"; + sha256 = "82b55afce5a0016f5deffc3e56e52b32b2b0cf8da68d9044ec4b86ce351e7a6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/be/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/be/firefox-91.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5da97b0b3e7be0ee77ffc013a453249fdb1b6c90a6baa93e6e180f64a2e6bed5"; + sha256 = "39929a09ab442795ba39818d39b0190c14c343acca867e6c5b4df5dd4a1d3216"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/bg/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/bg/firefox-91.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "de04186cb91dac93edb81c6da8cfa21a2bb33abe0677038cc08762b79fd9032e"; + sha256 = "bf0b8704f873acf2a2e1edd415769d57bb0c10a9b60461de4748c5947f98d01c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/bn/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/bn/firefox-91.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "6e408ad360718bed39902e4634c8bbf89de5bd31d4eb6124b3e0a624f4a817ff"; + sha256 = "9711f2484ede52236b9cbe97b82a1f7ba544421e1c182106d7f2b21d148822e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/br/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/br/firefox-91.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "192b8e20b9f42f443dcbbc1dca6103e2ea44925fc1df05f6a6c61861ccc2e09e"; + sha256 = "c14c6a0716f8ced15c27edace60138bead407cdeff3e2b1eab4fa33b424a6576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/bs/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/bs/firefox-91.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "9fc5a531065f5fe0466e8e3027dfba654dc30470ae2763765692a49223e80da3"; + sha256 = "c66c10beb69eac9b42dd61e349f7c0593eea7a704a8e8efe60b192c39fefac8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ca-valencia/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ca-valencia/firefox-91.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c1a9d555dad9598379733404141272292cbac858b2b2f7fd7f5cc1962aef3280"; + sha256 = "2408cc49bb6e8b091af511dd0321c4a39f6bc70fcc168a605bfae7a667679440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ca/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ca/firefox-91.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "942fd1cbe717d344e09e4c56e2b5f2fd54d341f92b85d9ea5c90d272b5fdd385"; + sha256 = "86712676ca2d4bbb734c6a0e21b9777d0b1ad93e25c85d57e1adaa3d41955a95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/cak/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/cak/firefox-91.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b4ee321fe684de9919bc7333096dcd590576c8ce405e454cd362bd4e7559d0c9"; + sha256 = "b0bec96b9bc4d6e43735964a2350182fd0f6e7ea142ac35b6b93a15926032bc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/cs/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/cs/firefox-91.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6249f8805552c035160c1a6a155323190e4cde495409ebdb1be182234eea78b0"; + sha256 = "0e65a190647d2569421d07a12f742989acedb6804dcebe8cffe0582282edd5c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/cy/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/cy/firefox-91.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "a362582fa671c3a9c54afb10d1c88348ad3da31add280e730e4ced4aed21a733"; + sha256 = "e45a94e9b12e039e99a061e994e6837037cb197268697ba374bc03d5102f94db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/da/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/da/firefox-91.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "7ea8aeb5eeeb17799642498905893e8b043e5abfc4a0d3ce142f95d54737f473"; + sha256 = "d3798723fb877c8e0b5f0331251ee4088a32f05f2b42f7831792282eb474cc1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/de/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/de/firefox-91.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ebbd750201afbcb189cff2db5f72af590024e7d801a04a00c9b2e656921b0440"; + sha256 = "e14dbc808f746c828a8c8a81a7d860bcb89135bc7f8efe8975700117a54da18e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/dsb/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/dsb/firefox-91.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8885710a72d73ee150763fbe942fb645797f791636d27a3c52425a67169c851f"; + sha256 = "fc9ac755e5d3259e57c292f2b883d88e34c7962e0a9311652d1c5e9978c26bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/el/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/el/firefox-91.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "652c6d6cb263b57f3f5801bece2464d5df4bcb326072419c9e269dfcbe92dfb8"; + sha256 = "20fb8f044aed5e440c31c201e6b9abd7e167fb2aaab248374a7e109e34048e78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/en-CA/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/en-CA/firefox-91.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "87f4cb450da3180eefc47f0ab453c00182904f9a367d4a6fb0baf6e1a1aa0955"; + sha256 = "031594c33c321c59a33fae75556c5da68d9ef3553b56a4ebd590ef2205229836"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/en-GB/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/en-GB/firefox-91.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e0d55687a6c577d04db7c1b90532aa6274882e92275e2cf5af1efbf6f4bd1c9c"; + sha256 = "02f3ac078c7e071f73fa4ff1fb6e4d01b4f9417ee6b6d9d03837b8560bc7375c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/en-US/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/en-US/firefox-91.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2d62a8b1b1e39c00ddd8923fc862484fa1501eba243894ae4c5079766e58d1fc"; + sha256 = "bced054543003caf29d0c93aa63359809bdf1f1fcbca92b82c57167fe94ca1c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/eo/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/eo/firefox-91.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "4e1198ff0d83718326784348d301ab6782a73435ab1b32d40ccdc9d05238ca8a"; + sha256 = "9bf644eb700c30c078377a44cfdfe58ee9cf376d508bd4c815d125255e11dd72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-AR/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/es-AR/firefox-91.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ae8a2145ae461fd5a13744fbeb93f16330f68497a58b21465cc8c174fb5a4fcb"; + sha256 = "54069c3a8988e50639e3f3a0126c3607360ccbff04ef979f7c5347a395ad9971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-CL/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/es-CL/firefox-91.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1c66b290d07ae7d7093a67930a15e648b0c4ca95fe8bbd42ca9349766537a4b9"; + sha256 = "db78bb546dfeb835b1d1a3c22337b388d50ea73a46af94d2f506442e45328725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-ES/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/es-ES/firefox-91.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "164575fc3385ea9f3883febbd827aaa9115da185e07f70afdd8b2cd5442fdf46"; + sha256 = "1311a3c391a2b3f3f4487acedb43be984f094e8adbd3e0bba1d9f2554c74899d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-MX/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/es-MX/firefox-91.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "6f2284a3de5653d9e6cfb769162530d9630b45a3fb5ae73bbe5d77b78c4e19a3"; + sha256 = "6a2a590aa416415dfd2a17646d53bb7430ba79d2b882322e1cddf8a8633ee5ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/et/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/et/firefox-91.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "9c6a073b4539082ef1714d6068c26f0182d3358903cc1b1a6c15d5cdb6067c18"; + sha256 = "80ff6ea68418a46059376332a3bb9a476f43a9af2949f50061582bebea8f5635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/eu/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/eu/firefox-91.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "025c94ed2fd16956ae30c98ee1173386c5ac8920cf3ca4e61ebc0a9d6b71222f"; + sha256 = "d3a53a13a88fb8071589e81a620b476396ee8e09815b3287733ab3bfd5fc30d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fa/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/fa/firefox-91.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "3456216eaf2e17f6973e79161815d963be70db4c1a6aed65dd2e378e7611f310"; + sha256 = "ec7144fd10c0c34ee41866a55426d9929f139813a1f238f79b48f3c2753595a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ff/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ff/firefox-91.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e9a8e66a209a135206757082dc0dcc3fbe991fc0f1a10bfc76b7706778d5f433"; + sha256 = "9b03ba831ee43a0a44a658c1788a705727c9f38c5a55ec9524547989a624973a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fi/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/fi/firefox-91.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "6f33d44c0f74b9a29accf07d8205604f4c1c7397f9957fd219b246f31def9c82"; + sha256 = "b3293e17a72b9259e8e124f3bb49f43150c0e44bc987c5e181db91cbe1994a89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fr/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/fr/firefox-91.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "0e78948af1d6a18195904a6e2c9a368459d5578e9727afc0159fb2c88eb659df"; + sha256 = "be60d1bbb97879148d4bda0718ba5b27c6611ff094113e0fe5ac8ec774e5f831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fy-NL/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/fy-NL/firefox-91.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8513f2bd6c2004d1fe778573aaeb029877af01b0d3bb2390584337c8095365a6"; + sha256 = "dda8ec3b7886874d52402e306f3520818298881cfe60f028d257031747cab7eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ga-IE/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ga-IE/firefox-91.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "74978be3cf0672e779f291a4260fb977c155b3769c0654f4b819bbb69849d9ed"; + sha256 = "fdc5645d6896420fa7c4fbd8398dff53a3896ffdfaccf0f3d9a8735e77cb30ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gd/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/gd/firefox-91.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "9593cba33374fda3381798b94d6cfcd41b08a3540cbf845aeebd14e8fff6b2ae"; + sha256 = "741c3e7139eae2ee4825ca7eabc62cfb3c4bbe4bfdaa79632f713344ecbe5b4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/gl/firefox-91.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2072671f052216881cab6323912cf32671dd829c0d2a25a0530026bcf763ff33"; + sha256 = "1cb6980e1ab247fc8f60cca701ade8a6a2185adbd413579d38ce0137d6def58c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gn/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/gn/firefox-91.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "74a3ba6468110a5bf719fa0ed064ed0ceb2cabc9f9182789d3cf8cc7e166548e"; + sha256 = "0d8c4f389cdf4ac429b6bc1de5b872f3e1bdec8aae938603cf0ec6318a967357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gu-IN/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/gu-IN/firefox-91.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e58cafd6d1ebd0d5158683e640e745b993365dac9c3ad118274e5115ca3fa986"; + sha256 = "8bc81a38b954a1a2677942b41c2ea1f8b3daafded0443a88137cdf071e48a4ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/he/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/he/firefox-91.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f2ec967d4e4b9037a46e840ebbcddff8d30ba5284bcc0e9c993807e477004002"; + sha256 = "8772cb5fdab78a1fc713500e03579ec78bca60acd35361a8c073d8155c74be61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hi-IN/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/hi-IN/firefox-91.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "74b7fd465be49622638042bd92ebafb961371e8ba3229c5f51b6e16b3d86c2d6"; + sha256 = "cf93177250cfb1c452f34666816db7d35db312db39bcc09c78bd098e5d76cfab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hr/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/hr/firefox-91.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "8eba7ac66bb1c50537cd684c637ad3bf827cb4d835dea895bef648adbf5ae901"; + sha256 = "163f82311bcf2828055b6290a140dce79dc764a299857d064b727aac379e9de3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hsb/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/hsb/firefox-91.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "04dc064d385a2cc9558ffb293d03a9200046982911c8ffae04fb940ef6348f0a"; + sha256 = "fd1877100bfd2652b34424c8e8555d3d2dd7ef9e37fd3313247a2b44e6fe63db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hu/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/hu/firefox-91.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "fbb823826e6c27b4fc771128ac7e4cabfe25957726ad6926ce6092d92a0ee805"; + sha256 = "26d98047b977923cac28ae2f8134c2c1291a3b39b733b3ef433366a550b85b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hy-AM/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/hy-AM/firefox-91.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "9267181169545acdf9a1c3d34d2a8486b06e470704bacb4d77f608c4a0d7fe89"; + sha256 = "c2c4263d6b5052494412b48023b32c27ce4f155e9e1c4f92ef1f49cb40f5fadf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ia/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ia/firefox-91.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "197a1a6e71f14c4ddbfab5be47d60ec8bae32bef4dcaf6638932dba41bdd0c06"; + sha256 = "4e1cbbda4d6f0db79ea79c01f442f15216deef7cbb65d302d8ca89f21eba8d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/id/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/id/firefox-91.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "4fa565fb93e011f7bca7cf321e342361e4ea3462764bb2b965fd192f4fdc20ff"; + sha256 = "5e783893a5bc0182e376628a39a2c30c35d97e97f4196161269774771c22c1f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/is/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/is/firefox-91.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c6f026a88f5e3e81a5b6998004f122dc3d225decaed161c83145fde0f97ec0b2"; + sha256 = "924003de57aab415942d169300f527b4fb1416c85d84c6940c5f480dbdb2e349"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/it/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/it/firefox-91.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "41da1b7f11386b99ab836b098250d677b1d9804807932e021050d9d5705bb61a"; + sha256 = "f779166a2f93b732cbf12a3877dacc83c57a067d6746919e75134c42a2094c92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ja/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ja/firefox-91.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e6c64a6f8d9d7369c4d768e86195d7ae4943a36ce2a17bc52c64d6d506790b89"; + sha256 = "571c88dab620d3b39a306fc4800fe97b1b5a93fc8c91d5363f387b34313efb70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ka/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ka/firefox-91.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "15af2a3dde8265ef88578f1682ed5874745bbe8afb40cec31933a03618c74eb6"; + sha256 = "947cdd7809a90dc742fff69dfecad91814b7b670d618f7be2958efb0d3b4823e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/kab/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/kab/firefox-91.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0030c8ca365659698af414b325681673ff600642c873b5403abd77019a3b3c97"; + sha256 = "a8815674bb41de86bf4cfcfbae800f1b4f72b7bea75f0fb197f86e49b51283a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/kk/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/kk/firefox-91.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e596da9120269aea24f275f15a04f65e4319e7c19508fe292752af19d8ff1af4"; + sha256 = "11756fdb24cc2627f91b92b62972f5aa17262b04d993c2555e887290388743c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/km/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/km/firefox-91.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "d42dc8a75e3e474da6017c15b699a4b9cdaaa78d1afb8dade7af14f2503ef8d6"; + sha256 = "3282b75df7fb48207fab2d7079066854a95aed9069ef69a6fd57f527f72a70b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/kn/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/kn/firefox-91.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4674bda817818609461aa128f9aad337a25718646a65924545b403985eecbc8a"; + sha256 = "8af46418c39dc85d02749ee2ef42199c90e1d05817bf863df7bf5a102bd9c040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ko/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ko/firefox-91.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f3f95e0d996e4cc1fbd3d1051b34a2f6d436a6672fb417f74ff140dc01943f67"; + sha256 = "466117f4af7f2c5bfde4ae6e50e000f28bc438c5c7230235316a7779379f66c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/lij/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/lij/firefox-91.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "40e470989b0ab746c04c3fa7023c90b0512ef6b580a77b2de8651483e145b1ba"; + sha256 = "0c8901115e01d2aa332e141b3e01d83afe6f38ffba51fa739bb31d1d6a291b40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/lt/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/lt/firefox-91.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fcb0b0eaa5144357809197539100013ab027de6334d093061b8971057e85e694"; + sha256 = "5c37c92c2ee1bd13cd0a3446ce9442898b2a0d384a27247fbd4306ba1eefb300"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/lv/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/lv/firefox-91.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "2aef3f3de461f1c00909dea7bdc00ed1f56d0e4edcb7b2f08581fd06dc6286b8"; + sha256 = "f0fd8eaa7ea7b5b89ff7e8c2ee80cd79d9ad8d00a6e1609e0ec7a7b898cb7dd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/mk/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/mk/firefox-91.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "789fbe69ab269da101585eab463eb7eab50c1fbfbc92fb88116f402966ad3e71"; + sha256 = "4d382a3c88f53c2430a19d09d59482f574ee950f54a7c7e06abc3d2cde1a131b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/mr/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/mr/firefox-91.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "fd4d1e60ed873bbbb522c956e14ac21bb490888f84dbe900dfcfd036bfd84289"; + sha256 = "7af396b0a6c69ceda9689560b36b4f884c44a7909a6b75494ee1f11b54c0e0dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ms/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ms/firefox-91.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "970f5e7f8962c05653228830f53bb55585e7a14bc526f06e09e4fe18c30cf93b"; + sha256 = "d9eb79856c9222ca8ca0c458c38203fa25ecec1dbf480002db5278de87e872bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/my/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/my/firefox-91.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "188813a56ed195452e3dc77760707ac6bb8daf7e8063ae5b3f8dd18597d70452"; + sha256 = "5ce0929aa7b0d12d2ed6e38d72245de0d37fdd3e7e69a618a3301b8bf83c7dfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/nb-NO/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/nb-NO/firefox-91.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "0e1e979c3e33c5b272355238491bd971a68e6b17cd619f14d61814214516553b"; + sha256 = "62d9169d11f6e9812dcdbaf19e38168cb9cdb2b1e6b17e9eac87e7c2e518ecea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ne-NP/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ne-NP/firefox-91.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "b45d52daf7a8fccb52642eea1da34ba5447a9511d6d577530379804ce64b3a68"; + sha256 = "2bab2d066daa1d56e23db20bd65a94a74d8421556eef47fc8c3d5b647ebd196c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/nl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/nl/firefox-91.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "36a5808b6e510a8c9eb4d61e8cdd1a29f43bade3c30876b1c0d882af1a9b4dd1"; + sha256 = "c627406d909e1e69c5bb229d87a9f99bfddd5014c5911089384275701b580af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/nn-NO/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/nn-NO/firefox-91.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "958f51581c99d459f2e82c0abd311d487e444388bbcacae193fbc8d44df0a567"; + sha256 = "2d365f5aeb223248d3c3f4e40618bcba411f64e3b034ec9f9b1a629e7e416037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/oc/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/oc/firefox-91.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "895f42c9024a9e15e2bad2a1eda74eb6d1e928d01766235ca706543eca822b05"; + sha256 = "a246c0a9aefd8803aeb20ccfbb9f8613f9028fb590e349e0b277d314e0ddb1ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pa-IN/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/pa-IN/firefox-91.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "fc24be218f92076761afa833a1374cf2573b1ac3e86bafd1bde8ea720a181c43"; + sha256 = "d28023509c07e7f8792e2efbfa9d38574a52d82bcf178a34fcf93af5fedd0f59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/pl/firefox-91.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "eeac2270945b16aef7d138733fb08576e877347b0a222eb97a0b8f154074af76"; + sha256 = "79a4f0253b27e69abd67a2aba53dc0290e4ad74740f7dc2977230b1761ecce0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pt-BR/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/pt-BR/firefox-91.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6c609946024a8659d84e3b356245db80e08df7a0fdf4745b846537bc164bfbf0"; + sha256 = "9c7f200e5777153be99946ef551341e6ad82f123e1d6ca449b369ffaf7fc1b64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pt-PT/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/pt-PT/firefox-91.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "604f36949f5b7107f4b84e2da7c0125ab67add31a3adf811cd696458127a0d9d"; + sha256 = "f8d035f3d1fe0a7c0ef42a416ee74974ddc088c5f2a9c0b1668952ba84c5aa10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/rm/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/rm/firefox-91.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "52a29404671e2b3132c2d3b27859b414820755b2d60a1043483e26dc33985336"; + sha256 = "600e5dbe6780aa21f2b0738bb2062cf5bbc9b6ccda92512f5d94b4e3410ec15e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ro/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ro/firefox-91.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "60a8c8e6cd54b4093d922dfd3aaeda483d82ec8c23725e8d1a15ec7c21d662dd"; + sha256 = "a9c1e0c650d7502e9130c7bfd96acdac87c7cdad4f63dcf963dec2954f45dfc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ru/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ru/firefox-91.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6e18bb8f1828a832715543be37f5bee235135623256a0af70e40cbc0513a0477"; + sha256 = "56c911b0973e9ffb0d4ad2252dc75602b6474d0f85d2ecacec5c3cb3895bb374"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/si/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sco/firefox-91.0.tar.bz2"; + locale = "sco"; + arch = "linux-x86_64"; + sha256 = "db2b0fefa6089d28a66b5606b7d32535c1c82795c9a45812ca7a606c1fec013e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/si/firefox-91.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f85b0f7c1234a9bad7bf7c242209df03dc17655e9a9b5672df04790433648f24"; + sha256 = "294bc137b4c56d7c65927078bb6adc2f2299d3645749d75b6a66be060f0e6bd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sk/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sk/firefox-91.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1bdbd0877f513c4368de9fc494b4d3eaf47ff28c73cd323a99f6f02e105f6ec0"; + sha256 = "a75cc03d71e7b4de99e0976f82fa7771f41179ed1517812bc3de9bae323bb21f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sl/firefox-91.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "7f581f23d215bd6d5c52518b4711601b3558fd7b0d5ee6e7484453340d9bfbef"; + sha256 = "e4706fc5dcd19aa946f5b3701e4e89b508fffc7c6f89648730f5bc61bacfd894"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/son/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/son/firefox-91.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "47de297dc96c63f1eca6dc37df4dcbb73e5ed1561311c9b60cf2e0eba52e4a9c"; + sha256 = "a4ed3b6fd7d4794406daca865db37e9bd69aa8bae0bbd0925ed53a66a1c31601"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sq/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sq/firefox-91.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "cca2b590997e16daadc8772cd67deff819cb587e2e8bdbcf943c7d5b99a323e2"; + sha256 = "7ea16267ca165b630ccf3615778f29c2a8b85f860c179a87735c79a0d1d2d122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sr/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sr/firefox-91.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d31e8bb274404448473e57021995fd7ae78c2024f146206e415580676656a6ac"; + sha256 = "bb6024f56521965fd6415d9f5da8442e61a611a5f5e68a08c1b447fdc0ca7b47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sv-SE/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/sv-SE/firefox-91.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6bf03f5aef1391708f25a386f05d7b3959bee8390421cefa3b993cd5b9278c3e"; + sha256 = "84bacbac0f236496e20e4de06de07ac13c86ee3b24ca20f9c878c131ca5d89d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/szl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/szl/firefox-91.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2198b1cff87868bd9152f24306d99be63c322dca578d12ede90d5d34c3635a8d"; + sha256 = "a0b13ca6141f650f67b362a8405006abfd46ee967bb51921cbe38a8dc11f03b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ta/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ta/firefox-91.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "5fad9a8a62e6a1a96341842f34011db87ffb30dc7490582c0c4da0d2245e6425"; + sha256 = "35a0d686c5183c7177cfba431716ce8016496d70485464292ec6fa5ff2fb3a50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/te/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/te/firefox-91.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "78010fc0503019b04cb7cc44c500c845e28a90c52db7480264e989fbd5deb389"; + sha256 = "1482d773023a6a0b6a9c42bd076f6fd006e60d747ad4f54e4d55b4754208c5f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/th/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/th/firefox-91.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "221016e5e7e4f4fb53eb570edd825b2d38922fba7c0344a0048525ffbbb2ae02"; + sha256 = "c129a4749f879469d573160e3fcc389fc7c81de38afedf139a16345bc6fa44e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/tl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/tl/firefox-91.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "81ff9417cbdb2c36be61baa2752701d5507cf5214ac0afac822d426e029c8141"; + sha256 = "c98142f0dd0aea08487b29a5aa59563ada4d66c7d79f0e6cec7dded01739c346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/tr/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/tr/firefox-91.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "e3a053ff1b785e52df509a08d66bc5662252c8edf7e476812aca76c2c4ab0b75"; + sha256 = "11ccbbb58e92cae8cbc8a17f4a778d18a311fd8e15dc719a5a1ffb3d9315e853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/trs/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/trs/firefox-91.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d8c246da9885ec4b5f73284f09a6a80b7fe07f1f49da83975811f478526366f6"; + sha256 = "790bdd26f40c7babfffc4acfec00b63a1e6697448895e9adc9031ec20ffc93ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/uk/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/uk/firefox-91.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "0e1024086ade42468ed2f12396a03b87e2698e2490f69cc62c9f76f462d07ffc"; + sha256 = "59810f729ba81e20e1167d075065a4eba5bac092e6b9716c959ca62f1fa52e3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ur/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/ur/firefox-91.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "14376446a9006673e2bc2fd5d947a08b07af2ff50e70cc9dd4e3bff51052a298"; + sha256 = "01ab7a50f5def0b0d8981d12c1a82edb5b29ff5f94433d3b94abb1014943f698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/uz/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/uz/firefox-91.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "15fc45a28194b3fe8f3aaf2a47de64693e8ffe9054e9b7e06ae72018a7c0ee5a"; + sha256 = "177c037b6bd0dbfa11717ee1a0aefe7b2d907d8e32ef2e788f459ce19e3ae5e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/vi/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/vi/firefox-91.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "69d69c341b80ca9b521607b737084297119cff0f66c4606c28bcdb47c67907dc"; + sha256 = "ef73002956f865aaad63c41f4620c6cb8eb420f6b25b65bd0b2398823c6400b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xh/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/xh/firefox-91.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "9714bf46a53920a79844cf25cb7f2be2b33d4c98fc9c862edbb44ecba35c0bee"; + sha256 = "7d3ab2b3a7e21be7d52f1bb88f76f563d5ce6f2c4d83d242308883e596fc254b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/zh-CN/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/zh-CN/firefox-91.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "fd5b352d29c37ef0c750d40b8182da3399a8e52589d325dbd85fdfc2fabb1ed8"; + sha256 = "48ded67925ff82690e75f17386cdf99f9967700a6eadb2b1b9512fb0d1e39a77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/zh-TW/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-x86_64/zh-TW/firefox-91.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "4b79f6db1aae404d23d1dca8ed8745b1132fefe62c2c2a4e64a49aff0cbcb0ab"; + sha256 = "58bb86a951dba4b1680890fcd1baf6fe3ca4f9ccc0bb661bcd84c232ae055f52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ach/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ach/firefox-91.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "73f89b3c521f974f865ce35081ca23aa34288a3c2c97793031edc0c03e999f1d"; + sha256 = "9dc06632248c42c4743fcc6c5c06860435b6c316b2db4587a357699ba15e2676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/af/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/af/firefox-91.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "02c1c8be1c00405a2c2ac66486e01f761c5c6400b2f685f739cc196c130d391d"; + sha256 = "8ee2d5fe82aa9b3ab36e2cd6017cc4a83951c19b60a4e9ca8d1f73a186fb5f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/an/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/an/firefox-91.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "173b9ccad19be6b1b5b48eaa0f5f670ee97cfa28e249d36bd85846c8e52c4c87"; + sha256 = "7b6d9bae3389585e2c7733590b665aef2e96056f507309d860db207c00c7c972"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ar/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ar/firefox-91.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "fcea5e8c3fde2d339556d4f1544d7f5f83a4c72adb129d028dd0eb342d3fc85f"; + sha256 = "44f858443e0778dc195a6bae64b33d93d052d156479d967fd11bff4a28db8cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ast/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ast/firefox-91.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "79c68a84f273543a92796e725530dc8f7097801d1958052576ca5b26b8075c86"; + sha256 = "b9e8d9bc233e4fab3d889a82dce29e8c53bac412e828bab8471b28a8390c17e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/az/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/az/firefox-91.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3aaac6897845e3884fbfca0888b1b2bb08709a4a1934aa5bf1d7a84dedf29377"; + sha256 = "e9e80694c86dbfc21b1b9d001c49a42ee0abb8f961266984f63605497dd2cb11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/be/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/be/firefox-91.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "2bbcdf98b683420da29b8f3b09a6527a8013deefd9ad987d91947b7ac4764dd1"; + sha256 = "3fdbfaff86f74acc9566acb4b5df9c052128025fab15fb4d68933bacf64a3b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/bg/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/bg/firefox-91.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "693d8513e86329c3796713d9a42ecb9d844bdd3935ad377321156af233f2919e"; + sha256 = "becc7d28c6438082355f528867ed56bb812d6256a28d559dac88e8e2096a23db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/bn/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/bn/firefox-91.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "19a2eee6ad520be48b9499bdd0308b15cc022d9767216382d8de3de24c342a46"; + sha256 = "a65aabb5e1184814a1c6a7275039cf163aeacf0f73f80157c34be9cc419a41a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/br/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/br/firefox-91.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "d4901f3ec5ffc0340dee345fdf381b8f38ffe36d0fe934ed2b983b5600d2f6b7"; + sha256 = "05add35005f3c323529d4cccfa2aad2883a5eaf61d87eba756ed88685b8bb2d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/bs/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/bs/firefox-91.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "5a40c41b8ec915b94139f82ac77480c37a2da4595b0f4066f11d33463dff9703"; + sha256 = "8bb57da2a7d59e14fbbbd7c297776e54944e109f007d30fd0efca1cad00deb50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ca-valencia/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ca-valencia/firefox-91.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "831a7712f29ccc118ca8ab9ce3796292f56c0e45596e1f2904ae899661e727a0"; + sha256 = "351b05ed3bb4cfa044fcba00fb36dcbabcc78f7ce0c8a38624b94895b1db43a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ca/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ca/firefox-91.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "eb604650d0b3539c853c1709835edf05c0c60969f0065c8f6c0ed80d41f2a8ec"; + sha256 = "03a71864efa362fbdad5ef7969af2340d59b198404dec6ccd417c380b3b9ee68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/cak/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/cak/firefox-91.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "5fe7fc105f7ae411ffc24df0e2ba8c36cdd2fc1be9077ca261a9c422dae6dfe2"; + sha256 = "44592f26bc020539c7a73e9b2bc6f6ca6c847a44b03ca1f37541ce4c3347d317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/cs/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/cs/firefox-91.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "53c39c90aed6e55b324b8ef8375ab5b8b627788d716d71ff94f33a3706b7a3c9"; + sha256 = "24c900672eb370503598638c824efe999d1aa0fe007729c31d59363b93e803f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/cy/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/cy/firefox-91.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d12f73551705c7ad3afd9898f92d4a20080040542df5ce5fdca27f150491c83d"; + sha256 = "c1c7df2abedf6fc54b4051f782be997b2334be7a1d683c89c2291594bb9b3abc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/da/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/da/firefox-91.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c5016abf9337ac7f48e12e656e1aefaa572cbeed9ed4ca27717724b08c48cbb5"; + sha256 = "004c4c690e0873cd3b83c5e5ab914a58a3753b9b58ff5211a7ace303d6952417"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/de/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/de/firefox-91.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "65a8b0830a07b3d8936cc2f266ced396481dc140433f8092d774ed9b0600bd53"; + sha256 = "dcc9d81a41c98767087e6936b4fe9db40ac1ef5851406aba0c636747c655c38f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/dsb/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/dsb/firefox-91.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "5044dc086c73ff07ee88f1987d15a432931e7ff48c045a05eea8eb1aee5e5f65"; + sha256 = "3bd88e656d10c9f163e96ed2049717021205ffcdc62a15c369775707df94e997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/el/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/el/firefox-91.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "0b4633ce3aabbd590c308e2b110db416fb0d719778c0132231e3ba94235d940f"; + sha256 = "af948701e0e5df6246993efa145d23e60f9e7cfb6188cde70f722a42fe7d89c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-CA/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/en-CA/firefox-91.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "117590c95bd4f372714ea8ea13eea03c7755c5a4442a5a35e01a7ae2900823e8"; + sha256 = "116109ef5e3a10b0f290eff480f107831673cb0b79f74e418ad92027311d4676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-GB/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/en-GB/firefox-91.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "449f0e563b3fcae89e324e0c331c1a1d61ef76a54018fa02ca6a6ca6c16f2910"; + sha256 = "0bc9532f7dc70234ae34b8d8121595782eacc9c28f178bb50ef7fdf16cb7a56a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-US/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/en-US/firefox-91.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "6713930204c699a6b508a1885785f94672116d8ee1df3eaaab3187011b5540e7"; + sha256 = "16264125112e0798570e2d9a996750e6ac6d009fd876987e0f3dd708e6c3ee45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/eo/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/eo/firefox-91.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3754cf70f5a3ec935435c9b8284c1b405870f51fc3224d6c032845d641b3abef"; + sha256 = "937b62708e0b5281a14f933e2d599676bd552d06b428e14a1ce79f4b013999e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-AR/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/es-AR/firefox-91.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "41f8b2cda0b52cd8d810545a240604ecec7132df3c5b2394b6407f038aa8886b"; + sha256 = "e4af8197d74256eb33f67021a4a3a224e5b9fa6140826a74ffed7a3adfe1735a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-CL/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/es-CL/firefox-91.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "8febcdbf610c842c31e57a5e0190eb62e586198710ecfbf4b4075d62a7d5f15a"; + sha256 = "01b1808337c8e14febb6a673364e8fed637c450f6f00800c06af179b24952922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-ES/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/es-ES/firefox-91.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "54e311e0fd76d0239618f90ce05fa8ed9dc956a0f35886ec587e316f566932b2"; + sha256 = "2e6de3d841defda2ef527c6db82197b448dd5d066d32987f8c62a54b309cb953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-MX/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/es-MX/firefox-91.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f57bbcc4176f51aae50ee8fbe5b82e1aed6dca7db6c5bb61b90237a32e93e70d"; + sha256 = "34d6894bda103dfa576b323f1f2fc365557978db64f400a4f98dcaedbd1248bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/et/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/et/firefox-91.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "633581b5f19a8c271e3e3cd524b3ae7757ab9e2339d8546fd1d223b844b020ea"; + sha256 = "f46e4fc634af77c1a5e0f9a50aaa3f833bc0e023902b3fb02eba4e816cd0aa05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/eu/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/eu/firefox-91.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1307bdd3214c6a36cfd860e81a1a948df37843effd21ff53525aeef8abbcd3a5"; + sha256 = "fb7aecb90c1654ef0288a1339d95b3142378e6b254e84cc49398dd0e5d6e776d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fa/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/fa/firefox-91.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "38fe66fdcc8105a00f5d8655585e96e65f9a1bb6c7d261cad8f7992480728627"; + sha256 = "3241e8123ca000b90e08de54eb4acac68744acba60b1f90cbf2dc39c6f0f27ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ff/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ff/firefox-91.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9e7acbee5e5be85c6fd8bbd11773533f73cb5c6395efbe86d19b20e236e16c1e"; + sha256 = "feeede23f94ab3009132d9ba68cc0987fd43a8776eabdcbe82b1aedac75c5d13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fi/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/fi/firefox-91.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "eece28ddbc746a4182a69f75366e6c2bf0f8e11da790b6bbad0dcd7fb63de0fd"; + sha256 = "253e7b236d36418a882e3a02284480b76a28bbf5946c39a128b7439a98a76670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fr/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/fr/firefox-91.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "6bda4541f450ccdeeab51097275e253125078bfd2f7a9454ca8fd44a31a45d6c"; + sha256 = "79afba324b29e3c1e8ddb6a0b1f8fcd352833a18869aa14cf0498fa29a91ef44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fy-NL/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/fy-NL/firefox-91.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "aaab56b445b8cebf325dccd2f809aaa95d30ed9da1834f54b81722ac718e72c1"; + sha256 = "b06223a20e076f45b5ed1025d155dea95580b5c9d7b07493b1450701de861c88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ga-IE/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ga-IE/firefox-91.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2f29abd19a5974d250da1aefdf06986e1b55524610e9bd493e7f94da8e6152fd"; + sha256 = "30c47a2fc30dfc55f1afe0cc31d884c17cb1ecd052839e034898c038398317ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gd/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/gd/firefox-91.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "fa2d7d5d462ebc4b21e4652e9e538bfdc4ff3091428454be67ad52cadc3a50b4"; + sha256 = "28f8328085cc3250893fe0e884b0ff615c794ee2cb4f24b94e165d3741bc6042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/gl/firefox-91.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "9d133d05024307c5ae30f5b737dc25afd3d9038d3d4e198924d836f61b66fd81"; + sha256 = "926069fec9a30185986cbfecd8a9c26915fd1e741e6ea0ffea0f6a20af2ddc99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gn/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/gn/firefox-91.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "edb82865a9aff2b459dcf3f26583f27989a5d9aa7eb35aa86c30d672f464e3c0"; + sha256 = "a8e18f3c9d6873e533cd5ccf5bae9567528b46b82c5e8d6f63bbcfeefdd66337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gu-IN/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/gu-IN/firefox-91.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "db64823b1b4610dc4107062a51567c349600fe9e4072ca18fdea80391d7a8064"; + sha256 = "565c9864f773d9815a5116502c0c6f5662f3b07c2f69a1a9ee3c9148e2535098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/he/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/he/firefox-91.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "98f7d8e0b662b7a020e8aec6a17a171740f4e162cdd2318eacdb2b18d1e84435"; + sha256 = "537998ef23693ffeadc2f15b2a32b8c45473071b859363ba383621bae5b6a92c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hi-IN/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/hi-IN/firefox-91.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "679340528df16854b4366b968f05103dd183a0983393065630d71a963ed59f60"; + sha256 = "4cfb83db79ff8537ff210667f00d88f9155693e0872a4eeb5bfd9eff1ea66248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hr/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/hr/firefox-91.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e95335aa07145e2388a2cd6973a12ce826ea9a0c44e7669a8f0c916b9c897f3a"; + sha256 = "013e10a8b1144242a8bc4d27f3d8218c39982990ffeae323c238bdc65090f2ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hsb/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/hsb/firefox-91.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e6450586d82c4c01a96ba5c7947e92ea7285540dbf57c15398449f33d46c20c2"; + sha256 = "8373057ef102f31d3cb262ab060215718eb4487acbd2275cd311be2b4932b091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hu/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/hu/firefox-91.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "09f33e1cb7595f1f8e7724e6e311f4c2354093839e5bfe9f598c16689d7c53ff"; + sha256 = "4143a2d0e1696ec8fcaaaea9ac345bafa976123196fdddec5e94570db1e6f255"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hy-AM/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/hy-AM/firefox-91.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "fa43f2a212e3b2fb1737057dbaf55eb78cdecf1021b086c5afae67d03abd4dd5"; + sha256 = "097bc98861b1d8396a0753bed6d483cfecc9a4ef63b286d6a150225f7e5a531b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ia/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ia/firefox-91.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ad5384348f5795bf1c14445cd58b957cf320b5202f987a55efe4d51e0437e532"; + sha256 = "ccaafbc46e722de7d32ec09319bdd57c68b8ccc02393b5b0d95838507feb019b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/id/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/id/firefox-91.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "9519624ef818e9baafa3918bc3972f0d176eaa8df640f6258b4425d0366316e6"; + sha256 = "3e9497d12226458d962aa94207697c9694fdb30a2dcd42cdd1411bd83dfbdf64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/is/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/is/firefox-91.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0e425528e760ce2c5fcfe48559a4ac7d14a0cc79c1e95610e491ea14f941acb9"; + sha256 = "80c5fb3f6a96195c6e023f37ec3aaf35ac30d6eb777d3b1c74f4d4898f4bbb52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/it/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/it/firefox-91.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "98a24df84e74a257d2885f78933b23804408c6bfb625b85f5015c0f69b52d338"; + sha256 = "375c5a338adb7acb2c1b192cf0d9e479a954866156f59c264f469a2894f50d39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ja/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ja/firefox-91.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "82830708da718cb70eaabf990b503b9f62a1232ed3ff5537fa91b140e4bd0678"; + sha256 = "ab4298e63dd5625d0f7af12af53e5e78ecf50a5f95ae556c5d55ec49659ee74f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ka/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ka/firefox-91.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bcf43fa1a6cf21139b7672144e6f355367d680395f32961b5915fcb6d4cd9dd5"; + sha256 = "a027603bdc4e5d67224a060b6577e3cc389e476df2af2b098c9d97aac3e694ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/kab/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/kab/firefox-91.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c965383ee64db3f84ae1736db80f772e38b04080fdac9117953d8a59697a2998"; + sha256 = "0b1c986ca661040a9902b875a8a64b83b05dadcbe03bdb0205eecc0886ef0c53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/kk/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/kk/firefox-91.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "26e0becb0c7feaba174ff1de85585364addfdb2dc7e6f5188d81c2a83eb68383"; + sha256 = "6cb3ceda7ba9bfa726909f390ed487904a284b84e2c522a7ea36fdeded22066e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/km/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/km/firefox-91.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "a25e0ddb1ecee69236bef3389641921c906f03272c8bea3a6ee17e61327fd377"; + sha256 = "3b8c0530b4bff8f7b33d0fb70f322f1fc7a75d219bbdd7badb656e6740fdcce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/kn/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/kn/firefox-91.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "4101658f06850402957e08578cec7fc730b9eee24e0e59d0b083e3814f13c713"; + sha256 = "462468372055c64b94df027aa4a9bd2d02f7c82bd4845667d974e6cf1c58f839"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ko/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ko/firefox-91.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c72b19e5928c7f3cb2bf3c681620865c292e02cf88859b13785527598b1b5610"; + sha256 = "68ce96d841fc715897297dc0c4f9b9321e84298a789f9de49066d37cef1e368c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/lij/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/lij/firefox-91.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "9741436304db85da8b2ff9aaf7254c6304cd8703fc612a906cabbb1bbfa6b1be"; + sha256 = "843a9f5e1758344f51276d5dd77c901d85b5d2bc1d183c4390a9d7783e8c82a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/lt/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/lt/firefox-91.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "cc6ad73885caa3780a22a70ef3a2a321d948fee71a0b9f9e6512c724be5e80d4"; + sha256 = "97e3efa010e2fcd07750f808ec533efa858e70a664eab80d9550f0835adbd242"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/lv/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/lv/firefox-91.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6043b8a53d92d3ee9d2eced77e664e15585f38acd2c9bc69ab6c6ddee4e11fa9"; + sha256 = "860b26016d587e24e9e7f308d39041418618564a6029334beed6b56244be7300"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/mk/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/mk/firefox-91.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "f722688ebc78a9c0647f8562a7d333d15a6f0a23be2e41881cd3395ce9af492b"; + sha256 = "3cf4e7e1a7bd6afa365574c5c8a94a64d6621ac2b40ae7c6f078a20f374f9719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/mr/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/mr/firefox-91.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "e375938caf127ff1ef5f71bafb7df48d8d0f7ae7dbb5c664c99530e2401b08ed"; + sha256 = "334c149ee5079259772f102d81fb6fe31ff6d81755ca253da68fb48d6eb0605b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ms/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ms/firefox-91.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "cf927622a682ba18b69134da056c09217950085f14d3abb828b78cc2318e71d0"; + sha256 = "203ab92d93c0b867a01b1e1b41e65dc6beac79a5dcad040442d9c9ab54747df4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/my/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/my/firefox-91.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "dab06f8c4daf9f2287ccfcbf567e830cf2c1154e4a0db403d4c9bb1a5d509c88"; + sha256 = "09f23e56f10c34354bf17cd5f299d54425abb10b3c3ffac13ca70005b9530d32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/nb-NO/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/nb-NO/firefox-91.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "19eaf7c9fedcb79d134304f16c804dd24a1adcddeb48e4f5cd26459556b905e3"; + sha256 = "ea404f454d1a89fafa1591419c942ce9a72b7cdeb4361a0d47c4b8d3842de99f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ne-NP/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ne-NP/firefox-91.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "049f573cc57b4ac37417a8674b6a535643cd563f0806a69f5ce769c67d8bcb79"; + sha256 = "b5a34f466497603b966502af30031a96a33deed13b83c95bdb83ac9b0dfbaf20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/nl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/nl/firefox-91.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "95d99572d07502ca39dfbce3f4f5e046247e1bcbfc8ca14cd1404744a9665731"; + sha256 = "b0767df12075247c2068103bf72adb881fb19ce021615dad7fb6dbbb4f563303"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/nn-NO/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/nn-NO/firefox-91.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "cc7466ce958d97c7ab13235745199631f4cd2c2713ce2d4017c337d5415b3d1b"; + sha256 = "78767f2a1f367bd211760a3d96397a017c8757efe6da3c3d3db1f3d42a65995c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/oc/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/oc/firefox-91.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c24083b7a4d85d97c8b25b34229115558b94db56d3bc95fb510672be6a693f3d"; + sha256 = "ed7db4b9c07e1ca0cc200aa4b110d069e537b91f3e7165b4e573cdd25722e23d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pa-IN/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/pa-IN/firefox-91.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ae4eaebf65657401c2177dcb3085cf1b463d75d47e0863bf8017beaa5bc4bdf8"; + sha256 = "42648d9cbbba903d0b4f0b7c23e729a35a06935cee287e541e6523c051d61d96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/pl/firefox-91.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1f7f4f477fc42a87038555b3375ec84995fee73a0465f7cdf973cc5498f802ca"; + sha256 = "478244c5a95ff65f0961ecd4cc3479f1824316a62a40a743d1c51a94a20ff0bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pt-BR/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/pt-BR/firefox-91.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ca8ff807c9292c5105114ee2093a0e38b33c8ca57db3d21766c5d3d2456efd26"; + sha256 = "5a8dd0db2148fd61d104121883fcb8626b8acc193397bc33c5ff6465379fdc2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pt-PT/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/pt-PT/firefox-91.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f3b17fa92fc078fd4c394bfd5763a1fd5b513696fb20547104286527f833be66"; + sha256 = "7a4d9201dbb8f085ae841e90d1c78af9e4c837454b1b9093b0e0d276457c8d8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/rm/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/rm/firefox-91.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "820bc076e2286052b36349170969a42bc76fa196f75f140985ddd5ddc5b4943a"; + sha256 = "634402368a039fb0d88f3e5dbec9696166207ba8dd5a1d4f1e8f823e9b30d3ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ro/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ro/firefox-91.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "1991ad5ecda302b3c9253239452da490c5fd0ec765c464d95a2a682167402bc1"; + sha256 = "0323eb9385708a8c95f7fce30a00c7f66c42aa49560fee49e26fa5852165cd23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ru/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ru/firefox-91.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "a7f87bdbb023a8daa498befb586fe08015062defc2998433ccc77d6c03ff9807"; + sha256 = "67374f18744a069d1e8ae62ae531eafab600fd6082cc709cb2afd0e7a11f0bc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/si/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sco/firefox-91.0.tar.bz2"; + locale = "sco"; + arch = "linux-i686"; + sha256 = "1ac45172f8d725b3a6dd96553a0d34d4c0869d83acc0c40951a442fac0db8743"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/si/firefox-91.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "7f659c6d46f7499c317bbbfe0f35d0db104c9baf46d9daa1145e7a6ab7dfd86a"; + sha256 = "1b8d65efbc710cb981895c194fdf51902c88b6e4b7bc90a8a900f8d006783f00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sk/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sk/firefox-91.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "40a2ffd2a5270715c40375ccef2ed0287ca97b277c7968636222d288cf282fce"; + sha256 = "da72e14c76bd906f13aec33fb771f944d47cf03c90fcc88a7b4dda5765c62303"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sl/firefox-91.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7614af91d89ec3273836d663becd0e215729fc203f8d384c5f42508fbd6dbf81"; + sha256 = "93f932ce8352aba2dc29bbfd3d4cc68ade4b98194716aa8f00715bb5cc261f78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/son/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/son/firefox-91.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "3225134a36d53ee5fb0f3ca9651ea214f42e74d02ad0efb72cc7090280de1e70"; + sha256 = "e4fd4ea76ad67dd640d4046e3829ffc8d347f4754fd828fc9238b91e1e740b47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sq/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sq/firefox-91.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "f6c06b96cce4971b02ebca69af7dbf8e8b596dc45b57c0ceda4b7fec071d747d"; + sha256 = "6fb7123f665de0d565cfcab0ed76b78672c3b1b7627c6024a8d4126d9adafbac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sr/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sr/firefox-91.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "7ee70f3e386587b4a09bffb2005eda9c2335adb559d05b3e9c72f64c49ea7c0f"; + sha256 = "d3bfbf5ec2d21c658661a601f1be2173415f0e20a433519d9639645b054553ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sv-SE/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/sv-SE/firefox-91.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b735af09cf9a0adee055c4f383852f68f0bf15ac5034287ff56fd4e63d93f851"; + sha256 = "65e423386062c6d43fb3c1008f7a10d44facdfb113f77ed49a11e2922e1c6f97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/szl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/szl/firefox-91.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "9cc37dacd4f13ef6d9af99d24eecf42fc4254b52e42ee4b18c52bf830c9a6b45"; + sha256 = "e072f5a41ba8f987ba49d33345a09a49fa9b8e170ccc6d3b40fac38c44393f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ta/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ta/firefox-91.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "badec8d86c4b824bded63fa9a7d49acab7c79a25b7cdc4715a805d6e825efd04"; + sha256 = "446149c944787c0ef6fd7735a8811d6510b81013e12642d426e5a9e4952576d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/te/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/te/firefox-91.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "68ba99a66bbaddf277fec5f97ca311368e915ff4090121f06daa04847bdc108f"; + sha256 = "6033a318247e51b95d83b345d81825be172a411e47b12f6ab1ad3596a87e559c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/th/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/th/firefox-91.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "d43d2be9347cbe576a9e141110efe1b68d211593bbfaac130f3c2b876718fb9b"; + sha256 = "b3518819c570140b86b3c1941486e7392c0b4fecd99b74bf431fdc3f20568a6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/tl/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/tl/firefox-91.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "8251186670a3e82c6f10d93a3c6ff5563537011aa6c599fd21cefd434342a4b8"; + sha256 = "527f34fe1b0dc17959a6d02dbc08d436938a0c0dc3d8fc2485fd107934293867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/tr/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/tr/firefox-91.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3021d700b183c6748d61c0dd104e732e3e373465ee0ac4607f3e31584fb69389"; + sha256 = "35f131cec53cd86ca34ee39aa8c827483178a49bf4c602923cc97587f10c6f6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/trs/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/trs/firefox-91.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "bff8d09f8170abf515b28c8fe8492f4b5125cd54a50518d145b86e70b15fbadd"; + sha256 = "374436eeb3ec60eb802421cd7aca90b9ddbb9ae986e132c2488474270b4bc349"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/uk/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/uk/firefox-91.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "36310b3c0272c1592560bbcf2801e7358d0b3583f832d522e38e09c926594549"; + sha256 = "7779c3e4e09a5d9ebb4091b59cf699eef0cd758b2da84ba3844a21f74a5a10e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ur/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/ur/firefox-91.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e48d260743ec015816036088f913cdaa9740751854d56c0ad12013c8fe24d5f7"; + sha256 = "9cebe40000b97506e010b3126f7ad9f227933d29abbbcfb2d394d45132e99b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/uz/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/uz/firefox-91.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f4079a9c0a439357e97c4838ef6c4caf8969a21569b2d84b1f0f3f2405981a4b"; + sha256 = "5a79be67283042db3e9906f19bfa2733dee22973559bc8909ab1dff3c2df6f77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/vi/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/vi/firefox-91.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "6e2f66c5fe236080ad9c8e72461667d7ba98260d038deaf6d4abbd73afe72719"; + sha256 = "6bf11408757a4861f776188efc8b6d88df387adf7870d90ff5d9a5e52f08466c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/xh/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/xh/firefox-91.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "7c75f694933e4998496cf4c1895afdc2940aedf9fd2151c2f2946551cbbcf5da"; + sha256 = "39b91255e9f61fc8e86025b05b30a8ff84b18cb696835d113247f15c582fd53e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/zh-CN/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/zh-CN/firefox-91.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "74787fb0d2674a2e34f6cbd556bd13f9ea7d83c640aa7c8cc6fe79b58870dbd0"; + sha256 = "e9454287ed8f73c4829ab764ae7c62d96efce97cdb743b9f2951d010c434d833"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/zh-TW/firefox-90.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/91.0/linux-i686/zh-TW/firefox-91.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "df3493d9cf02a0a3c88bb06b6c755658b7638cc6bfe07df193fa19db870fa991"; + sha256 = "c425ca54f5130d23b1b2dc513d52942e1b5603c803f138a9dcaf3cfed616af76"; } ]; } From 85fe192e579e9ee9cb18179e56a827cec74533ae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 9 Aug 2021 18:00:00 -0500 Subject: [PATCH 190/375] maintainers/scripts/update-ruby-packages: force platform-independent bundler lock Since Bundler 2+, the lock command generated platform-dependent Gemfile.locks, which breaks when nix has to build gems from source, because the gemset generated is tied to the platform which generated it. --- maintainers/scripts/update-ruby-packages | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/update-ruby-packages b/maintainers/scripts/update-ruby-packages index fef6b75ded08..60da1a1b5938 100755 --- a/maintainers/scripts/update-ruby-packages +++ b/maintainers/scripts/update-ruby-packages @@ -6,7 +6,10 @@ set -euf -o pipefail ( cd pkgs/development/ruby-modules/with-packages rm -f gemset.nix Gemfile.lock - bundle lock + # Since bundler 2+, the lock command generates a platform-dependent + # Gemfile.lock, hence causing to bundix to generate a gemset tied to the + # platform from where it was executed. + BUNDLE_FORCE_RUBY_PLATFORM=1 bundle lock bundix mv gemset.nix ../../../top-level/ruby-packages.nix rm -f Gemfile.lock From 50a5bfaaff411a4febfd137e8ca3f766e5ae7258 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 9 Aug 2021 18:01:00 -0500 Subject: [PATCH 191/375] rubyPackages: add github-pages --- .../ruby-modules/with-packages/Gemfile | 1 + pkgs/top-level/ruby-packages.nix | 491 ++++++++++++------ 2 files changed, 337 insertions(+), 155 deletions(-) diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index a3e7f41a2a09..401fa3c66b0f 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -55,6 +55,7 @@ source 'https://rubygems.org' do gem 'fog-dnsimple' gem 'gdk_pixbuf2' gem 'gio2' + gem 'github-pages' gem 'gitlab-markup' gem 'glib2' # gem 'gobject-introspection' fails on require diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index c04c88697d19..39108721a061 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -121,15 +121,14 @@ version = "6.1.4"; }; addressable = { - dependencies = ["public_suffix"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; type = "gem"; }; - version = "2.8.0"; + version = "2.4.0"; }; ast = { groups = ["default"]; @@ -147,10 +146,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08c0mgsmw7xf3hwbnlsdmn3z5z84ldhw7w98n0lkvfizvvjn0mx2"; + sha256 = "05brc25pfvak610mdwgjsc64di29yff9i9g72m6hyc21pdjwfy3n"; type = "gem"; }; - version = "3.4.6"; + version = "3.4.3"; }; atomos = { groups = ["default"]; @@ -239,10 +238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s7dr3jf5a2jg2dd23f97hsd29qj2cfah5rkjvhgb40z3k75vgy3"; + sha256 = "136aa800dgq6bmr0lb59mfj5q72r712wwp5wy5qxnp48adjw1k2h"; type = "gem"; }; - version = "3.4.6"; + version = "3.4.3"; }; camping = { dependencies = ["mab" "rack"]; @@ -255,16 +254,6 @@ }; version = "2.1.532"; }; - certified = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1706p6p0a8adyvd943af2a3093xakvislgffw3v9dvp7j07dyk5a"; - type = "gem"; - }; - version = "1.0.0"; - }; CFPropertyList = { groups = ["default"]; platforms = []; @@ -628,15 +617,36 @@ }; version = "1.1.3"; }; + coffee-script = { + dependencies = ["coffee-script-source" "execjs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + type = "gem"; + }; + version = "2.4.1"; + }; + coffee-script-source = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1907v9q1zcqmmyqzhzych5l7qifgls2rlbnbhy5vzyr7i7yicaz1"; + type = "gem"; + }; + version = "1.12.2"; + }; colorator = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72"; + sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs"; type = "gem"; }; - version = "1.1.0"; + version = "0.1"; }; colored = { groups = ["default"]; @@ -801,17 +811,6 @@ }; version = "0.1.0"; }; - em-websocket = { - dependencies = ["eventmachine" "http_parser.rb"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb"; - type = "gem"; - }; - version = "0.5.2"; - }; erubi = { groups = ["default"]; platforms = []; @@ -863,16 +862,26 @@ }; version = "0.85.0"; }; - faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"]; + execjs = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpq9w46alagszx2mx82mqxxmsmyni2bpxd08gygzpl03zwbpr63"; + sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; type = "gem"; }; - version = "1.5.1"; + version = "2.8.1"; + }; + faraday = { + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r6ik2yvsbx6jj30vck32da2bbvj4m0gf4jhp09vr75i1d6jzfvb"; + type = "gem"; + }; + version = "1.7.0"; }; faraday-em_http = { groups = ["default"]; @@ -944,6 +953,16 @@ }; version = "1.0.0"; }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; ffi = { groups = ["default"]; platforms = []; @@ -1019,16 +1038,6 @@ }; version = "0.3.0"; }; - forwardable-extended = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v"; - type = "gem"; - }; - version = "2.6.0"; - }; fourflusher = { groups = ["default"]; platforms = []; @@ -1055,10 +1064,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mp4dgd7i26xp1n3ggagdc5xh52wm7gsmmq7mykfjm6bqvh0v302"; + sha256 = "0hslcfns2ysvjyj21hjvp4hghrafw1sdl627fm0nj0wsncs94m67"; type = "gem"; }; - version = "3.4.6"; + version = "3.4.3"; + }; + gemoji = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n3r6p1lrcwq2y3fzbj350qai0z8giz8wjhhxall8qkvacrcbb6w"; + type = "gem"; + }; + version = "2.1.0"; }; gio2 = { dependencies = ["gobject-introspection"]; @@ -1066,10 +1085,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gkik2d0c9xfljip17pafkln52wykrjvz9cf25da6hnxp73fvzwb"; + sha256 = "1l30xsr1dgnzqfmln17arnqi8iga97ldf6zgbqrfby6a94v3ammd"; type = "gem"; }; - version = "3.4.6"; + version = "3.4.3"; + }; + github-pages = { + dependencies = ["github-pages-health-check" "jekyll" "jekyll-coffeescript" "jekyll-feed" "jekyll-gist" "jekyll-github-metadata" "jekyll-mentions" "jekyll-paginate" "jekyll-redirect-from" "jekyll-sass-converter" "jekyll-seo-tag" "jekyll-sitemap" "jemoji" "kramdown" "liquid" "listen" "mercenary" "rouge" "terminal-table"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15ngq2x2i4m7dp87lczv7w5xh5qxqnhn898jyaahgl6wgcq8fggc"; + type = "gem"; + }; + version = "87"; + }; + github-pages-health-check = { + dependencies = ["addressable" "net-dns" "octokit" "public_suffix" "typhoeus"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x1ccwi3nfb1s3lv9px6lx3fjbn0s1g1v1cm0jcs2gb2zixgn4nf"; + type = "gem"; + }; + version = "1.1.0"; }; gitlab-markup = { groups = ["default"]; @@ -1087,10 +1128,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0daspjbnw3banifms1xshxzh4v4784zm3fqda1civqczyj62dw1n"; + sha256 = "0l46ymdf7azpd137xq4rarbaq54hxs9rgfry0r6b0ywj74rmw9ih"; type = "gem"; }; - version = "3.4.6"; + version = "3.4.3"; }; globalid = { dependencies = ["activesupport"]; @@ -1098,10 +1139,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; + sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; type = "gem"; }; - version = "0.4.2"; + version = "0.5.2"; }; gobject-introspection = { dependencies = ["glib2"]; @@ -1109,10 +1150,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p2qn9cbdh3fav7x3ygp8jh7cr2yz4pqs6m979k43dj1vk49vb12"; + sha256 = "11gas9hzq36a2bwqi7h5c6p6jihanbhsarwhv5fw53dxap4iwj25"; type = "gem"; }; - version = "3.4.6"; + version = "3.4.3"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1126,14 +1167,15 @@ version = "2.0.20"; }; gtk2 = { + dependencies = ["atk" "gdk_pixbuf2" "pango"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09n8gz5h0d0wwrifr8c8z0b4vrd64xdi4lws8p6gpz0j0pxm5fzh"; + sha256 = "0v1ag6irp52asm0yaxa7s533czy7yzhanhgn1v0cndqpzqk8icfz"; type = "gem"; }; - version = "3.2.6"; + version = "3.4.3"; }; hashie = { groups = ["default"]; @@ -1185,6 +1227,17 @@ }; version = "0.8.6"; }; + html-pipeline = { + dependencies = ["activesupport" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "080sn9z1a64gv04p318jz10y6lv6qd3avip08rrcmq9k4ihai0f1"; + type = "gem"; + }; + version = "2.14.0"; + }; http-accept = { groups = ["default"]; platforms = []; @@ -1206,16 +1259,6 @@ }; version = "1.0.4"; }; - "http_parser.rb" = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; - type = "gem"; - }; - version = "0.6.0"; - }; httpclient = { groups = ["default"]; platforms = []; @@ -1279,26 +1322,122 @@ version = "2.11.2"; }; jekyll = { - dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; + dependencies = ["colorator" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "rouge" "safe_yaml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq"; + sha256 = "1l1kq96bps29sx1cawbn4p9al4cljkywlr02zwgbcdwrr0211rhp"; type = "gem"; }; - version = "4.2.0"; + version = "3.1.6"; + }; + jekyll-coffeescript = { + dependencies = ["coffee-script"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg"; + type = "gem"; + }; + version = "1.0.1"; + }; + jekyll-feed = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jq7048yynabd9c1s171bb0wp1qqkh00n1q15w16fdp4hrvvjmsh"; + type = "gem"; + }; + version = "0.5.1"; + }; + jekyll-gist = { + dependencies = ["octokit"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mjw9y7mqmglckn81ix9x1gqnvbxb28fbz72yhvmm5sdk2l957lr"; + type = "gem"; + }; + version = "1.4.0"; + }; + jekyll-github-metadata = { + dependencies = ["jekyll" "octokit"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0psxsfbic425qhniz0nxfr0qqjdwji06x66jpqxpyn9js0iqh5hj"; + type = "gem"; + }; + version = "2.0.2"; + }; + jekyll-mentions = { + dependencies = ["html-pipeline" "jekyll"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ps50b62gn6dp7ga5wg5x4j1vr9wlw91sqhv9pkmbbv805w5fxbq"; + type = "gem"; + }; + version = "1.1.3"; + }; + jekyll-paginate = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8"; + type = "gem"; + }; + version = "1.1.0"; + }; + jekyll-redirect-from = { + dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s85rsjl7jd783iiwzd3vq84qcmcz86frl7mjhhlipski60x5fjp"; + type = "gem"; + }; + version = "0.11.0"; }; jekyll-sass-converter = { - dependencies = ["sassc"]; + dependencies = ["sass"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04ncr44wrilz26ayqwlg7379yjnkb29mvx4j04i62b7czmdrc9dv"; + sha256 = "1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1"; type = "gem"; }; - version = "2.1.0"; + version = "1.3.0"; + }; + jekyll-seo-tag = { + dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y0szawdxs00qz13plxdfgy9njw40m0jcmg9l3ng2q0b2wnhf3cb"; + type = "gem"; + }; + version = "2.0.0"; + }; + jekyll-sitemap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sg0yzhzja2lw48w5l23l3612pig5c2x4hf883c8bgz0rvr81di1"; + type = "gem"; + }; + version = "0.10.0"; }; jekyll-watch = { dependencies = ["listen"]; @@ -1306,10 +1445,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qd7hy1kl87fl7l0frw5qbn22x7ayfzlv9a5ca1m59g0ym1ysi5w"; + sha256 = "1f0p3jbvp9gafbddkbpk78gb6837d2qdhw97py3svsk3d9vkbcdn"; type = "gem"; }; - version = "2.2.1"; + version = "1.5.1"; + }; + jemoji = { + dependencies = ["gemoji" "html-pipeline" "jekyll"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "090zxsm77ag8phb8c3mhrqcivq1kazs10srqnxc8wjbvcp37qrdi"; + type = "gem"; + }; + version = "0.6.2"; }; jmespath = { groups = ["default"]; @@ -1331,16 +1481,6 @@ }; version = "2.5.1"; }; - json_pure = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "030hmc268wchqsccbjk41hvbyg99krpa72i3q0y3wwqzfh8hi736"; - type = "gem"; - }; - version = "2.5.1"; - }; jwt = { groups = ["default"]; platforms = []; @@ -1352,37 +1492,25 @@ version = "2.2.3"; }; kramdown = { - dependencies = ["rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar"; + sha256 = "05ljwi07hjjwgnjg19sg8mkyxf1an5xn8kn1717d5qrrqkzn3zq1"; type = "gem"; }; - version = "2.3.1"; + version = "1.11.1"; }; - kramdown-parser-gfm = { + kramdown-rfc2629 = { dependencies = ["kramdown"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + sha256 = "1ay4jy434mpcn72l1rx2cj2gp8lv0z8r5skxyzs1r79yljmxkx4b"; type = "gem"; }; - version = "1.1.0"; - }; - kramdown-rfc2629 = { - dependencies = ["certified" "json_pure" "kramdown"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yky836g80jfvyhxn052q9fqrnhn72dsc2j10nirq7qylbq1jl7g"; - type = "gem"; - }; - version = "1.5.5"; + version = "1.0.32"; }; libv8 = { groups = ["default"]; @@ -1409,10 +1537,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by"; + sha256 = "033png37ym4jrjz5bi7zb4ic4yxacwvnllm1xxmrnr4swgyyygc2"; type = "gem"; }; - version = "4.0.3"; + version = "3.0.6"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -1420,10 +1548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh"; + sha256 = "0zv8rdn3nwnmf5iyxv7ync46wjk8z2sxjpda1j9pjc5n2mkdz97b"; type = "gem"; }; - version = "3.6.0"; + version = "3.0.6"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1431,10 +1559,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly"; + sha256 = "0pwik3x5fa92g6hbv4imz3n46nlkzgj69pkgql22ppmcr36knk6m"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.0"; }; mab = { groups = ["default"]; @@ -1489,6 +1617,16 @@ }; version = "0.9.0"; }; + maruku = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r7bxpgnx2hp3g12bjrmdrpv663dfqxsdp0af69kjhxmaxpia56x"; + type = "gem"; + }; + version = "0.7.3"; + }; matrix = { groups = ["default"]; platforms = []; @@ -1504,10 +1642,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f2i827w4lmsizrxixsrv2ssa3gk1b7lmqh8brk8ijmdb551wnmj"; + sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; type = "gem"; }; - version = "0.4.0"; + version = "0.3.6"; }; method_source = { groups = ["default"]; @@ -1565,10 +1703,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; + sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; type = "gem"; }; - version = "2.5.3"; + version = "2.6.1"; }; minitest = { groups = ["default"]; @@ -1681,6 +1819,16 @@ }; version = "1.4.10"; }; + net-dns = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18d97xjphw21naaqfhgxp95ikr1d79rx708b2df3xm01j6isqy1d"; + type = "gem"; + }; + version = "0.9.0"; + }; net-scp = { dependencies = ["net-ssh"]; groups = ["default"]; @@ -1717,10 +1865,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5"; + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; type = "gem"; }; - version = "2.5.7"; + version = "2.5.8"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1728,10 +1876,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; + sha256 = "1iav4jrklvm8938bxhby0khs36mdndhvwia4hc85zxcb0yl1k8ll"; type = "gem"; }; - version = "1.11.7"; + version = "1.12.2"; + }; + octokit = { + dependencies = ["faraday" "sawyer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ak64rb48d8z98nw6q70r6i0i3ivv61iqla40ss5l79491qfnn27"; + type = "gem"; + }; + version = "4.21.0"; }; opus-ruby = { dependencies = ["ffi"]; @@ -1772,10 +1931,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09rkarch6kd20cc9xj9v3yfvs7v2k8bxfzwi8vp56h4rcwmsy7m1"; + sha256 = "05smxn2jank7wqih59lhr30ab8f4qxdsdiiag5v7a0gjgzkmbi7f"; type = "gem"; }; - version = "3.4.6"; + version = "3.4.3"; }; parallel = { groups = ["default"]; @@ -1793,21 +1952,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06ma6w87ph8lnc9z4hi40ynmcdnjv0p8x53x0s3fjkz4q2p6sxh5"; + sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; type = "gem"; }; - version = "3.0.2.0"; - }; - pathutil = { - dependencies = ["forwardable-extended"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4"; - type = "gem"; - }; - version = "0.16.2"; + version = "2.7.2.0"; }; patron = { groups = ["default"]; @@ -1897,10 +2045,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "02rqflr53584j1278hxvhxyrc6hqasv33qiqb7j186ji3s018y5c"; type = "gem"; }; - version = "4.0.6"; + version = "1.5.3"; }; puma = { dependencies = ["nio4r"]; @@ -1908,10 +2056,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj"; + sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x"; type = "gem"; }; - version = "5.3.2"; + version = "5.4.0"; }; racc = { groups = ["default"]; @@ -2097,10 +2245,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "057xp6bkfpmkq0csd1aa0nji1vjsx8pc0c63blcj6scvi9nh1l5k"; + sha256 = "1ig832dp0xmpp6a934nifzaj7wm9lzjxzasw911fagycs8p6m720"; type = "gem"; }; - version = "4.3.1"; + version = "4.4.0"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -2181,10 +2329,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; + sha256 = "13amckbdknnc5491ag28y8pqbyfpbzx5n4rlmadxhd3wkrhp92c8"; type = "gem"; }; - version = "3.26.0"; + version = "1.11.1"; }; rpam2 = { groups = ["default"]; @@ -2256,10 +2404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lk8ppn0a2b94fymlra80sygwn63pxyqy4cj4c3ic2697ll3mihj"; + sha256 = "0phrig25dykgi42z6mf1abllh3ws6sv7awa82hzvvvbjx2xlzd3k"; type = "gem"; }; - version = "1.18.4"; + version = "0.93.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2267,10 +2415,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dbbll8k2xqdfpirzpfl3gi4asplay25mg91510i7qb601xbjpcy"; + sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; type = "gem"; }; - version = "1.8.0"; + version = "1.4.1"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -2278,10 +2426,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sl1l9xwvbxbkla5a64avlmyirc2vsbmvqdqza17dydh8m48pb3h"; + sha256 = "07c3kymvsid9aajwmmwr3n6apxgyjcbzbl2n6r5lpzkyz28jqn15"; type = "gem"; }; - version = "1.11.4"; + version = "1.10.2"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -2396,6 +2544,28 @@ }; version = "1.0.5"; }; + sass = { + dependencies = ["sass-listen"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; + type = "gem"; + }; + version = "3.7.4"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + type = "gem"; + }; + version = "4.0.0"; + }; sassc = { dependencies = ["ffi"]; groups = ["default"]; @@ -2407,6 +2577,17 @@ }; version = "2.4.0"; }; + sawyer = { + dependencies = ["addressable" "faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + type = "gem"; + }; + version = "0.8.2"; + }; scrypt = { dependencies = ["ffi-compiler"]; groups = ["default"]; @@ -2433,10 +2614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qbx9p07jdrnpqvjnq6js9qjwjihsk91c1ndmfap153darp1adw0"; + sha256 = "03pmhj4kc3ga75wy397l57bvd18jxxmrk3qsznjw93b993qgvj3z"; type = "gem"; }; - version = "5.46.0"; + version = "5.47.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -2533,15 +2714,15 @@ version = "1.3.2"; }; solargraph = { - dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i2prnczlg871l3kyqy08z8axsilgv3wm4zw061wjyzqglx7xghg"; + sha256 = "06fby6dpq1jcq30x8ladig4dvz8j2pxd08mkrad3d41jx33zd2hg"; type = "gem"; }; - version = "0.43.0"; + version = "0.39.17"; }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; @@ -2591,10 +2772,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh"; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; type = "gem"; }; - version = "2.0.0"; + version = "1.8.0"; }; thor = { groups = ["default"]; @@ -2653,10 +2834,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; + sha256 = "03x3fxjsnhgayl4s96h0a9975awlvx2v9nmx2ba0cnliglyczdr8"; type = "gem"; }; - version = "1.4.0"; + version = "0.8.0"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -2747,10 +2928,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vcfl87z490xmj4q09davx31r2gzvan95sj90x58wq4ymgrdhf1p"; + sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4"; type = "gem"; }; - version = "1.20.0"; + version = "1.21.0"; }; xctasks = { dependencies = ["nokogiri" "rake"]; From 21f0b451550d7880384899fc118816d8d2815560 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Fri, 6 Aug 2021 00:45:45 -0600 Subject: [PATCH 192/375] isso: added generation of javascript files to build phase this fixes #129277 --- pkgs/servers/isso/default.nix | 25 +- pkgs/servers/isso/node-env.nix | 573 ++++++++++++++++++++++++++++ pkgs/servers/isso/node-packages.nix | 558 +++++++++++++++++++++++++++ pkgs/servers/isso/package.json | 15 + 4 files changed, 1168 insertions(+), 3 deletions(-) create mode 100644 pkgs/servers/isso/node-env.nix create mode 100644 pkgs/servers/isso/node-packages.nix create mode 100644 pkgs/servers/isso/package.json diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 3338f8b2a84d..6550659898e0 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,11 +1,23 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ pkgs, nodejs, lib, python3Packages, fetchFromGitHub }: +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; + nodePackages = import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; + }; + nodeDependencies = (nodePackages.shell.override (old: { + })).nodeDependencies; +in with python3Packages; buildPythonApplication rec { pname = "isso"; version = "0.12.5"; - # no tests on PyPI src = fetchFromGitHub { owner = "posativ"; repo = pname; @@ -25,8 +37,16 @@ with python3Packages; buildPythonApplication rec { nativeBuildInputs = [ cffi + nodejs ]; + preBuild = '' + ln -s ${nodeDependencies}/lib/node_modules ./node_modules + export PATH="${nodeDependencies}/bin:$PATH" + + make js + ''; + checkInputs = [ nose ]; checkPhase = '' @@ -40,4 +60,3 @@ with python3Packages; buildPythonApplication rec { maintainers = with maintainers; [ fgaz ]; }; } - diff --git a/pkgs/servers/isso/node-env.nix b/pkgs/servers/isso/node-env.nix new file mode 100644 index 000000000000..21089c4d5459 --- /dev/null +++ b/pkgs/servers/isso/node-env.nix @@ -0,0 +1,573 @@ +# This file originates from node2nix + +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: + +let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , meta ? {} + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; + in + stdenv.mkDerivation ({ + name = "${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; + } // extraArgs); + + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + in + stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell < Date: Fri, 6 Aug 2021 23:02:28 -0600 Subject: [PATCH 193/375] isso: added a test to verify that the server is able to start and a generated javascript file is available --- nixos/tests/isso.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 nixos/tests/isso.nix diff --git a/nixos/tests/isso.nix b/nixos/tests/isso.nix new file mode 100644 index 000000000000..e9a68dca3714 --- /dev/null +++ b/nixos/tests/isso.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "isso"; + meta = with pkgs.lib.maintainers; { + maintainers = [ asbachb ]; + }; + + machine = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.isso ]; + }; + + testScript = let + issoConfig = pkgs.writeText "minimal-isso.conf" '' + [general] + dbpath = /tmp/isso-comments.db + host = http://localhost + ''; + + port = 8080; + in + '' + machine.succeed("isso -c ${issoConfig} &") + + machine.wait_for_open_port("${toString port}") + + machine.succeed("curl --fail http://localhost:${toString port}/?uri") + machine.succeed("curl --fail http://localhost:${toString port}/js/embed.min.js") + ''; +}) From 86296623c6782af4c4f5600d5812faf337c1db61 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sat, 7 Aug 2021 00:32:06 -0600 Subject: [PATCH 194/375] isso: added NixOS module to configure `isso` in NixOS --- .../from_md/release-notes/rl-2111.section.xml | 42 ++--------- .../manual/release-notes/rl-2111.section.md | 9 +-- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/isso.nix | 69 +++++++++++++++++++ nixos/tests/isso.nix | 18 ++--- 5 files changed, 90 insertions(+), 49 deletions(-) create mode 100644 nixos/modules/services/web-apps/isso.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 16cea58bfb39..535c63dfd3f5 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -164,6 +164,13 @@ services.influxdb2. + + + isso, a + commenting server similar to Disqus. Available as + isso + +
@@ -654,32 +661,6 @@ to use wildcards in the source argument. - - - The openrazer and - openrazer-daemon packages as well as the - hardware.openrazer module now require users - to be members of the openrazer group - instead of plugdev. With this change, users - no longer need be granted the entire set of - plugdev group permissions, which can - include permissions other than those required by - openrazer. This is desirable from a - security point of view. The setting - harware.openrazer.users - can be used to add users to the openrazer - group. - - - - - The yambar package has been split into - yambar and - yambar-wayland, corresponding to the xorg - and wayland backend respectively. Please switch to - yambar-wayland if you are on wayland. - -
@@ -849,15 +830,6 @@ version of zfs. - - - Nginx will use the value of - sslTrustedCertificate if provided for a - virtual host, even if enableACME is set. - This is useful for providers not using the same certificate to - sign OCSP responses and server certificates. - -
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 7e4f50228ef3..b03f2931becf 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -50,6 +50,9 @@ pt-services.clipcat.enable). - [influxdb2](https://github.com/influxdata/influxdb), a Scalable datastore for metrics, events, and real-time analytics. Available as [services.influxdb2](#opt-services.influxdb2.enable). +- [isso](https://posativ.org/isso/), a commenting server similar to Disqus. + Available as [isso](#opt-services.isso.enable) + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 @@ -166,10 +169,6 @@ pt-services.clipcat.enable). - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument. -- The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group. - -- The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. - ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. @@ -215,5 +214,3 @@ pt-services.clipcat.enable). - The [services.syncoid.enable](options.html#opt-services.syncoid.enable) module now properly drops ZFS permissions after usage. Before it delegated permissions to whole pools instead of datasets and didn't clean up after execution. You can manually look this up for your pools by running `zfs allow your-pool-name` and use `zfs unallow syncoid your-pool-name` to clean this up. - Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs. - -- Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c9a124544f83..270e30704063 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -960,6 +960,7 @@ ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ihatemoney + ./services/web-apps/isso.nix ./services/web-apps/jirafeau.nix ./services/web-apps/jitsi-meet.nix ./services/web-apps/keycloak.nix diff --git a/nixos/modules/services/web-apps/isso.nix b/nixos/modules/services/web-apps/isso.nix new file mode 100644 index 000000000000..d05a99a3eedc --- /dev/null +++ b/nixos/modules/services/web-apps/isso.nix @@ -0,0 +1,69 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption types literalExample; + + cfg = config.services.isso; + + settingsFormat = pkgs.formats.ini { }; + configFile = settingsFormat.generate "isso.conf" cfg.settings; +in { + + options = { + services.isso = { + enable = mkEnableOption '' + A commenting server similar to Disqus. + + Note: The application's author suppose to run isso behind a reverse proxy. + The embedded solution offered by NixOS is also only suitable for small installations + below 20 requests per second. + ''; + + settings = mkOption { + description = '' + Configuration for isso. + + See Isso Server Configuration + for supported values. + ''; + + type = types.submodule { + freeformType = settingsFormat.type; + }; + + example = literalExample '' + { + general = { + host = "http://localhost"; + }; + } + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.isso.settings.general.dbpath = lib.mkDefault "/var/lib/isso/comments.db"; + + systemd.services.isso = { + description = "isso, a commenting server similar to Disqus"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "isso"; + Group = "isso"; + + DynamicUser = true; + + StateDirectory = "isso"; + + ExecStart = '' + ${pkgs.isso}/bin/isso -c ${configFile} + ''; + + Restart = "on-failure"; + RestartSec = 1; + }; + }; + }; +} diff --git a/nixos/tests/isso.nix b/nixos/tests/isso.nix index e9a68dca3714..99dc8009ae06 100644 --- a/nixos/tests/isso.nix +++ b/nixos/tests/isso.nix @@ -5,20 +5,22 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; machine = { config, pkgs, ... }: { - environment.systemPackages = [ pkgs.isso ]; + services.isso = { + enable = true; + settings = { + general = { + dbpath = "/var/lib/isso/comments.db"; + host = "http://localhost"; + }; + }; + }; }; testScript = let - issoConfig = pkgs.writeText "minimal-isso.conf" '' - [general] - dbpath = /tmp/isso-comments.db - host = http://localhost - ''; - port = 8080; in '' - machine.succeed("isso -c ${issoConfig} &") + machine.wait_for_unit("isso.service") machine.wait_for_open_port("${toString port}") From 595ef1a2072b30d66c689b3730ebcd3b98606d3f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 00:07:48 +0000 Subject: [PATCH 195/375] ckbcomp: 1.199 -> 1.205 --- pkgs/tools/X11/ckbcomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 471dc80979ab..06f87f0a7ae7 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.199"; + version = "1.205"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0jvnxmqhfmj4aywskr2bk1q5p5fl8s4k4bch89965vcwi9bplalf"; + sha256 = "sha256-agE+Bspw1JL1R1HvNeWW4xr2m0+H83f/9jk6EjQwxWk="; }; buildInputs = [ perl ]; From 97f6138420257935de53bc39f7cf129b80298939 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 Aug 2021 03:48:29 +0300 Subject: [PATCH 196/375] atomicparsley: 20210617.200601.1ac7c08 -> 20210715.151551.e7ad03a and enable tests --- pkgs/tools/video/atomicparsley/default.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 92059699e98b..758fa56db50d 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "atomicparsley"; - version = "20210617.200601.1ac7c08"; + version = "20210715.151551.e7ad03a"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "sha256-IhZe0vM41JhO8H79ZrRx4FRA4zfB6X0daC8QoE5MHmU="; + sha256 = "sha256-77yWwfdEul4uLsUNX1dLwj8K0ilcuBaTVKMyXDvKVx4="; }; nativeBuildInputs = [ cmake ]; @@ -22,6 +22,23 @@ stdenv.mkDerivation rec { runHook postInstall ''; + doCheck = true; + + postPatch = '' + patchShebangs tests/test.sh + ''; + + # copying files so that we dont need to patch the test.sh + checkPhase = '' + ( + cp AtomicParsley ../tests + cd ../tests + mkdir tests + mv *.mp4 tests + ./test.sh + ) + ''; + meta = with lib; { description = "A CLI program for reading, parsing and setting metadata into MPEG-4 files"; homepage = "https://github.com/wez/atomicparsley"; From 2a1cfd7536677028342e19e15a6bbee98244efa5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 00:56:38 +0000 Subject: [PATCH 197/375] cloudflared: 2021.8.1 -> 2021.8.2 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 61e2063f2cb2..c036890aad9a 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.8.1"; + version = "2021.8.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-92Uq7hSqfsiES6dSCw4cotfLJ8TLRRO6QPkwQ8iv124="; + sha256 = "sha256-5PMKVWBOWkUhmCSttbhu7UdS3dLqr0epJpQL1jfS31c="; }; vendorSha256 = null; From 2f59b54e3f1318c4e0a6079baebf621b9b402880 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 10 Aug 2021 01:01:40 +0200 Subject: [PATCH 198/375] betterlockscreen 3.2.0 -> 4.0.0 --- maintainers/maintainer-list.nix | 6 +++ .../screensavers/betterlockscreen/default.nix | 38 +++++++++++++------ .../betterlockscreen/replace-i3lock.patch | 14 ------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 34 insertions(+), 26 deletions(-) delete mode 100644 pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4829cdb792d1..0096d15941d6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9668,6 +9668,12 @@ githubId = 1567527; name = "Sebastian Hyberts"; }; + sebtm = { + email = "mail@sebastian-sellmeier.de"; + github = "sebtm"; + githubId = 17243347; + name = "Sebastian Sellmeier"; + }; sellout = { email = "greg@technomadic.org"; github = "sellout"; diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index facac2717c4c..113c0f5d2e68 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -1,39 +1,55 @@ -{ - lib, stdenv, makeWrapper, fetchFromGitHub, - imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb +{ fetchFromGitHub +, lib +, makeWrapper +, stdenv + +# Dependencies (@see https://github.com/pavanjadhaw/betterlockscreen/blob/master/shell.nix) +, bc +, coreutils +, i3lock-color +, gawk +, gnugrep +, gnused +, imagemagick +, procps +, xdpyinfo +, xrandr +, xset }: stdenv.mkDerivation rec { pname = "betterlockscreen"; - version = "3.2.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "pavanjadhaw"; repo = "betterlockscreen"; - rev = version; - sha256 = "sha256-UOMCTHtw1C+MiJL6AQ+8gqmmbqrs1QTzEi1Ar03PyMs="; + rev = "v${version}"; + sha256 = "1ha1yddrcmbsdljdg3gn7i42csbw8h3zgf4i3mcsmbz8nsvc2wdc"; }; nativeBuildInputs = [ makeWrapper ]; - patches = [ ./replace-i3lock.patch ]; - installPhase = let PATH = lib.makeBinPath - [imagemagick i3lock-color xdpyinfo xrandr bc feh procps xrdb]; + [ bc coreutils i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]; in '' + runHook preInstall + mkdir -p $out/bin cp betterlockscreen $out/bin/betterlockscreen wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${PATH}" + + runHook preInstall ''; meta = with lib; { - description = "A simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed"; + description = "Fast and sweet looking lockscreen for linux systems with effects!"; homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ eyjhb ]; + maintainers = with maintainers; [ eyjhb sebtm ]; }; } diff --git a/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch b/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch deleted file mode 100644 index 439c3561f960..000000000000 --- a/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/betterlockscreen b/betterlockscreen -index 6dd06e0..746d820 100755 ---- a/betterlockscreen -+++ b/betterlockscreen -@@ -87,7 +87,7 @@ prelock() { - lock() { - #$1 image path - -- i3lock \ -+ i3lock-color \ - -c 00000000 \ - -t -i "$1" \ - --timepos='x+110:h-70' \ - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf4e86402b87..4ce31b67c102 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25107,7 +25107,7 @@ with pkgs; i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { - inherit (xorg) xrdb; + inherit (xorg) xdpyinfo xrandr xset; }; multilockscreen = callPackage ../misc/screensavers/multilockscreen { }; From b43389f49d52db6084abf6ad26872e8d93d74fc7 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Sun, 8 Aug 2021 10:59:48 +0000 Subject: [PATCH 199/375] iasl: drop pacakge --- .../virtualization/OVMF/default.nix | 4 +-- .../virtualization/seabios/default.nix | 5 ++- .../virtualization/virtualbox/default.nix | 14 ++------ .../virtualization/xen/generic.nix | 4 +-- pkgs/development/compilers/edk2/default.nix | 1 - pkgs/development/compilers/iasl/default.nix | 33 ------------------- pkgs/os-specific/linux/fwts/default.nix | 6 ++-- pkgs/tools/misc/coreboot-utils/default.nix | 4 +-- pkgs/tools/system/acpica-tools/default.nix | 1 + pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 11 files changed, 15 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/compilers/iasl/default.nix diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index aed59e05a980..d8b6dfc2efaa 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, edk2, util-linux, nasm, iasl +{ stdenv, lib, edk2, util-linux, nasm, acpica-tools , csmSupport ? false, seabios ? null , secureBoot ? false , httpSupport ? false @@ -25,7 +25,7 @@ edk2.mkDerivation projectDscPath { outputs = [ "out" "fd" ]; - buildInputs = [ util-linux nasm iasl ]; + buildInputs = [ util-linux nasm acpica-tools ]; hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index 42e1eaf56d4d..a97c43495703 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, iasl, python3 }: +{ lib, stdenv, fetchurl, acpica-tools, python3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 ]; - buildInputs = [ iasl ]; + buildInputs = [ acpica-tools ]; strictDeps = true; @@ -47,4 +47,3 @@ stdenv.mkDerivation rec { platforms = [ "i686-linux" "x86_64-linux" ]; }; } - diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 31f485768031..c693fa8fdcf1 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook +{ config, stdenv, fetchurl, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 @@ -24,16 +24,6 @@ let # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. version = "6.1.26"; - - iasl' = iasl.overrideAttrs (old: rec { - inherit (old) pname; - version = "20190108"; - src = fetchurl { - url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; - }; - NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE + " -Wno-error=stringop-truncation"; - }); in stdenv.mkDerivation { pname = "virtualbox"; inherit version; @@ -52,7 +42,7 @@ in stdenv.mkDerivation { dontWrapQtApps = true; buildInputs = - [ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL + [ acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsa-lib curl libvpx pam makeself perl libXmu libpng libopus python ] ++ optional javaBindings jdk diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 3d0ff3a6f336..8299304045d0 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -3,7 +3,7 @@ config: # Xen , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib -, iasl, libaio, libiconv, libuuid, ncurses, openssl, perl +, acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl , python2Packages # python2Packages.python , xz, yajl, zlib @@ -71,7 +71,7 @@ stdenv.mkDerivation (rec { cmake which # Xen - bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio + bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio libiconv libuuid ncurses openssl perl python2Packages.python xz yajl zlib # oxenstored diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 9d1abc11af19..1a6685e91411 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -5,7 +5,6 @@ fetchpatch, libuuid, python3, - iasl, bc, clang_9, llvmPackages_9, diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix deleted file mode 100644 index a31e1ff3f6a9..000000000000 --- a/pkgs/development/compilers/iasl/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{lib, stdenv, fetchurl, bison, flex}: - -stdenv.mkDerivation rec { - pname = "iasl"; - version = "20210730"; - - src = fetchurl { - url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1pmm977nyl3bs71ipzcl4dh30qm8x9wm2p2ml0m62rl62kai832a"; - }; - - NIX_CFLAGS_COMPILE = "-O3"; - - buildFlags = [ "iasl" ]; - - nativeBuildInputs = [ bison flex ]; - - installPhase = - '' - runHook preInstall - - install -Dm755 generate/unix/bin*/iasl -t $out/bin - - runHook postInstall - ''; - - meta = { - description = "Intel ACPI Compiler"; - homepage = "http://www.acpica.org/"; - license = lib.licenses.iasl; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index d937d4b75f65..ea42e90a3fe8 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, pcre -, json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: +, json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }: stdenv.mkDerivation rec { pname = "fwts"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ]; + buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ]; postPatch = '' substituteInPlace src/lib/include/fwts_binpaths.h \ --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \ --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ - --replace "/usr/bin/iasl" "${iasl}/bin/iasl" + --replace "/usr/bin/iasl" "${acpica-tools}/bin/iasl" ''; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 95f9c74f5ade..7b47f904a98f 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: +{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }: let version = "4.14"; @@ -91,7 +91,7 @@ let dontBuild = true; installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all"; postFixup = let - binPath = [ coreutils acpica-tools iasl gnugrep gnused file ]; + binPath = [ coreutils acpica-tools gnugrep gnused file ]; in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}"; }; }; diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 2d2033aadef3..b035ae04215d 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { "acpihelp" "acpisrc" "acpixtract" + "iasl" ]; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ec92bfeb5832..e88c6978ad1f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -339,6 +339,7 @@ mapAliases ({ htmlTidy = html-tidy; # added 2014-12-06 hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06 iana_etc = iana-etc; # added 2017-03-08 + iasl = throw "iasl has been removed, use acpica-tools instead"; # added 2021-08-08 icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 idea = jetbrains; # added 2017-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1e8404fc65..94288d3fe638 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5954,8 +5954,6 @@ with pkgs; i2pd = callPackage ../tools/networking/i2pd { }; - iasl = callPackage ../development/compilers/iasl { }; - iannix = libsForQt5.callPackage ../applications/audio/iannix { }; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; From 0db6011c7faf44e9b0259621241a8e638f0c0fde Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Sun, 8 Aug 2021 13:33:43 +0000 Subject: [PATCH 200/375] coreboot-utils: add missing phase hooks Also fix `unclear-gpl`: https://review.coreboot.org/plugins/gitiles/coreboot/+/refs/heads/master#copyright-and-license --- pkgs/tools/misc/coreboot-utils/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 7b47f904a98f..36e82903a7e4 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -6,7 +6,7 @@ let commonMeta = with lib; { description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; - license = licenses.gpl2; + license = with licenses; [ gpl2Only gpl2Plus ]; maintainers = with maintainers; [ petabyteboy felixsinger yuka ]; platforms = platforms.linux; }; @@ -81,7 +81,13 @@ let amdfwtool = generic { pname = "amdfwtool"; meta.description = "Create AMD firmware combination"; - installPhase = "install -Dm755 amdfwtool $out/bin/amdfwtool"; + installPhase = '' + runHook preInstall + + install -Dm755 amdfwtool $out/bin/amdfwtool + + runHook postInstall + ''; }; acpidump-all = generic { pname = "acpidump-all"; @@ -89,7 +95,13 @@ let meta.description = "Walk through all ACPI tables with their addresses"; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; - installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all"; + installPhase = '' + runHook preInstall + + install -Dm755 acpidump-all $out/bin/acpidump-all + + runHook postInstall + ''; postFixup = let binPath = [ coreutils acpica-tools gnugrep gnused file ]; in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}"; From 1d8b058fa08dbdd21d9e61d06996694285569175 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 04:00:28 +0000 Subject: [PATCH 201/375] fetchmail: 6.4.20 -> 6.4.21 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 18ed79c99d64..44bcbd782175 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, openssl }: let - version = "6.4.20"; + version = "6.4.21"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "0xk171sbxcwjh1ibpipryw5sv4sy7jjfvhn5n373j04g5sp428f8"; + sha256 = "sha256-akWcHK/XodqlzRNxQNpgwYyEtWmc2OckmnnDM0LJnR0="; }; buildInputs = [ openssl ]; From e40ceba3fc172b6610eb0da96384636e08a510e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 10 Aug 2021 06:49:34 +0200 Subject: [PATCH 202/375] yt-dlp: init at 2021.07.21 --- pkgs/tools/misc/yt-dlp/default.nix | 62 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ pkgs/top-level/python-packages.nix | 7 ++++ 3 files changed, 73 insertions(+) create mode 100644 pkgs/tools/misc/yt-dlp/default.nix diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix new file mode 100644 index 000000000000..1deaef5eac45 --- /dev/null +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -0,0 +1,62 @@ +{ lib, fetchurl, buildPythonPackage +, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc +, fetchFromGitHub +, websockets, mutagen +, ffmpegSupport ? true +, rtmpSupport ? true +, phantomjsSupport ? false +, hlsEncryptedSupport ? true +, installShellFiles, makeWrapper }: + +buildPythonPackage rec { + pname = "yt-dlp"; + # 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.07.21"; + + src = fetchFromGitHub { + owner = "yt-dlp"; + repo = "yt-dlp"; + rev = version; + sha256 = "ziOW52LJUBe0j7ru8GYgiUCE6YJeBTTjm+H6W8EZjuY="; + }; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + buildInputs = [ zip pandoc ]; + propagatedBuildInputs = [ websockets mutagen ] + ++ lib.optional hlsEncryptedSupport pycryptodome; + + # Ensure these utilities are available in $PATH: + # - ffmpeg: post-processing & transcoding support + # - rtmpdump: download files over RTMP + # - atomicparsley: embedding thumbnails + makeWrapperArgs = let + packagesToBinPath = [ atomicparsley ] + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional rtmpSupport rtmpdump + ++ lib.optional phantomjsSupport phantomjs2; + in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; + + setupPyBuildFlags = [ + "build_lazy_extractors" + ]; + + # Requires network + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/yt-dlp/yt-dlp/"; + description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; + longDescription = '' + yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc. + + youtube-dl is a small, Python-based command-line program + to download videos from YouTube.com and a few more sites. + youtube-dl is released to the public domain, which means + you can modify it, redistribute it or use it however you like. + ''; + license = licenses.publicDomain; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1e8404fc65..c63b2c4f5bbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28660,6 +28660,10 @@ with pkgs; youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; + yt-dlp = with python3Packages; toPythonApplication yt-dlp; + + yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light; + youtube-viewer = perlPackages.WWWYoutubeViewer; ytalk = callPackage ../applications/networking/instant-messengers/ytalk { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee7db9d5d36f..b30dfe4511bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9529,6 +9529,13 @@ in { phantomjsSupport = false; }; + yt-dlp = callPackage ../tools/misc/yt-dlp { }; + + yt-dlp-light = callPackage ../tools/misc/yt-dlp { + ffmpegSupport = false; + phantomjsSupport = false; + }; + youtube-search = callPackage ../development/python-modules/youtube-search { }; youtube-transcript-api = callPackage ../development/python-modules/youtube-transcript-api { }; From 429c5c1b1e593cd62adedde07995d9b97156412c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 05:55:18 +0000 Subject: [PATCH 203/375] disfetch: 2.7 -> 2.9 --- pkgs/tools/misc/disfetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index 25c018a068a6..8ad6ba00c8c4 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "2.7"; + version = "2.9"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "sha256-9VPyH7tJEOKCB95VtoIZJ6pL2hEiKTXrp9C7HBD+oxc="; + sha256 = "sha256-dmDDO1DcDMGWtQtIQncOjSc114tL5QH1Jaq1n4vAe5M="; }; dontBuild = true; From 44b130d392ac6391d801372fc2a8dbf8b655f9db Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sat, 31 Jul 2021 21:36:43 +1000 Subject: [PATCH 204/375] webkitgtk: remove reference to private Apple SDK --- pkgs/development/libraries/webkitgtk/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 72b09fec29d2..8c5a8d6306a2 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -36,7 +36,7 @@ , libidn , libedit , readline -, sdk +, apple_sdk , libGL , libGLU , mesa @@ -167,13 +167,15 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals stdenv.isDarwin [ libedit readline + ] ++ lib.optional (stdenv.isDarwin && !stdenv.isAarch64) ( # Pull a header that contains a definition of proc_pid_rusage(). # (We pick just that one because using the other headers from `sdk` is not - # compatible with our C++ standard library) - (runCommandNoCC "${pname}_headers" {} '' - install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h - '') - ] ++ lib.optionals stdenv.isLinux [ + # compatible with our C++ standard library. This header is already in + # the standard library on aarch64) + runCommandNoCC "${pname}_headers" {} '' + install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h + '' + ) ++ lib.optionals stdenv.isLinux [ bubblewrap libseccomp systemd diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1e8404fc65..d948f5b7fab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19079,7 +19079,7 @@ with pkgs; webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - inherit (darwin.apple_sdk) sdk; + inherit (darwin) apple_sdk; }; websocketpp = callPackage ../development/libraries/websocket++ { }; From 99717c1644e08b9d1da0536870fd989e954b3013 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Tue, 27 Jul 2021 20:56:27 +1000 Subject: [PATCH 205/375] aften: apple silicon support --- pkgs/development/libraries/aften/default.nix | 13 +++++++--- .../libraries/aften/simd-fallback.patch | 25 +++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/aften/simd-fallback.patch diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index 1ae5ffb17ad3..488c5b6e729a 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -8,14 +8,21 @@ stdenv.mkDerivation rec { sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47"; }; + patches = [ + # Add fallback for missing SIMD functions on ARM + # Source https://github.com/Homebrew/homebrew-core/blob/cad412c7fb4b64925f821fcc9ac5f16a2c40f32d/Formula/aften.rb + ./simd-fallback.patch + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DSHARED=ON" ]; - meta = { + meta = with lib; { description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; homepage = "http://aften.sourceforge.net/"; - license = lib.licenses.lgpl2; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + license = licenses.lgpl21Only; + platforms = platforms.unix; + maintainers = with maintainers; [ angustrau ]; }; } diff --git a/pkgs/development/libraries/aften/simd-fallback.patch b/pkgs/development/libraries/aften/simd-fallback.patch new file mode 100644 index 000000000000..cdc961a7f5df --- /dev/null +++ b/pkgs/development/libraries/aften/simd-fallback.patch @@ -0,0 +1,25 @@ +From dca9c03930d669233258c114e914a01f7c0aeb05 Mon Sep 17 00:00:00 2001 +From: jbr79 +Date: Wed, 24 Sep 2008 22:02:59 +0000 +Subject: [PATCH] add fallback function for apply_simd_restrictions() on + non-x86/ppc + +git-svn-id: https://aften.svn.sourceforge.net/svnroot/aften@766 ef0d8562-5c19-0410-972e-841db63a069c +--- + libaften/cpu_caps.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libaften/cpu_caps.h b/libaften/cpu_caps.h +index b7c6159..4db11f7 100644 +--- a/libaften/cpu_caps.h ++++ b/libaften/cpu_caps.h +@@ -26,6 +26,7 @@ + #include "ppc_cpu_caps.h" + #else + static inline void cpu_caps_detect(void){} ++static inline void apply_simd_restrictions(AftenSimdInstructions *simd_instructions){} + #endif + + #endif /* CPU_CAPS_H */ +-- +2.24.3 (Apple Git-128) \ No newline at end of file From cd9ed036d6d744de8c6ce6879a591286d730e9bc Mon Sep 17 00:00:00 2001 From: oxalica Date: Sun, 8 Aug 2021 02:19:19 +0800 Subject: [PATCH 206/375] vscode-extensions.matklad.rust-analyzer: use extension version and apply patches --- .../node-packages/node-packages.nix | 2 +- .../tools/rust/rust-analyzer/update.sh | 24 ++++++++++++++----- .../rust-analyzer/build-deps/package.json | 2 +- .../rust-analyzer/default.nix | 23 +++++++++++++----- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 35bb2db3f10f..b344fdc4c5f0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -111001,7 +111001,7 @@ in "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.4.0-dev"; + version = "0.2.694"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index 893477735f53..91bde976ebdb 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix-prefetch +#!nix-shell -i bash -p curl jq nix-prefetch libarchive set -euo pipefail cd "$(dirname "$0")" owner=rust-analyzer @@ -46,19 +46,31 @@ sed "s#cargoSha256 = \".*\"#cargoSha256 = \"$cargo_sha256\"#" \ # Update vscode extension +extension_ver=$(curl "https://github.com/rust-analyzer/rust-analyzer/releases/download/$ver/rust-analyzer.vsix" -L | + bsdtar -xf - --to-stdout extension/package.json | # Use bsdtar to extract vsix(zip). + jq --raw-output '.version') +echo "Extension version: $extension_ver" + build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps" # We need devDependencies to build vsix. -jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \ +jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \ + --arg ver "$extension_ver" \ >"$build_deps/package.json.new" # FIXME: rollup@2.55.0 breaks the build: https://github.com/rollup/rollup/issues/4195 sed 's/"rollup": ".*"/"rollup": "=2.51.1"/' --in-place "$build_deps/package.json.new" -if cmp --quiet "$build_deps"/package.json{.new,}; then - echo "package.json not changed, skip updating nodePackages" - rm "$build_deps"/package.json.new +old_deps="$(jq '.dependencies' "$build_deps"/package.json)" +new_deps="$(jq '.dependencies' "$build_deps"/package.json.new)" +if [[ "$old_deps" == "$new_deps" ]]; then + echo "package.json dependencies not changed, do simple version change" + + sed -E '/^ "rust-analyzer-build-deps/,+3 s/version = ".*"/version = "'"$extension_ver"'"/' \ + --in-place ../../../node-packages/node-packages.nix + mv "$build_deps"/package.json{.new,} + else - echo "package.json changed, updating nodePackages" + echo "package.json dependencies changed, updating nodePackages" mv "$build_deps"/package.json{.new,} pushd "../../../node-packages" diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index 89fc84022f60..a2b804d69d01 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "rust-analyzer", - "version": "0.4.0-dev", + "version": "0.2.694", "dependencies": { "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.1", diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 143a74fe82dc..479f9f4c6ea9 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -12,9 +12,6 @@ let pname = "rust-analyzer"; publisher = "matklad"; - # Follow the unstable version of rust-analyzer, since the extension is not stable yet. - inherit (rust-analyzer) version; - build-deps = nodePackages."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps"; # FIXME: Making a new derivation to link `node_modules` and run `npm run package` # will cause a build failure. @@ -22,13 +19,27 @@ let src = "${rust-analyzer.src}/editors/code"; outputs = [ "vsix" "out" ]; + releaseTag = rust-analyzer.version; + + nativeBuildInputs = [ jq moreutils ]; + + # Follows https://github.com/rust-analyzer/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 postInstall = '' - npm run package - mkdir $vsix - cp ${pname}.vsix $vsix/${pname}.zip + jq ' + .version = $ENV.version | + .releaseTag = $ENV.releaseTag | + .enableProposedApi = false | + walk(del(.["$generated-start"]?) | del(.["$generated-end"]?)) + ' package.json | sponge package.json + + mkdir -p $vsix + npx vsce package -o $vsix/${pname}.zip ''; }; + # Use the plugin version as in vscode marketplace, updated by update script. + inherit (vsix) version; + in vscode-utils.buildVscodeExtension { inherit version vsix; From ce81702e84a7aa1bcf6eda7d02f00c27062822bf Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 10 Aug 2021 04:02:25 +0800 Subject: [PATCH 207/375] rust-analyzer: 2021-08-02 -> 2021-08-09 --- pkgs/development/node-packages/node-packages.nix | 2 +- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- .../vscode-extensions/rust-analyzer/build-deps/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b344fdc4c5f0..38e65ad8159f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -111001,7 +111001,7 @@ in "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.2.694"; + version = "0.2.702"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 25b6ff680416..915dad400b4c 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-08-02"; - cargoSha256 = "10mdkqf6fqbzx49gwc283ms56yvrcdlvyk4y98jf33b8g5jmr8j5"; + version = "2021-08-09"; + cargoSha256 = "sha256-r01riAztIlwxRjvqQXofmqv5875nqQ0Qb9KALvKy4u8="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "1nh1naaqc6f40raz31a0vwypaxm5drzdl2bwjfqx2gydy6051gcl"; + sha256 = "sha256-l9F/cznYHxBdnb3NerIXzOMrzRnxdka0vExzUtKkBfw="; }; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index a2b804d69d01..1e69d9e81bae 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "rust-analyzer", - "version": "0.2.694", + "version": "0.2.702", "dependencies": { "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.1", From 40e9580ce4ee9c39814c1795e8857e15a1619f59 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 07:25:16 +0000 Subject: [PATCH 208/375] s3fs: 1.89 -> 1.90 --- pkgs/tools/filesystems/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 95b5b6ab34aa..e0755a1eead0 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s3fs-fuse"; - version = "1.89"; + version = "1.90"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "sha256-Agb0tq7B98Ioe0G/XEZCYcFQKnMuYXX9x0yg4Gvu3/k="; + sha256 = "sha256-tcoINdkPfIdO0VMQ5tdpKcslpvvgVhaJiDFnS/ix0sc="; }; buildInputs = [ curl openssl libxml2 fuse ]; From dfe3b739c72b934f2be4ed78f191f6fda717f4cc Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 9 Aug 2021 21:59:56 +0200 Subject: [PATCH 209/375] zeroad: make sure hydra builds zeroad-unwrapped Hydra hasn't built zeroad since the 0.0.24 bump: https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.zeroad.x86_64-linux/all This is due to the data package becoming larger than the output limit. Even though the data package is already marked with `hydraPlatforms = [];`, hydra still tried to build it, since it is a dependency of `zeroad`. This makes it so `zeroad` isn't built by hydra either. Only `zeroad-unwrapped` (which takes significant compilation time) will be built by hydra. --- pkgs/games/0ad/wrapper.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/games/0ad/wrapper.nix index ede151307d55..3511dc0bed49 100644 --- a/pkgs/games/0ad/wrapper.nix +++ b/pkgs/games/0ad/wrapper.nix @@ -4,7 +4,6 @@ assert zeroad-unwrapped.version == zeroad-data.version; buildEnv { name = "zeroad-${zeroad-unwrapped.version}"; - inherit (zeroad-unwrapped) meta; nativeBuildInputs = [ makeWrapper ]; @@ -18,4 +17,8 @@ buildEnv { --set ZEROAD_ROOTDIR "$out/share/0ad" done ''; + + meta = zeroad-unwrapped.meta // { + hydraPlatforms = []; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf4e86402b87..f0b90b818ec4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30009,9 +30009,9 @@ with pkgs; keen4 = callPackage ../games/keen4 { }; - zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { + zeroadPackages = callPackage ../games/0ad { wxGTK = wxGTK31; - }); + }; zeroad = zeroadPackages.zeroad; From f9ec4117cc20f4e42e3f1a4ab519d13d32cbac3d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 07:37:40 +0000 Subject: [PATCH 210/375] geekbench: 5.4.0 -> 5.4.1 --- pkgs/tools/misc/geekbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index b5d884dbace4..5ccdf2e2feba 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "sha256-/FhOZ6WCaQQOzsLH3iZTnwzmwUcdsskgASJFZupSIY0="; + sha256 = "sha256-0Pg9bHQwWElW4B3oRco5F2FsaEeLC0ZXx7J+hl7dc3Y="; }; dontConfigure = true; From 3eef0b8df144804540304daf7997c60af6d5dec7 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Tue, 10 Aug 2021 10:00:34 +0200 Subject: [PATCH 211/375] zx: expose in top-level --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f904aff1f63..056dc60fc4f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28729,6 +28729,8 @@ with pkgs; zsteg = callPackage ../tools/security/zsteg { }; + inherit (nodePackages) zx; + zynaddsubfx = zyn-fusion; zynaddsubfx-fltk = callPackage ../applications/audio/zynaddsubfx { From 70b69cdcc20c4c38433086cc66a05712a7d4c265 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Tue, 10 Aug 2021 10:06:30 +0200 Subject: [PATCH 212/375] operator-sdk: 1.5.0 -> 1.10.0 (#133238) Co-authored-by: Sandro --- pkgs/development/tools/operator-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 0df831b579e1..2818b75ede58 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.5.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-95fTfUKoknGBIoc/ALd5w9X89Tl9DBxapl9EgWENsa0="; + sha256 = "1qvwk2gyawa3ihi5zqynrimxf426x22kplr3gdb91m9bx9dwqs3v"; }; - vendorSha256 = "sha256-Sp0ml5tnsbnuyk3NkA80dmFj6IOiL/NeYYbEbr7EPRY="; + vendorSha256 = "1chfiqxljpq6rad4fnqf3dcri63qr9vb765kphw98ly4s0mwm1aj"; doCheck = false; From b2bdf29ced21b0f2c339cf2c073614bb8699bb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Aug 2021 11:28:34 +0200 Subject: [PATCH 213/375] ecwolf: cleanup, format --- pkgs/games/ecwolf/default.nix | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index b7bb382db835..251b51df43a8 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -1,14 +1,5 @@ -{stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2}: +{ stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2 }: -let - desktopItem = makeDesktopItem { - name = "ecwolf"; - exec = "ecwolf"; - comment = "Enhanced Wolfenstein 3D port"; - desktopName = "Wolfenstein 3D"; - categories = "Game;"; - }; -in stdenv.mkDerivation rec { pname = "ecwolf"; version = "1.3.3"; @@ -18,10 +9,18 @@ stdenv.mkDerivation rec { sha256 = "1sbdv672dz47la5a5qwmdi1v258k9kc5dkx7cdj2b6gk8nbm2srl"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib bzip2 libjpeg SDL SDL_mixer gtk2 copyDesktopItems ]; + nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]; + buildInputs = [ zlib bzip2 libjpeg SDL SDL_mixer gtk2 ]; - desktopItems = [ desktopItem ]; + desktopItems = [ + (makeDesktopItem { + name = "ecwolf"; + exec = "ecwolf"; + comment = "Enhanced Wolfenstein 3D port"; + desktopName = "Wolfenstein 3D"; + categories = "Game;"; + }) + ]; # Change the location where the ecwolf executable looks for the ecwolf.pk3 # file. @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h '' # Disable app bundle creation on Darwin. It fails, and it is not needed to run it from the Nix store - + lib.optionalString (stdenv.isDarwin) '' + + lib.optionalString stdenv.isDarwin '' sed -i -e "s|include(\''${CMAKE_CURRENT_SOURCE_DIR}/macosx/install.txt)||" src/CMakeLists.txt ''; From e566af7f40d37fe1f34d695916fd8df7b3ec8283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Aug 2021 11:29:36 +0200 Subject: [PATCH 214/375] bisq-desktop: format, cleanup, use hooks instead of manually calling copyDesktopItems --- .../blockchains/bisq-desktop/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index ffc19765d4f6..715de18a8fa3 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -13,6 +13,7 @@ , tor , psmisc }: + let bisq-launcher = writeScript "bisq-launcher" '' #! ${bash}/bin/bash @@ -46,15 +47,16 @@ let ''; in stdenv.mkDerivation rec { - version = "1.7.0"; pname = "bisq-desktop"; - nativeBuildInputs = [ makeWrapper copyDesktopItems dpkg ]; + version = "1.7.0"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; sha256 = "0crry5k7crmrqn14wxiyrnhk09ac8a9ksqrwwky7jsnyah0bx5k4"; }; + nativeBuildInputs = [ makeWrapper copyDesktopItems dpkg ]; + desktopItems = [ (makeDesktopItem { name = "Bisq"; @@ -71,6 +73,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/lib $out/bin cp opt/bisq/lib/app/desktop-${version}-all.jar $out/lib @@ -80,13 +84,13 @@ stdenv.mkDerivation rec { makeWrapper ${bisq-launcher} $out/bin/bisq-desktop \ --prefix PATH : $out/bin - copyDesktopItems - for n in 16 24 32 48 64 96 128 256; do size=$n"x"$n ${imagemagick}/bin/convert opt/bisq/lib/Bisq.png -resize $size bisq.png install -Dm644 -t $out/share/icons/hicolor/$size/apps bisq.png done; + + runHook postInstall ''; meta = with lib; { From 97cf8539801f9d65b96516f29f22aa3bd6cf9e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Aug 2021 11:32:44 +0200 Subject: [PATCH 215/375] wxsqlite3: format, cleanup --- pkgs/development/libraries/wxsqlite3/default.nix | 12 ++++++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 5fdac25eb97f..d1f6903961b7 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -1,9 +1,13 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook , wxGTK , sqlite -, darwin +, Cocoa +, setfile +, rez +, derez }: stdenv.mkDerivation rec { @@ -20,13 +24,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ wxGTK sqlite ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa setfile rez derez ]; meta = with lib; { homepage = "https://utelle.github.io/wxsqlite3/"; description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; - license = [ licenses.lgpl3Plus licenses.gpl3Plus ]; + license = with licenses; [ lgpl3Plus gpl3Plus ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36e092e7fc6f..4c335cb4f40a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32309,6 +32309,8 @@ with pkgs; wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { wxGTK = wxGTK30; + inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.stubs) setfile rez derez; }; wxsqliteplus = callPackage ../development/libraries/wxsqliteplus { From f502c006402af32f63244f48b47f1016aa8cb66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Aug 2021 11:32:56 +0200 Subject: [PATCH 216/375] top-level: format --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c335cb4f40a..3c2962b3c673 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32378,8 +32378,7 @@ with pkgs; xzoom = callPackage ../tools/X11/xzoom {}; yabai = callPackage ../os-specific/darwin/yabai { - inherit (darwin.apple_sdk.frameworks) - Carbon Cocoa ScriptingBridge; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge; }; yabause = libsForQt5.callPackage ../misc/emulators/yabause { From 4a698c6580ae5284311472968b38376a8e503e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Aug 2021 11:42:21 +0200 Subject: [PATCH 217/375] backends: format --- .../libraries/phonon/backends/vlc.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 10ed6aceba2e..8ff0f3bb4917 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -3,19 +3,10 @@ , debug ? false }: -with lib; - stdenv.mkDerivation rec { pname = "phonon-backend-vlc"; version = "0.11.2"; - meta = with lib; { - homepage = "https://phonon.kde.org/"; - description = "GStreamer backend for Phonon"; - platforms = platforms.linux; - license = with licenses; [ bsd3 lgpl2Plus ]; - }; - src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "sha256-xsM7/GjRN/DlegKeS3mMu5D1Svb3Ma9JZ3hXeRzNU6U="; @@ -40,4 +31,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; + + meta = with lib; { + homepage = "https://phonon.kde.org/"; + description = "GStreamer backend for Phonon"; + platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl2Plus ]; + }; } From b1655a0c1c292e36c5c8f89502b90b6940dc97fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Aug 2021 10:16:48 +0200 Subject: [PATCH 218/375] knot-dns: 3.1.0 -> 3.1.1 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.1.1 --- pkgs/servers/dns/knot-dns/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 34032aa3597e..4adb649e0868 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed"; + sha256 = "75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c"; }; outputs = [ "bin" "out" "dev" ]; @@ -27,12 +27,6 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; - # Disable knotd journal tests on platforms that don't use 4k sysconf(_SC_PAGESIZE). - # The journal most likely works fine, but some of the tests currently don't. - postPatch = lib.optionalString (doCheck && stdenv.isDarwin && stdenv.isAarch64) '' - sed '/^\tknot\/test_journal\>/d' -i tests/Makefile.am - ''; - nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls liburcu libidn2 libunistring From e61bbf2eb03c3e5aa99d5a0fd2c40575206780c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Aug 2021 11:45:41 +0200 Subject: [PATCH 219/375] scala-runners: remove unused input --- pkgs/development/compilers/scala-runners/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala-runners/default.nix b/pkgs/development/compilers/scala-runners/default.nix index d41ae17211e2..0f0de015af5f 100644 --- a/pkgs/development/compilers/scala-runners/default.nix +++ b/pkgs/development/compilers/scala-runners/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, jre, coursier }: +{ stdenv, lib, fetchFromGitHub, coursier }: stdenv.mkDerivation rec { pname = "scala-runners"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c2962b3c673..1354d819460b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12299,7 +12299,6 @@ with pkgs; scala = scala_2_13; scala-runners = callPackage ../development/compilers/scala-runners/default.nix { coursier = coursier.override { jre = jdk8; }; - jre = jdk8; }; metal = callPackage ../development/libraries/metal { }; From 483c89cf590c1c4aa1d2ceb37c675dfbe1ce9c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Aug 2021 11:52:45 +0200 Subject: [PATCH 220/375] tailscale: format --- pkgs/servers/tailscale/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index d22d358d4480..f6f60771921f 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -26,13 +26,9 @@ buildGoModule rec { ldflags = [ "-X tailscale.com/version.Long=${version}" "-X tailscale.com/version.Short=${version}" ]; postInstall = '' - wrapProgram $out/bin/tailscaled --prefix PATH : ${ - lib.makeBinPath [ iproute2 iptables ] - } + wrapProgram $out/bin/tailscaled --prefix PATH : ${lib.makeBinPath [ iproute2 iptables ]} + wrapProgram $out/bin/tailscale --suffix PATH : ${lib.makeBinPath [ procps ]} - wrapProgram $out/bin/tailscale --suffix PATH : ${ - lib.makeBinPath [ procps ] - } sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service ''; From 047fea53925c50138f40c815afb51b5ab90dcb7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Aug 2021 11:56:04 +0200 Subject: [PATCH 221/375] ecl: format, cleanup --- pkgs/development/compilers/ecl/16.1.2.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index 7736b71e56ed..2742c2b8c07e 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -7,15 +7,13 @@ , useBoehmgc ? true, boehmgc }: -assert useBoehmgc -> boehmgc != null; - let s = # Generated upstream information rec { baseName="ecl"; version="16.1.2"; name="${baseName}-${version}"; - url="https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.2.tgz"; + url="https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz"; sha256="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d"; }; buildInputs = [ @@ -42,10 +40,7 @@ stdenv.mkDerivation { "--with-gmp-libdir=${lib.getLib gmp}/lib" # -incdir, -libdir doesn't seem to be supported for libffi "--with-libffi-prefix=${lib.getDev libffi}" - ] - ++ - (lib.optional (! noUnicode) - "--enable-unicode") + ] ++ lib.optional (! noUnicode) "--enable-unicode" ; patches = [ @@ -91,11 +86,11 @@ stdenv.mkDerivation { --prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib libffi}/lib" ''; - meta = { + meta = with lib; { inherit (s) version; description = "Lisp implementation aiming to be small, fast and easy to embed"; - license = lib.licenses.mit ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; + license = licenses.mit ; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; }; } From 19be7f9c3e61088307825410d8f90afaa7875ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Aug 2021 11:56:58 +0200 Subject: [PATCH 222/375] sanoid: format --- pkgs/tools/backup/sanoid/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/sanoid/default.nix b/pkgs/tools/backup/sanoid/default.nix index 5c61763f258d..d2b37615e903 100644 --- a/pkgs/tools/backup/sanoid/default.nix +++ b/pkgs/tools/backup/sanoid/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchFromGitHub, nixosTests, makeWrapper, zfs , perlPackages, procps, which, openssh, mbuffer, pv, lzop, gzip, pigz }: -with lib; - stdenv.mkDerivation rec { pname = "sanoid"; version = "2.1.0"; @@ -33,22 +31,22 @@ stdenv.mkDerivation rec { # incompatibilities with the ZFS kernel module. wrapProgram "$out/bin/sanoid" \ --prefix PERL5LIB : "$PERL5LIB" \ - --prefix PATH : "${makeBinPath [ procps "/run/booted-system/sw" zfs ]}" + --prefix PATH : "${lib.makeBinPath [ procps "/run/booted-system/sw" zfs ]}" install -m755 syncoid "$out/bin/syncoid" wrapProgram "$out/bin/syncoid" \ --prefix PERL5LIB : "$PERL5LIB" \ - --prefix PATH : "${makeBinPath [ openssh procps which pv mbuffer lzop gzip pigz "/run/booted-system/sw" zfs ]}" + --prefix PATH : "${lib.makeBinPath [ openssh procps which pv mbuffer lzop gzip pigz "/run/booted-system/sw" zfs ]}" install -m755 findoid "$out/bin/findoid" wrapProgram "$out/bin/findoid" \ --prefix PERL5LIB : "$PERL5LIB" \ - --prefix PATH : "${makeBinPath [ "/run/booted-system/sw" zfs ]}" + --prefix PATH : "${lib.makeBinPath [ "/run/booted-system/sw" zfs ]}" runHook postInstall ''; - meta = { + meta = with lib; { description = "A policy-driven snapshot management tool for ZFS filesystems"; homepage = "https://github.com/jimsalterjrs/sanoid"; license = licenses.gpl3Plus; From daa36171c0a740e72a46b867ba4633f8ede92a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 10:20:32 +0200 Subject: [PATCH 223/375] paraview: cleanup, format --- pkgs/applications/graphics/paraview/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 64072b83654e..1a761de6ec08 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -7,21 +7,20 @@ let version = "5.9.1"; - major = "5.9"; docFiles = [ (fetchurl { - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${major}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; + url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; name = "Tutorial.pdf"; sha256 = "1knpirjbz3rv8p8n03p39vv8vi5imvxakjsssqgly09g0cnsikkw"; }) (fetchurl { - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${major}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; + url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; name = "GettingStarted.pdf"; sha256 = "14xhlvg7s7d5amqf4qfyamx2a6b66zf4cmlfm3s7iw3jq01x1lx6"; }) (fetchurl { - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${major}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; + url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; name = "CatalystGuide.pdf"; sha256 = "133vcfrbg2nh15igl51ns6gnfn1is20vq6j0rg37wha697pmcr4a"; }) @@ -79,7 +78,8 @@ in mkDerivation rec { ]; buildInputs = [ - libGLU libGL + libGLU + libGL libXt mpi tbb @@ -93,7 +93,7 @@ in mkDerivation rec { qtsvg ]; - postInstall = let docDir = "$out/share/paraview-${major}/doc"; in + postInstall = let docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; in lib.optionalString withDocs '' mkdir -p ${docDir}; for docFile in ${lib.concatStringsSep " " docFiles}; do @@ -112,5 +112,4 @@ in mkDerivation rec { maintainers = with maintainers; [ guibert ]; platforms = platforms.linux; }; - } From ceb417aaf1a03a21683dc4687d2c7628f00ef70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 10:24:15 +0200 Subject: [PATCH 224/375] docker: format --- pkgs/build-support/docker/default.nix | 954 +++++++++++++------------- 1 file changed, 488 insertions(+), 466 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 221befadbc48..091984585459 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,65 +1,63 @@ -{ - bashInteractive, - buildPackages, - cacert, - callPackage, - closureInfo, - coreutils, - e2fsprogs, - fakeroot, - findutils, - go, - jq, - jshon, - lib, - makeWrapper, - moreutils, - nix, - pigz, - pkgs, - rsync, - runCommand, - runtimeShell, - shadow, - skopeo, - storeDir ? builtins.storeDir, - substituteAll, - symlinkJoin, - util-linux, - vmTools, - writeReferencesToFile, - writeScript, - writeText, - writeTextDir, - writePython3, - system, # Note: This is the cross system we're compiling for +{ bashInteractive +, buildPackages +, cacert +, callPackage +, closureInfo +, coreutils +, e2fsprogs +, fakeroot +, findutils +, go +, jq +, jshon +, lib +, makeWrapper +, moreutils +, nix +, pigz +, pkgs +, rsync +, runCommand +, runtimeShell +, shadow +, skopeo +, storeDir ? builtins.storeDir +, substituteAll +, symlinkJoin +, util-linux +, vmTools +, writeReferencesToFile +, writeScript +, writeText +, writeTextDir +, writePython3 +, system +, # Note: This is the cross system we're compiling for }: let - inherit (lib) - optionals - ; + mkDbExtraCommand = contents: + let + contentsList = if builtins.isList contents then contents else [ contents ]; + in + '' + echo "Generating the nix database..." + echo "Warning: only the database of the deepest Nix layer is loaded." + echo " If you want to use nix commands in the container, it would" + echo " be better to only have one layer that contains a nix store." - mkDbExtraCommand = contents: let - contentsList = if builtins.isList contents then contents else [ contents ]; - in '' - echo "Generating the nix database..." - echo "Warning: only the database of the deepest Nix layer is loaded." - echo " If you want to use nix commands in the container, it would" - echo " be better to only have one layer that contains a nix store." + export NIX_REMOTE=local?root=$PWD + # A user is required by nix + # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 + export USER=nobody + ${buildPackages.nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration - export NIX_REMOTE=local?root=$PWD - # A user is required by nix - # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 - export USER=nobody - ${buildPackages.nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration - - mkdir -p nix/var/nix/gcroots/docker/ - for i in ${lib.concatStringsSep " " contentsList}; do - ln -s $i nix/var/nix/gcroots/docker/$(basename $i) - done; - ''; + mkdir -p nix/var/nix/gcroots/docker/ + for i in ${lib.concatStringsSep " " contentsList}; do + ln -s $i nix/var/nix/gcroots/docker/$(basename $i) + done; + ''; # The OCI Image specification recommends that configurations use values listed # in the Go Language document for GOARCH. @@ -70,14 +68,14 @@ let in rec { - examples = callPackage ./examples.nix { inherit buildImage buildLayeredImage fakeNss pullImage shadowSetup buildImageWithNixDb; }; - pullImage = let - fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; - in + pullImage = + let + fixName = name: builtins.replaceStrings [ "/" ":" ] [ "-" "-" ] name; + in { imageName # To find the digest of an image, you can use skopeo: # see doc/functions.xml @@ -96,21 +94,22 @@ rec { , name ? fixName "docker-image-${finalImageName}-${finalImageTag}.tar" }: - runCommand name { - inherit imageDigest; - imageName = finalImageName; - imageTag = finalImageTag; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - outputHashMode = "flat"; - outputHashAlgo = "sha256"; - outputHash = sha256; + runCommand name + { + inherit imageDigest; + imageName = finalImageName; + imageTag = finalImageTag; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + outputHashMode = "flat"; + outputHashAlgo = "sha256"; + outputHash = sha256; - nativeBuildInputs = lib.singleton skopeo; - SSL_CERT_FILE = "${cacert.out}/etc/ssl/certs/ca-bundle.crt"; + nativeBuildInputs = lib.singleton skopeo; + SSL_CERT_FILE = "${cacert.out}/etc/ssl/certs/ca-bundle.crt"; - sourceURL = "docker://${imageName}@${imageDigest}"; - destNameTag = "${finalImageName}:${finalImageTag}"; - } '' + sourceURL = "docker://${imageName}@${imageDigest}"; + destNameTag = "${finalImageName}:${finalImageTag}"; + } '' skopeo \ --src-tls-verify=${lib.boolToString tlsVerify} \ --insecure-policy \ @@ -126,13 +125,14 @@ rec { tarsum = pkgs.tarsum; # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM - mergeDrvs = { - derivations, - onlyDeps ? false - }: - runCommand "merge-drvs" { - inherit derivations onlyDeps; - } '' + mergeDrvs = + { derivations + , onlyDeps ? false + }: + runCommand "merge-drvs" + { + inherit derivations onlyDeps; + } '' if [[ -n "$onlyDeps" ]]; then echo $derivations > $out exit 0 @@ -180,104 +180,105 @@ rec { ''; # Run commands in a virtual machine. - runWithOverlay = { - name, - fromImage ? null, - fromImageName ? null, - fromImageTag ? null, - diskSize ? 1024, - preMount ? "", - postMount ? "", - postUmount ? "" - }: - let - result = vmTools.runInLinuxVM ( - runCommand name { - preVM = vmTools.createEmptyImage { - size = diskSize; - fullName = "docker-run-disk"; - }; - inherit fromImage fromImageName fromImageTag; + runWithOverlay = + { name + , fromImage ? null + , fromImageName ? null + , fromImageTag ? null + , diskSize ? 1024 + , preMount ? "" + , postMount ? "" + , postUmount ? "" + }: + let + result = vmTools.runInLinuxVM ( + runCommand name + { + preVM = vmTools.createEmptyImage { + size = diskSize; + fullName = "docker-run-disk"; + }; + inherit fromImage fromImageName fromImageTag; - nativeBuildInputs = [ util-linux e2fsprogs jshon rsync jq ]; - } '' - mkdir disk - mkfs /dev/${vmTools.hd} - mount /dev/${vmTools.hd} disk - cd disk + nativeBuildInputs = [ util-linux e2fsprogs jshon rsync jq ]; + } '' + mkdir disk + mkfs /dev/${vmTools.hd} + mount /dev/${vmTools.hd} disk + cd disk - if [[ -n "$fromImage" ]]; then - echo "Unpacking base image..." - mkdir image - tar -C image -xpf "$fromImage" + if [[ -n "$fromImage" ]]; then + echo "Unpacking base image..." + mkdir image + tar -C image -xpf "$fromImage" - if [[ -n "$fromImageName" ]] && [[ -n "$fromImageTag" ]]; then - parentID="$( - cat "image/manifest.json" | - jq -r '.[] | select(.RepoTags | contains([$desiredTag])) | rtrimstr(".json")' \ - --arg desiredTag "$fromImageName:$fromImageTag" - )" - else - echo "From-image name or tag wasn't set. Reading the first ID." - parentID="$(cat "image/manifest.json" | jq -r '.[0].Config | rtrimstr(".json")')" - fi + if [[ -n "$fromImageName" ]] && [[ -n "$fromImageTag" ]]; then + parentID="$( + cat "image/manifest.json" | + jq -r '.[] | select(.RepoTags | contains([$desiredTag])) | rtrimstr(".json")' \ + --arg desiredTag "$fromImageName:$fromImageTag" + )" + else + echo "From-image name or tag wasn't set. Reading the first ID." + parentID="$(cat "image/manifest.json" | jq -r '.[0].Config | rtrimstr(".json")')" + fi - cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list - else - touch layer-list - fi + cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list + else + touch layer-list + fi - # Unpack all of the parent layers into the image. - lowerdir="" - extractionID=0 - for layerTar in $(tac layer-list); do - echo "Unpacking layer $layerTar" - extractionID=$((extractionID + 1)) + # Unpack all of the parent layers into the image. + lowerdir="" + extractionID=0 + for layerTar in $(tac layer-list); do + echo "Unpacking layer $layerTar" + extractionID=$((extractionID + 1)) - mkdir -p image/$extractionID/layer - tar -C image/$extractionID/layer -xpf image/$layerTar - rm image/$layerTar + mkdir -p image/$extractionID/layer + tar -C image/$extractionID/layer -xpf image/$layerTar + rm image/$layerTar - find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; + find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; - # Get the next lower directory and continue the loop. - lowerdir=image/$extractionID/layer''${lowerdir:+:}$lowerdir - done + # Get the next lower directory and continue the loop. + lowerdir=image/$extractionID/layer''${lowerdir:+:}$lowerdir + done - mkdir work - mkdir layer - mkdir mnt + mkdir work + mkdir layer + mkdir mnt - ${lib.optionalString (preMount != "") '' - # Execute pre-mount steps - echo "Executing pre-mount steps..." - ${preMount} - ''} + ${lib.optionalString (preMount != "") '' + # Execute pre-mount steps + echo "Executing pre-mount steps..." + ${preMount} + ''} - if [ -n "$lowerdir" ]; then - mount -t overlay overlay -olowerdir=$lowerdir,workdir=work,upperdir=layer mnt - else - mount --bind layer mnt - fi + if [ -n "$lowerdir" ]; then + mount -t overlay overlay -olowerdir=$lowerdir,workdir=work,upperdir=layer mnt + else + mount --bind layer mnt + fi - ${lib.optionalString (postMount != "") '' - # Execute post-mount steps - echo "Executing post-mount steps..." - ${postMount} - ''} + ${lib.optionalString (postMount != "") '' + # Execute post-mount steps + echo "Executing post-mount steps..." + ${postMount} + ''} - umount mnt + umount mnt - ( - cd layer - cmd='name="$(basename {})"; touch "$(dirname {})/.wh.$name"; rm "{}"' - find . -type c -exec bash -c "$cmd" \; - ) + ( + cd layer + cmd='name="$(basename {})"; touch "$(dirname {})/.wh.$name"; rm "{}"' + find . -type c -exec bash -c "$cmd" \; + ) - ${postUmount} - ''); + ${postUmount} + ''); in - runCommand name {} '' + runCommand name { } '' mkdir -p $out cd ${result} cp layer.tar json VERSION $out @@ -293,7 +294,6 @@ rec { ''; }; - # Create an executable shell script which has the coreutils in its # PATH. Since root scripts are executed in a blank environment, even # things like `ls` or `echo` will be missing. @@ -306,94 +306,100 @@ rec { ''; # Create a "layer" (set of files). - mkPureLayer = { - # Name of the layer - name, - # JSON containing configuration and metadata for this layer. - baseJson, - # Files to add to the layer. - contents ? null, - # When copying the contents into the image, preserve symlinks to - # directories (see `rsync -K`). Otherwise, transform those symlinks - # into directories. - keepContentsDirlinks ? false, - # Additional commands to run on the layer before it is tar'd up. - extraCommands ? "", uid ? 0, gid ? 0 - }: - runCommand "docker-layer-${name}" { - inherit baseJson contents extraCommands; - nativeBuildInputs = [ jshon rsync tarsum ]; - } - '' - mkdir layer - if [[ -n "$contents" ]]; then - echo "Adding contents..." - for item in $contents; do - echo "Adding $item" - rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/ - done - else - echo "No contents to add to layer." - fi + mkPureLayer = + { + # Name of the layer + name + , # JSON containing configuration and metadata for this layer. + baseJson + , # Files to add to the layer. + contents ? null + , # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false + , # Additional commands to run on the layer before it is tar'd up. + extraCommands ? "" + , uid ? 0 + , gid ? 0 + }: + runCommand "docker-layer-${name}" + { + inherit baseJson contents extraCommands; + nativeBuildInputs = [ jshon rsync tarsum ]; + } + '' + mkdir layer + if [[ -n "$contents" ]]; then + echo "Adding contents..." + for item in $contents; do + echo "Adding $item" + rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/ + done + else + echo "No contents to add to layer." + fi - chmod ug+w layer + chmod ug+w layer - if [[ -n "$extraCommands" ]]; then - (cd layer; eval "$extraCommands") - fi + if [[ -n "$extraCommands" ]]; then + (cd layer; eval "$extraCommands") + fi - # Tar up the layer and throw it into 'layer.tar'. - echo "Packing layer..." - mkdir $out - tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee -p $out/layer.tar | tarsum) + # Tar up the layer and throw it into 'layer.tar'. + echo "Packing layer..." + mkdir $out + tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee -p $out/layer.tar | tarsum) - # Add a 'checksum' field to the JSON, with the value set to the - # checksum of the tarball. - cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json + # Add a 'checksum' field to the JSON, with the value set to the + # checksum of the tarball. + cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json - # Indicate to docker that we're using schema version 1.0. - echo -n "1.0" > $out/VERSION + # Indicate to docker that we're using schema version 1.0. + echo -n "1.0" > $out/VERSION - echo "Finished building layer '${name}'" - ''; + echo "Finished building layer '${name}'" + ''; # Make a "root" layer; required if we need to execute commands as a # privileged user on the image. The commands themselves will be # performed in a virtual machine sandbox. - mkRootLayer = { - # Name of the image. - name, - # Script to run as root. Bash. - runAsRoot, - # Files to add to the layer. If null, an empty layer will be created. - contents ? null, - # When copying the contents into the image, preserve symlinks to - # directories (see `rsync -K`). Otherwise, transform those symlinks - # into directories. - keepContentsDirlinks ? false, - # JSON containing configuration and metadata for this layer. - baseJson, - # Existing image onto which to append the new layer. - fromImage ? null, - # Name of the image we're appending onto. - fromImageName ? null, - # Tag of the image we're appending onto. - fromImageTag ? null, - # How much disk to allocate for the temporary virtual machine. - diskSize ? 1024, - # Commands (bash) to run on the layer; these do not require sudo. - extraCommands ? "" - }: + mkRootLayer = + { + # Name of the image. + name + , # Script to run as root. Bash. + runAsRoot + , # Files to add to the layer. If null, an empty layer will be created. + contents ? null + , # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false + , # JSON containing configuration and metadata for this layer. + baseJson + , # Existing image onto which to append the new layer. + fromImage ? null + , # Name of the image we're appending onto. + fromImageName ? null + , # Tag of the image we're appending onto. + fromImageTag ? null + , # How much disk to allocate for the temporary virtual machine. + diskSize ? 1024 + , # Commands (bash) to run on the layer; these do not require sudo. + extraCommands ? "" + }: # Generate an executable script from the `runAsRoot` text. let runAsRootScript = shellScript "run-as-root.sh" runAsRoot; extraCommandsScript = shellScript "extra-commands.sh" extraCommands; - in runWithOverlay { + in + runWithOverlay { name = "docker-layer-${name}"; inherit fromImage fromImageName fromImageTag diskSize; - preMount = lib.optionalString (contents != null && contents != []) '' + preMount = lib.optionalString (contents != null && contents != [ ]) '' echo "Adding contents..." for item in ${toString contents}; do echo "Adding $item..." @@ -445,11 +451,12 @@ rec { ''; }; - buildLayeredImage = {name, ...}@args: + buildLayeredImage = { name, ... }@args: let stream = streamLayeredImage args; in - runCommand "${baseNameOf name}.tar.gz" { + runCommand "${baseNameOf name}.tar.gz" + { inherit (stream) imageName; passthru = { inherit (stream) imageTag; }; nativeBuildInputs = [ pigz ]; @@ -461,40 +468,45 @@ rec { # 4. compute the layer id # 5. put the layer in the image # 6. repack the image - buildImage = args@{ - # Image name. - name, - # Image tag, when null then the nix output hash will be used. - tag ? null, - # Parent image, to append to. - fromImage ? null, - # Name of the parent image; will be read from the image otherwise. - fromImageName ? null, - # Tag of the parent image; will be read from the image otherwise. - fromImageTag ? null, - # Files to put on the image (a nix store path or list of paths). - contents ? null, - # When copying the contents into the image, preserve symlinks to - # directories (see `rsync -K`). Otherwise, transform those symlinks - # into directories. - keepContentsDirlinks ? false, - # Docker config; e.g. what command to run on the container. - config ? null, - # Optional bash script to run on the files prior to fixturizing the layer. - extraCommands ? "", uid ? 0, gid ? 0, - # Optional bash script to run as root on the image when provisioning. - runAsRoot ? null, - # Size of the virtual machine disk to provision when building the image. - diskSize ? 1024, - # Time of creation of the image. - created ? "1970-01-01T00:00:01Z", - }: + buildImage = + args@{ + # Image name. + name + , # Image tag, when null then the nix output hash will be used. + tag ? null + , # Parent image, to append to. + fromImage ? null + , # Name of the parent image; will be read from the image otherwise. + fromImageName ? null + , # Tag of the parent image; will be read from the image otherwise. + fromImageTag ? null + , # Files to put on the image (a nix store path or list of paths). + contents ? null + , # When copying the contents into the image, preserve symlinks to + # directories (see `rsync -K`). Otherwise, transform those symlinks + # into directories. + keepContentsDirlinks ? false + , # Docker config; e.g. what command to run on the container. + config ? null + , # Optional bash script to run on the files prior to fixturizing the layer. + extraCommands ? "" + , uid ? 0 + , gid ? 0 + , # Optional bash script to run as root on the image when provisioning. + runAsRoot ? null + , # Size of the virtual machine disk to provision when building the image. + diskSize ? 1024 + , # Time of creation of the image. + created ? "1970-01-01T00:00:01Z" + , + }: let baseName = baseNameOf name; # Create a JSON blob of the configuration. Set the date to unix zero. - baseJson = let + baseJson = + let pure = writeText "${baseName}-config.json" (builtins.toJSON { inherit created config; architecture = defaultArch; @@ -503,36 +515,41 @@ rec { impure = runCommand "${baseName}-config.json" { nativeBuildInputs = [ jq ]; } '' - jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out + jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; - in if created == "now" then impure else pure; + in + if created == "now" then impure else pure; layer = if runAsRoot == null - then mkPureLayer { - name = baseName; - inherit baseJson contents keepContentsDirlinks extraCommands uid gid; - } else mkRootLayer { - name = baseName; - inherit baseJson fromImage fromImageName fromImageTag - contents keepContentsDirlinks runAsRoot diskSize - extraCommands; - }; - result = runCommand "docker-image-${baseName}.tar.gz" { - nativeBuildInputs = [ jshon pigz coreutils findutils jq moreutils ]; - # Image name must be lowercase - imageName = lib.toLower name; - imageTag = if tag == null then "" else tag; - inherit fromImage baseJson; - layerClosure = writeReferencesToFile layer; - passthru.buildArgs = args; - passthru.layer = layer; - passthru.imageTag = - if tag != null + then + mkPureLayer + { + name = baseName; + inherit baseJson contents keepContentsDirlinks extraCommands uid gid; + } else + mkRootLayer { + name = baseName; + inherit baseJson fromImage fromImageName fromImageTag + contents keepContentsDirlinks runAsRoot diskSize + extraCommands; + }; + result = runCommand "docker-image-${baseName}.tar.gz" + { + nativeBuildInputs = [ jshon pigz coreutils findutils jq moreutils ]; + # Image name must be lowercase + imageName = lib.toLower name; + imageTag = if tag == null then "" else tag; + inherit fromImage baseJson; + layerClosure = writeReferencesToFile layer; + passthru.buildArgs = args; + passthru.layer = layer; + passthru.imageTag = + if tag != null then tag else lib.head (lib.strings.splitString "-" (baseNameOf result.outPath)); - } '' + } '' ${lib.optionalString (tag == null) '' outName="$(basename "$out")" outHash=$(echo "$outName" | cut -d - -f 1) @@ -732,14 +749,14 @@ rec { root:x:0: nobody:x:65534: '') - (runCommand "var-empty" {} '' + (runCommand "var-empty" { } '' mkdir -p $out/var/empty '') ]; }; # This provides /bin/sh, pointing to bashInteractive. - binSh = runCommand "bin-sh" {} '' + binSh = runCommand "bin-sh" { } '' mkdir -p $out/bin ln -s ${bashInteractive}/bin/bash $out/bin/sh ''; @@ -760,189 +777,194 @@ rec { }) ); - streamLayeredImage = { - # Image Name - name, - # Image tag, the Nix's output hash will be used if null - tag ? null, - # Parent image, to append to. - fromImage ? null, - # Files to put on the image (a nix store path or list of paths). - contents ? [], - # Docker config; e.g. what command to run on the container. - config ? {}, - # Time of creation of the image. Passing "now" will make the - # created date be the time of building. - created ? "1970-01-01T00:00:01Z", - # Optional bash script to run on the files prior to fixturizing the layer. - extraCommands ? "", - # Optional bash script to run inside fakeroot environment. - # Could be used for changing ownership of files in customisation layer. - fakeRootCommands ? "", - # We pick 100 to ensure there is plenty of room for extension. I - # believe the actual maximum is 128. - maxLayers ? 100, - # Whether to include store paths in the image. You generally want to leave - # this on, but tooling may disable this to insert the store paths more - # efficiently via other means, such as bind mounting the host store. - includeStorePaths ? true, - }: - assert + streamLayeredImage = + { + # Image Name + name + , # Image tag, the Nix's output hash will be used if null + tag ? null + , # Parent image, to append to. + fromImage ? null + , # Files to put on the image (a nix store path or list of paths). + contents ? [ ] + , # Docker config; e.g. what command to run on the container. + config ? { } + , # Time of creation of the image. Passing "now" will make the + # created date be the time of building. + created ? "1970-01-01T00:00:01Z" + , # Optional bash script to run on the files prior to fixturizing the layer. + extraCommands ? "" + , # Optional bash script to run inside fakeroot environment. + # Could be used for changing ownership of files in customisation layer. + fakeRootCommands ? "" + , # We pick 100 to ensure there is plenty of room for extension. I + # believe the actual maximum is 128. + maxLayers ? 100 + , # Whether to include store paths in the image. You generally want to leave + # this on, but tooling may disable this to insert the store paths more + # efficiently via other means, such as bind mounting the host store. + includeStorePaths ? true + , + }: + assert (lib.assertMsg (maxLayers > 1) - "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); - let - baseName = baseNameOf name; + "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); + let + baseName = baseNameOf name; - streamScript = writePython3 "stream" {} ./stream_layered_image.py; - baseJson = writeText "${baseName}-base.json" (builtins.toJSON { - inherit config; - architecture = defaultArch; - os = "linux"; - }); + streamScript = writePython3 "stream" { } ./stream_layered_image.py; + baseJson = writeText "${baseName}-base.json" (builtins.toJSON { + inherit config; + architecture = defaultArch; + os = "linux"; + }); - contentsList = if builtins.isList contents then contents else [ contents ]; + contentsList = if builtins.isList contents then contents else [ contents ]; - # We store the customisation layer as a tarball, to make sure that - # things like permissions set on 'extraCommands' are not overriden - # by Nix. Then we precompute the sha256 for performance. - customisationLayer = symlinkJoin { - name = "${baseName}-customisation-layer"; - paths = contentsList; - inherit extraCommands fakeRootCommands; - nativeBuildInputs = [ fakeroot ]; - postBuild = '' - mv $out old_out - (cd old_out; eval "$extraCommands" ) + # We store the customisation layer as a tarball, to make sure that + # things like permissions set on 'extraCommands' are not overriden + # by Nix. Then we precompute the sha256 for performance. + customisationLayer = symlinkJoin { + name = "${baseName}-customisation-layer"; + paths = contentsList; + inherit extraCommands fakeRootCommands; + nativeBuildInputs = [ fakeroot ]; + postBuild = '' + mv $out old_out + (cd old_out; eval "$extraCommands" ) - mkdir $out + mkdir $out - fakeroot bash -c ' - source $stdenv/setup - cd old_out - eval "$fakeRootCommands" - tar \ - --sort name \ - --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ - --hard-dereference \ - -cf $out/layer.tar . - ' + fakeroot bash -c ' + source $stdenv/setup + cd old_out + eval "$fakeRootCommands" + tar \ + --sort name \ + --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -cf $out/layer.tar . + ' - sha256sum $out/layer.tar \ - | cut -f 1 -d ' ' \ - > $out/checksum - ''; - }; - - closureRoots = optionals includeStorePaths /* normally true */ ( - [ baseJson ] ++ contentsList - ); - overallClosure = writeText "closure" (lib.concatStringsSep " " closureRoots); - - # These derivations are only created as implementation details of docker-tools, - # so they'll be excluded from the created images. - unnecessaryDrvs = [ baseJson overallClosure ]; - - conf = runCommand "${baseName}-conf.json" { - inherit fromImage maxLayers created; - imageName = lib.toLower name; - passthru.imageTag = - if tag != null - then tag - else - lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath)); - paths = buildPackages.referencesByPopularity overallClosure; - nativeBuildInputs = [ jq ]; - } '' - ${if (tag == null) then '' - outName="$(basename "$out")" - outHash=$(echo "$outName" | cut -d - -f 1) - - imageTag=$outHash - '' else '' - imageTag="${tag}" - ''} - - # convert "created" to iso format - if [[ "$created" != "now" ]]; then - created="$(date -Iseconds -d "$created")" - fi - - paths() { - cat $paths ${lib.concatMapStringsSep " " - (path: "| (grep -v ${path} || true)") - unnecessaryDrvs} - } - - # Compute the number of layers that are already used by a potential - # 'fromImage' as well as the customization layer. Ensure that there is - # still at least one layer available to store the image contents. - usedLayers=0 - - # subtract number of base image layers - if [[ -n "$fromImage" ]]; then - (( usedLayers += $(tar -xOf "$fromImage" manifest.json | jq '.[0].Layers | length') )) - fi - - # one layer will be taken up by the customisation layer - (( usedLayers += 1 )) - - if ! (( $usedLayers < $maxLayers )); then - echo >&2 "Error: usedLayers $usedLayers layers to store 'fromImage' and" \ - "'extraCommands', but only maxLayers=$maxLayers were" \ - "allowed. At least 1 layer is required to store contents." - exit 1 - fi - availableLayers=$(( maxLayers - usedLayers )) - - # Create $maxLayers worth of Docker Layers, one layer per store path - # unless there are more paths than $maxLayers. In that case, create - # $maxLayers-1 for the most popular layers, and smush the remainaing - # store paths in to one final layer. - # - # The following code is fiddly w.r.t. ensuring every layer is - # created, and that no paths are missed. If you change the - # following lines, double-check that your code behaves properly - # when the number of layers equals: - # maxLayers-1, maxLayers, and maxLayers+1, 0 - store_layers="$( - paths | - jq -sR ' - rtrimstr("\n") | split("\n") - | (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ] - | map(select(length > 0)) - ' \ - --argjson maxLayers "$availableLayers" - )" - - cat ${baseJson} | jq ' - . + { - "store_dir": $store_dir, - "from_image": $from_image, - "store_layers": $store_layers, - "customisation_layer", $customisation_layer, - "repo_tag": $repo_tag, - "created": $created - } - ' --arg store_dir "${storeDir}" \ - --argjson from_image ${if fromImage == null then "null" else "'\"${fromImage}\"'"} \ - --argjson store_layers "$store_layers" \ - --arg customisation_layer ${customisationLayer} \ - --arg repo_tag "$imageName:$imageTag" \ - --arg created "$created" | - tee $out - ''; - result = runCommand "stream-${baseName}" { - inherit (conf) imageName; - passthru = { - inherit (conf) imageTag; - - # Distinguish tarballs and exes at the Nix level so functions that - # take images can know in advance how the image is supposed to be used. - isExe = true; + sha256sum $out/layer.tar \ + | cut -f 1 -d ' ' \ + > $out/checksum + ''; }; - nativeBuildInputs = [ makeWrapper ]; - } '' - makeWrapper ${streamScript} $out --add-flags ${conf} - ''; - in result; + + closureRoots = lib.optionals includeStorePaths /* normally true */ ( + [ baseJson ] ++ contentsList + ); + overallClosure = writeText "closure" (lib.concatStringsSep " " closureRoots); + + # These derivations are only created as implementation details of docker-tools, + # so they'll be excluded from the created images. + unnecessaryDrvs = [ baseJson overallClosure ]; + + conf = runCommand "${baseName}-conf.json" + { + inherit fromImage maxLayers created; + imageName = lib.toLower name; + passthru.imageTag = + if tag != null + then tag + else + lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath)); + paths = buildPackages.referencesByPopularity overallClosure; + nativeBuildInputs = [ jq ]; + } '' + ${if (tag == null) then '' + outName="$(basename "$out")" + outHash=$(echo "$outName" | cut -d - -f 1) + + imageTag=$outHash + '' else '' + imageTag="${tag}" + ''} + + # convert "created" to iso format + if [[ "$created" != "now" ]]; then + created="$(date -Iseconds -d "$created")" + fi + + paths() { + cat $paths ${lib.concatMapStringsSep " " + (path: "| (grep -v ${path} || true)") + unnecessaryDrvs} + } + + # Compute the number of layers that are already used by a potential + # 'fromImage' as well as the customization layer. Ensure that there is + # still at least one layer available to store the image contents. + usedLayers=0 + + # subtract number of base image layers + if [[ -n "$fromImage" ]]; then + (( usedLayers += $(tar -xOf "$fromImage" manifest.json | jq '.[0].Layers | length') )) + fi + + # one layer will be taken up by the customisation layer + (( usedLayers += 1 )) + + if ! (( $usedLayers < $maxLayers )); then + echo >&2 "Error: usedLayers $usedLayers layers to store 'fromImage' and" \ + "'extraCommands', but only maxLayers=$maxLayers were" \ + "allowed. At least 1 layer is required to store contents." + exit 1 + fi + availableLayers=$(( maxLayers - usedLayers )) + + # Create $maxLayers worth of Docker Layers, one layer per store path + # unless there are more paths than $maxLayers. In that case, create + # $maxLayers-1 for the most popular layers, and smush the remainaing + # store paths in to one final layer. + # + # The following code is fiddly w.r.t. ensuring every layer is + # created, and that no paths are missed. If you change the + # following lines, double-check that your code behaves properly + # when the number of layers equals: + # maxLayers-1, maxLayers, and maxLayers+1, 0 + store_layers="$( + paths | + jq -sR ' + rtrimstr("\n") | split("\n") + | (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ] + | map(select(length > 0)) + ' \ + --argjson maxLayers "$availableLayers" + )" + + cat ${baseJson} | jq ' + . + { + "store_dir": $store_dir, + "from_image": $from_image, + "store_layers": $store_layers, + "customisation_layer", $customisation_layer, + "repo_tag": $repo_tag, + "created": $created + } + ' --arg store_dir "${storeDir}" \ + --argjson from_image ${if fromImage == null then "null" else "'\"${fromImage}\"'"} \ + --argjson store_layers "$store_layers" \ + --arg customisation_layer ${customisationLayer} \ + --arg repo_tag "$imageName:$imageTag" \ + --arg created "$created" | + tee $out + ''; + result = runCommand "stream-${baseName}" + { + inherit (conf) imageName; + passthru = { + inherit (conf) imageTag; + + # Distinguish tarballs and exes at the Nix level so functions that + # take images can know in advance how the image is supposed to be used. + isExe = true; + }; + nativeBuildInputs = [ makeWrapper ]; + } '' + makeWrapper ${streamScript} $out --add-flags ${conf} + ''; + in + result; } From 22e1d3f1afc947e9d4e3d2ea68d3c6682637939d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 10:41:59 +0200 Subject: [PATCH 225/375] python3Packages.clevercsv: 0.6.8 -> 0.7.0 --- pkgs/development/python-modules/clevercsv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index 233b7164989d..f42a97c0652e 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.6.8"; + version = "0.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; rev = "v${version}"; - sha256 = "0jpgyh65zqr76sz2s63zsjyb49dpg2xdmf72jvpicw923bdzhqvp"; + sha256 = "09ccgydnrfdgxjz6ph829l9q62jkzqrak0k6yjik2rvs33jn0dhc"; }; propagatedBuildInputs = [ From cb2d6f5b4aa45cab7ff4c403e51b25f83234ddcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 10:48:12 +0200 Subject: [PATCH 226/375] fetchmail: cleanup --- pkgs/applications/misc/fetchmail/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 44bcbd782175..4baa3a094261 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, openssl }: -let - version = "6.4.21"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "fetchmail"; - inherit version; + version = "6.4.21"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; @@ -16,7 +13,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ssl=${openssl.dev}" ]; - meta = { + meta = with lib; { homepage = "https://www.fetchmail.info/"; description = "A full-featured remote-mail retrieval and forwarding utility"; longDescription = '' @@ -27,9 +24,8 @@ stdenv.mkDerivation { all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC. ''; - - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; - license = lib.licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.peti ]; + license = licenses.gpl2Plus; }; } From a3faaa753e4112dbaa4f0bdb0a59ff52f71e041d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 10:49:10 +0200 Subject: [PATCH 227/375] python3Packages.clize: 4.1.1 -> 4.2.0 --- pkgs/development/python-modules/clize/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 0088acdb832c..faeb54f794bb 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -15,18 +15,13 @@ buildPythonPackage rec { pname = "clize"; - version = "4.1.1"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "f54dedcf6fea90a3e75c30cb65e0ab1e832760121f393b8d68edd711dbaf7187"; + sha256 = "06p47i6hri006v7xbx7myj02as1a6f34rv88wfa9rb067p13nmyz"; }; - # Remove overly restrictive version constraints - postPatch = '' - substituteInPlace setup.py --replace "attrs>=19.1.0,<20" "attrs" - ''; - checkInputs = [ pytestCheckHook python-dateutil @@ -49,5 +44,6 @@ buildPythonPackage rec { description = "Command-line argument parsing for Python"; homepage = "https://github.com/epsy/clize"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 132f888882f1c6641b3e7644c8a87c2bb41a5dec Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 10 Aug 2021 11:10:15 +0200 Subject: [PATCH 228/375] gjs: 1.68.1 -> 1.68.2 --- pkgs/development/libraries/gjs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 342d498f1547..e86775de623b 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.68.1"; + version = "1.68.2"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0w2cbfpmc6alz7z8ycchhlkn586av5y8zk2xmgwzq10i0k13xyig"; + sha256 = "sha256-cP8CraaC8TAzjsXMTFEQPcDlyrjVN+t2sYHsUSpl7jA="; }; patches = [ @@ -126,6 +126,7 @@ in stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gjs"; + versionPolicy = "odd-unstable"; }; }; From b91e7081da52a649f55cc36db478a5546375f9f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 11:10:41 +0200 Subject: [PATCH 229/375] zerobin: fix build --- pkgs/applications/networking/zerobin/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/applications/networking/zerobin/default.nix index b86fe7cc6410..16a52d670450 100644 --- a/pkgs/applications/networking/zerobin/default.nix +++ b/pkgs/applications/networking/zerobin/default.nix @@ -7,6 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "zerobin"; version = "1.0.5"; + src = fetchFromGitHub { owner = "Tygs"; repo = "0bin"; @@ -21,6 +22,7 @@ python3Packages.buildPythonApplication rec { python3Packages.pyscss nodePackages.uglify-js ]; + propagatedBuildInputs = with python3Packages; [ appdirs beaker @@ -30,16 +32,19 @@ python3Packages.buildPythonApplication rec { lockfile paste ]; + prePatch = '' # replace /bin/bash in compress.sh patchShebangs . # relax version constraints of some dependencies substituteInPlace setup.cfg \ + --replace "clize==4.1.1" "clize" \ --replace "bleach==3.1.5" "bleach>=3.1.5,<4" \ --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \ --replace "Paste==3.4.3" "Paste>=3.4.3,<4" ''; + buildPhase = '' runHook preBuild doit build @@ -51,6 +56,8 @@ python3Packages.buildPythonApplication rec { # See https://github.com/NixOS/nixpkgs/pull/98734#discussion_r495823510 doCheck = false; + pythonImportsCheck = [ "zerobin" ]; + meta = with lib; { description = "A client side encrypted pastebin"; homepage = "https://0bin.net/"; From 72aea3fe891afb8a06364c426e891246cad62f52 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 10 Aug 2021 10:11:11 +0100 Subject: [PATCH 230/375] scorecard: 2.1.2 -> 2.1.3 --- pkgs/tools/security/scorecard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index e26491415734..5d8d9413ae99 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "scorecard"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OUQzgTQbeQfut/ATvUl9RTFZISiGaUhRjZi4Rh7BB2A="; + sha256 = "sha256-lTaFSQ3yyzQGdiKwev38iEpV+ELKg9f1rMYdbqVuiSs="; }; - vendorSha256 = "sha256-/Ltw0qZkLr1qaQixLy5pvWZiNRJucp+bDiY7yVlWmqA="; + vendorSha256 = "sha256-eFu954gwoL5z99cJGhSnvliAzwxv3JJxfjmBF+cx7Dg="; subPackages = [ "." ]; From d3ae3bdd736189448e698f1fbc0a0a1166dd3652 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 10 Aug 2021 10:18:09 +0100 Subject: [PATCH 231/375] obs-studio-plugins.obs-multi-rtmp: 0.2.6 -> 0.2.6.1 --- pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix index 0122cba0f3d8..9985b7fd0f15 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "obs-multi-rtmp"; - version = "0.2.6"; + version = "0.2.6.1"; src = fetchFromGitHub { owner = "sorayuki"; repo = "obs-multi-rtmp"; rev = version; - sha256 = "sha256-SMcVL54HwFIc7/wejEol2XiZhlZCMVCwHHtIKJ/CoYY="; + sha256 = "sha256-ZcvmiE9gbDUHAO36QAIaUdjV14ZfPabD9CW7Ogeqdro="; }; nativeBuildInputs = [ cmake ]; From f8d8220875c45cb02ed9a5a4dd165d8949cf5b3b Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Tue, 10 Aug 2021 09:20:42 +0000 Subject: [PATCH 232/375] clightning: 0.10.0 -> 0.10.1 --- pkgs/applications/blockchains/clightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 44ed4d1541c0..0cec96b7a6ee 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "5154e67780dddbf12f64c4b1994c3ee3834236f05b6462adf25e8a5f3fa407ea"; + sha256 = "9271e9e89d60332b66afedbf8d6eab2a4a488782ab400ee1f60667d73c5a9a96"; }; nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ]; From 51816dff1a342a2a142fb0c2a5d9595d28f40442 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Tue, 10 Aug 2021 11:36:41 +0200 Subject: [PATCH 233/375] vscx/ms-vsliveshare-vsliveshare: 1.0.4498 -> 1.0.4673 --- .../vscode-extensions/ms-vsliveshare-vsliveshare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index 0fa9a4bb4bee..c111f01621b3 100644 --- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.4498"; - sha256 = "01gg9jqkq9z05ckw0mnqfr769359j6h3z8ay6r17jj6m4mhy2m5g"; + version = "1.0.4673"; + sha256 = "1ys3lilc2r3n250s6pfvadrabnvqpzy74awjmvw79jrbvvk1iw1z"; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ From e9badbf41491b5213c252b1770e35f228a6c8525 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 10 Aug 2021 10:40:07 +0100 Subject: [PATCH 234/375] terraform-ls: 0.20.0 -> 0.20.1 --- pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 75b75733af6a..d484ee56aa11 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G1i5SS1BY+h8qPPjrZ9HCnKX3o2VkwvpeHPNxW6rnuI="; + sha256 = "sha256-KEuqE09EvI00e2YwPaExuM9ji5Z7YDTOF+4jw6SvtKo="; }; - vendorSha256 = "sha256-nRElOa9IQ31Wh01wTFM6pazDYFnmR06vkU4CI8Gx4Vw="; + vendorSha256 = "sha256-hPa1xaYqKs++Ifw732bfs2VHW7DFRggO/faJgX4M2F4="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; From b38e90ff79531f3df7f60acef89513031286cc0e Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 10 Aug 2021 10:47:24 +0100 Subject: [PATCH 235/375] starboard-octant-plugin: 0.10.3 -> 0.11.0 --- .../cluster/octant/plugins/starboard-octant-plugin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index 5a4546b8cd8c..7dc1a3c7d9cf 100644 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9vl068ZTw6Czf+cWQ0k1lU0pqh7P0YZgLguHkk3M918="; + sha256 = "sha256-XHc/1rqTEVOjCm0kFniUmmjVeRsr9Npt0OpQ6Oy7Rxo="; }; - vendorSha256 = "sha256-HOvZPDVKZEoL91yyaJRuKThHirY77xlKOtLKARthxn8="; + vendorSha256 = "sha256-EM0lPwwWJuLD+aqZWshz1ILaeEtUU4wJ0Puwv1Ikgf4="; preBuild = '' buildFlagsArray+=("-ldflags" "-s -w") From 64c8dd32dac52df4ce7abfd2dfc0b21278257278 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 17:41:39 +0200 Subject: [PATCH 236/375] python3Packages.b2sdk: 1.9.0 -> 1.11.0 --- pkgs/development/python-modules/b2sdk/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index c6122e15a83a..4dfb2bfe84e6 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.9.0"; + version = "1.11.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ff9c27c89f53583fd83c711d0a642d9b3bdbb8682c2e8e2315674b517cb441ec"; + sha256 = "sha256-yOOyhuue3A6p/SBaO6UUxbd4mTDyW2mRnbqlvZSyiKA="; }; nativeBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { # Test requires an API key "test_raw_api" "test_files_headers" + "test_large_file" ]; pythonImportsCheck = [ "b2sdk" ]; From f29b9da698b7170fca15727de659f5b089077b70 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Tue, 10 Aug 2021 16:04:34 +1000 Subject: [PATCH 237/375] portmidi: add support for darwin --- .../libraries/portmidi/default.nix | 48 ++++++++++++----- .../portmidi/remove-darwin-variables.diff | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 90 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/libraries/portmidi/remove-darwin-variables.diff diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 0151d461c139..0fb9636bc2a1 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsa-lib }: +{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsa-lib, Carbon, CoreAudio, CoreFoundation, CoreMIDI, CoreServices }: stdenv.mkDerivation rec { pname = "portmidi"; @@ -20,14 +20,31 @@ stdenv.mkDerivation rec { "-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release" "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release" "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_ARCHITECTURES=${if stdenv.isAarch64 then "arm64" else "x86_64"}" + "-DCOREAUDIO_LIB=${CoreAudio}" + "-DCOREFOUNDATION_LIB=${CoreFoundation}" + "-DCOREMIDI_LIB=${CoreMIDI}" + "-DCORESERVICES_LIB=${CoreServices}" ]; - # XXX: This is to deactivate Java support. - patches = lib.singleton (fetchurl { - url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/" - + "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch"; - sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h"; - }); + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin [ + "-framework CoreAudio" + "-framework CoreFoundation" + "-framework CoreMIDI" + "-framework CoreServices" + ]; + + patches = [ + # XXX: This is to deactivate Java support. + (fetchurl { + url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/portmidi/files/portmidi-217-cmake-libdir-java-opts.patch"; + sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h"; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # Remove hardcoded variables so we can set them properly + ./remove-darwin-variables.diff + ]; postPatch = '' sed -i -e 's|/usr/local/|'"$out"'|' -e 's|/usr/share/|'"$out"'/share/|' \ @@ -40,19 +57,24 @@ stdenv.mkDerivation rec { pm_java/CMakeLists.txt ''; - postInstall = '' - ln -s libportmidi.so "$out/lib/libporttime.so" + postInstall = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + ln -s libportmidi.${ext} "$out/lib/libporttime.${ext}" ''; nativeBuildInputs = [ unzip cmake ]; - buildInputs = [ alsa-lib ]; + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + Carbon CoreAudio CoreFoundation CoreMIDI CoreServices + ]; hardeningDisable = [ "format" ]; - meta = { + meta = with lib; { homepage = "http://portmedia.sourceforge.net/portmidi/"; description = "Platform independent library for MIDI I/O"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff b/pkgs/development/libraries/portmidi/remove-darwin-variables.diff new file mode 100644 index 000000000000..975dbb57b59d --- /dev/null +++ b/pkgs/development/libraries/portmidi/remove-darwin-variables.diff @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4919b78..758eccb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,8 +36,6 @@ set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") + set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") + set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") + +-set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING "change to needed architecture for a smaller library" FORCE) +- + PROJECT(portmidi) + + if(UNIX) +diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt +index e171047..aafa09c 100644 +--- a/pm_common/CMakeLists.txt ++++ b/pm_common/CMakeLists.txt +@@ -22,7 +22,7 @@ else(APPLE OR WIN32) + endif(APPLE OR WIN32) + + if(APPLE) +- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk CACHE ++ set(CMAKE_OSX_SYSROOT / CACHE + PATH "-isysroot parameter for compiler" FORCE) + set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5" CACHE + STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE) +@@ -54,10 +54,6 @@ if(UNIX) + + include_directories(${CMAKE_OSX_SYSROOT}/Developer/Headers/FlatCarbon) + set(FRAMEWORK_PATH ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks) +- set(COREAUDIO_LIB "${FRAMEWORK_PATH}/CoreAudio.framework") +- set(COREFOUNDATION_LIB "${FRAMEWORK_PATH}/CoreFoundation.framework") +- set(COREMIDI_LIB "${FRAMEWORK_PATH}/CoreMIDI.framework") +- set(CORESERVICES_LIB "${FRAMEWORK_PATH}/CoreServices.framework") + set(PM_NEEDED_LIBS ${COREAUDIO_LIB} ${COREFOUNDATION_LIB} + ${COREMIDI_LIB} ${CORESERVICES_LIB} + CACHE INTERNAL "") +diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt +index f693dd6..1dc5cd6 100644 +--- a/pm_dylib/CMakeLists.txt ++++ b/pm_dylib/CMakeLists.txt +@@ -49,10 +49,6 @@ if(UNIX) + + include_directories(${CMAKE_OSX_SYSROOT}/Developer/Headers/FlatCarbon) + set(FRAMEWORK_PATH ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks) +- set(COREAUDIO_LIB "${FRAMEWORK_PATH}/CoreAudio.framework") +- set(COREFOUNDATION_LIB "${FRAMEWORK_PATH}/CoreFoundation.framework") +- set(COREMIDI_LIB "${FRAMEWORK_PATH}/CoreMIDI.framework") +- set(CORESERVICES_LIB "${FRAMEWORK_PATH}/CoreServices.framework") + set(PM_NEEDED_LIBS ${COREAUDIO_LIB} ${COREFOUNDATION_LIB} + ${COREMIDI_LIB} ${CORESERVICES_LIB} + CACHE INTERNAL "") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1e8404fc65..33c38e9e46bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18136,7 +18136,9 @@ with pkgs; }; }); - portmidi = callPackage ../development/libraries/portmidi {}; + portmidi = callPackage ../development/libraries/portmidi { + inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices; + }; presage = callPackage ../development/libraries/presage { }; From ad51264131eb082954f05a2633db15b455191eaa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 11:48:45 +0200 Subject: [PATCH 238/375] python3Packages.b2sdk: 1.11.0 -> 1.12.0 --- pkgs/development/python-modules/b2sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 4dfb2bfe84e6..d81c374670fd 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.11.0"; + version = "1.12.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-yOOyhuue3A6p/SBaO6UUxbd4mTDyW2mRnbqlvZSyiKA="; + sha256 = "sha256-PsImSuK0IVY9EwpLKlP5ZFS6A7j2iJOtUg/GUcQTJR0="; }; nativeBuildInputs = [ From ccd2fa8bb85e2e3ace2d8bd5401324066290c99f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 11:53:15 +0200 Subject: [PATCH 239/375] backblaze-b2: 2.5.0 -> 3.0.1 --- pkgs/development/tools/backblaze-b2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 171885d989a7..070546a3ff91 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -12,12 +12,12 @@ let in python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "2.5.0"; + version = "3.0.1"; src = python3Packages.fetchPypi { inherit version; pname = "b2"; - sha256 = "0sh9k9fnj73ydqnk056m01xkilpxh7f4597cnczqhy21lxzr3d45"; + sha256 = "sha256-Zr+5J6MCjfth+5fOSfHXpT/CAgD754ZpS1b1NqeGid8="; }; postPatch = '' From 7b3170056d6e9f36a860b7ae11416b5ee5529ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 10 Aug 2021 12:16:35 +0200 Subject: [PATCH 240/375] yt-dlp: 2021.07.21 -> 2021.08.02 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 1deaef5eac45..8f5e14a24039 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -13,13 +13,13 @@ 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.07.21"; + version = "2021.08.02"; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; rev = version; - sha256 = "ziOW52LJUBe0j7ru8GYgiUCE6YJeBTTjm+H6W8EZjuY="; + sha256 = "QEJKOZGVQNXLU8GfTbwBx2Zv3KO++ozTJcXLWxXA4hI="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 236c1159bf2a46d4e32e2c32649561bd6ed2c8b7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 10 Aug 2021 18:50:17 +1000 Subject: [PATCH 241/375] fuse-overlayfs: 1.7 -> 1.7.1 https://github.com/containers/fuse-overlayfs/releases/tag/v1.7.1 --- pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 56c96ff6f16a..3fc319d5b748 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eJTyiepQpCptZUnlmWTYejCyzf3QHCzqrn67UjW9mU4="; + sha256 = "sha256-wSJjA9eZCb3DJed07xuCS0M7ey3DnyuIlp9kvFvDDC8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 2a40707bc7f7dad9e04554a7a2f1a1ac8a8bb040 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 10 Aug 2021 18:52:18 +1000 Subject: [PATCH 242/375] kepubify: 4.0.0 -> 4.0.1 https://github.com/pgaskin/kepubify/releases/tag/v4.0.1 --- pkgs/tools/misc/kepubify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 19bf832fadf5..a53ff544ad19 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kepubify"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "pgaskin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mxe43U0kxkSdAzs+lSJ0x/VspbJPam59DpTpFEJVMl4="; + sha256 = "sha256-ZQY5U9uMCwsMl3Ds3bscPYmTt8JdWehOoowb+AmJSbQ="; }; - vendorSha256 = "sha256-bLQH7ZY2hE8fBTcW7DNoUQxe4N3m9Mv3JjjKO4cG7DY="; + vendorSha256 = "sha256-DcE2MCbH5FIU1UoIF8OF17TfsWS5eQhHnWDEAxy8X6c="; # remove when built with >= go 1.17 tags = [ "zip117" ]; From 98b9a7fdeae051bd37d8105f7b03aa8077d6c10e Mon Sep 17 00:00:00 2001 From: olebedev Date: Tue, 10 Aug 2021 15:39:02 +1000 Subject: [PATCH 243/375] nodePackages.node-gyp: local nodejs header files From within the sandbox, it couldn't be possible to do HTTP requests so we need to make `node-gyp` aware of local `nodejs` and use header files out of it instead of attempt to download it and fail. --- pkgs/development/node-packages/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index fe1bdd6754cc..49a569debaa7 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -198,6 +198,16 @@ let ''; }; + node-gyp = super.node-gyp.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + # Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org. + # This is important when build nodejs packages in sandbox. + postInstall = '' + wrapProgram "$out/bin/node-gyp" \ + --set npm_config_nodedir ${nodejs} + ''; + }; + node-inspector = super.node-inspector.override { buildInputs = [ self.node-pre-gyp ]; meta.broken = since "10"; From 3747daf3422a6ecd1da9ca867e474fd1ddcb9604 Mon Sep 17 00:00:00 2001 From: ostylk Date: Tue, 10 Aug 2021 12:39:17 +0200 Subject: [PATCH 244/375] conda: invoke bash login shell to source /etc/profile The `profile` parameter in `buildFHSUserEnv` is used to create an /etc/profile file which should be sourced by bash. However, the default runScript is a non-login bash which does not source /etc/profile. Therefore the conda package breaks, as a script which is required for `conda activate`, is not sourced. Also the installationPath parameter is ignored as it is setup in the /etc/profile file. --- pkgs/tools/package-management/conda/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index 57b4d17fdfdd..bc11203bb4ae 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -66,6 +66,8 @@ in source ${installationPath}/etc/profile.d/conda.sh ''; + runScript = "bash -l"; + meta = { description = "Conda is a package manager for Python"; homepage = "https://conda.io/"; From 110c6328cffcc30bec5945e1a0c5bd3b265fabba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 12:39:38 +0200 Subject: [PATCH 245/375] python3Packages.runway-python: fix build --- pkgs/development/python-modules/runway-python/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 4e062d9928ec..ffe21701dd2b 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -21,12 +21,14 @@ , deepdiff , pytestCheckHook , pytest-cov +, pythonOlder , websocket-client }: buildPythonPackage rec { pname = "runway-python"; version = "0.6.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "runwayml"; @@ -70,6 +72,8 @@ buildPythonPackage rec { "test_file_deserialization_remote" "test_file_deserialization_absolute_directory" "test_file_deserialization_remote_directory" + # Fails with a decoding error at the moment + "test_inference_async" ] ++ lib.optionals (pythonAtLeast "3.9") [ # AttributeError: module 'base64' has no attribute 'decodestring # https://github.com/runwayml/model-sdk/issues/99 From ca2cc06e5d38738f10e1b950046c3b3ad869b74c Mon Sep 17 00:00:00 2001 From: hqurve <53281855+hqurve@users.noreply.github.com> Date: Tue, 10 Aug 2021 06:41:28 -0400 Subject: [PATCH 246/375] java-language-server: init at 0.2.38 (#131262) Co-authored-by: Sandro --- .../java/java-language-server/default.nix | 96 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 98 insertions(+) create mode 100644 pkgs/development/tools/java/java-language-server/default.nix diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix new file mode 100644 index 000000000000..47054564f9b7 --- /dev/null +++ b/pkgs/development/tools/java/java-language-server/default.nix @@ -0,0 +1,96 @@ +{ lib, stdenv, fetchFromGitHub +, jdk, maven +, runtimeShell, makeWrapper +}: + +let + platform = + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "mac" + else if stdenv.isWindows then "windows" + else throw "unsupported platform"; +in +stdenv.mkDerivation rec { + pname = "java-language-server"; + version = "0.2.38"; + + src = fetchFromGitHub { + owner = "georgewfraser"; + repo = pname; + # commit hash is used as owner sometimes forgets to set tags. See https://github.com/georgewfraser/java-language-server/issues/104 + rev = "1dfdc54d1f1e57646a0ec9c0b3f4a4f094bd9f17"; + sha256 = "sha256-zkbl/SLg09XK2ZhJNzWEtvFCQBRQ62273M/2+4HV1Lk="; + }; + + fetchedMavenDeps = stdenv.mkDerivation { + name = "java-language-server-${version}-maven-deps"; + inherit src; + buildInputs = [ maven ]; + + buildPhase = '' + runHook preBuild + + mvn package -Dmaven.repo.local=$out -DskipTests + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + find $out -type f \ + -name \*.lastUpdated -or \ + -name resolver-status.properties -or \ + -name _remote.repositories \ + -delete + + runHook postInstall + ''; + + dontFixup = true; + dontConfigure = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-YkcQKmm8oeEH7uyUzV/qGoe4LiI6o5wZ7o69qrO3oCA="; + }; + + + nativeBuildInputs = [ maven jdk makeWrapper ]; + + dontConfigure = true; + buildPhase = '' + runHook preBuild + + jlink \ + ${lib.optionalString (!stdenv.isDarwin) "--module-path './jdks/${platform}/jdk-13/jmods'"} \ + --add-modules java.base,java.compiler,java.logging,java.sql,java.xml,jdk.compiler,jdk.jdi,jdk.unsupported,jdk.zipfs \ + --output dist/${platform} \ + --no-header-files \ + --no-man-pages \ + --compress 2 + + mvn package --offline -Dmaven.repo.local=${fetchedMavenDeps} -DskipTests + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java/java-language-server + cp -r dist/classpath dist/*${platform}* $out/share/java/java-language-server + + # a link is not used as lang_server_${platform}.sh makes use of "dirname $0" to access other files + makeWrapper $out/share/java/java-language-server/lang_server_${platform}.sh $out/bin/java-language-server + + runHook postInstall + ''; + + meta = with lib; { + description = "A Java language server based on v3.0 of the protocol and implemented using the Java compiler API"; + homepage = "https://github.com/georgewfraser/java-language-server"; + license = licenses.mit; + maintainers = with maintainers; [ hqurve ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74392fa02304..1d6d011d70c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14589,6 +14589,8 @@ with pkgs; readline = readline81; }; + java-language-server = callPackage ../development/tools/java/java-language-server { }; + jhiccup = callPackage ../development/tools/java/jhiccup { }; valgrind = callPackage ../development/tools/analysis/valgrind { From 3e2939af92db61fb4d01ded0ad5a6c35bf2d878a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 12:45:49 +0200 Subject: [PATCH 247/375] python3Packages.deezer-py: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/deezer-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deezer-py/default.nix b/pkgs/development/python-modules/deezer-py/default.nix index de5c076a4288..1ae219e25c11 100644 --- a/pkgs/development/python-modules/deezer-py/default.nix +++ b/pkgs/development/python-modules/deezer-py/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "deezer-py"; - version = "1.1.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EAiGMSLrRsF03FMLkizy3Fm+nAldSTxe9KdXFFep0iQ="; + sha256 = "sha256-xkPbKFGULq5On13xuuV0Bqb5ATTXonH6mCPf3mwwv8A="; }; propagatedBuildInputs = [ requests ]; From 1acb054c8af2f65313255deccf11e5c01d85676c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 12:46:00 +0200 Subject: [PATCH 248/375] python3Packages.deemix: 3.4.1 -> 3.4.2 --- pkgs/development/python-modules/deemix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix index b34c54d91f1f..bf9b22658762 100644 --- a/pkgs/development/python-modules/deemix/default.nix +++ b/pkgs/development/python-modules/deemix/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "deemix"; - version = "3.4.1"; + version = "3.4.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FGzMFJOoKQPNq4tGI1KsMO+i9iBZhoz5Z67BFLEuv48="; + sha256 = "sha256-kGE3JLMaDSQsz/b+vgQ5GGTp+itiqMymamaNO0NM2L0="; }; propagatedBuildInputs = [ From da74ac3753cd7075b8e88fd350e2b777c187f2d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 12:59:18 +0200 Subject: [PATCH 249/375] tfsec: 0.56.0 -> 0.57.1 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 1e9f262e3be7..edcaddbd9ce7 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.56.0"; + version = "0.57.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0kv9g11jgbrbb50qhlfznw9i473gw8vadrrlkvki6y3cfcavghkv"; + sha256 = "0g3yq2y9z7vnaznmdmdb98djsv8nbai8jvbhfs2g12q55dlm3vf3"; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 81777e9a43c36e392e4bf735058865325f91f6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 13:01:28 +0200 Subject: [PATCH 250/375] nspr: format, cleanup --- pkgs/development/libraries/nspr/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index c68354a18b69..8048ef2a5e70 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,6 +1,9 @@ -{ lib, stdenv, fetchurl -, CoreServices ? null -, buildPackages }: +{ lib +, stdenv +, fetchurl +, CoreServices +, buildPackages +}: stdenv.mkDerivation rec { pname = "nspr"; @@ -37,13 +40,14 @@ stdenv.mkDerivation rec { moveToOutput share "$dev" # just aclocal ''; - buildInputs = [] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.mozilla.org/projects/nspr/"; + homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSPR_functions"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; + maintainers = with maintainers; [ ]; platforms = platforms.all; license = licenses.mpl20; }; From 4b84c7a0c814f5a470f469e48c5237ddc9f8611e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 13:01:37 +0200 Subject: [PATCH 251/375] nss: format, cleanup --- pkgs/development/libraries/nss/3.53.nix | 142 +++++++++++++----------- 1 file changed, 79 insertions(+), 63 deletions(-) diff --git a/pkgs/development/libraries/nss/3.53.nix b/pkgs/development/libraries/nss/3.53.nix index 5d44a4d2469d..4d22e9a1a7cf 100644 --- a/pkgs/development/libraries/nss/3.53.nix +++ b/pkgs/development/libraries/nss/3.53.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja +{ lib +, stdenv +, fetchurl +, nspr +, perl +, zlib +, sqlite +, darwin +, fixDarwinDylibNames +, buildPackages +, ninja , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false @@ -9,7 +19,8 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "nss"; version = "3.53.1"; @@ -44,55 +55,58 @@ in stdenv.mkDerivation rec { substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep" ''; - patches = - [ - # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch - ./85_security_load.patch - ./ckpem.patch - ./fix-cross-compilation.patch - ]; + patches = [ + # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch + ./85_security_load.patch + ./ckpem.patch + ./fix-cross-compilation.patch + ]; patchFlags = [ "-p0" ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" - substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" - ''; + substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" + substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" + ''; outputs = [ "out" "dev" "tools" ]; preConfigure = "cd nss"; - buildPhase = let - getArch = platform: if platform.isx86_64 then "x64" - else if platform.isx86_32 then "ia32" - else if platform.isAarch32 then "arm" - else if platform.isAarch64 then "arm64" - else if platform.isPower && platform.is64bit then ( + buildPhase = + let + getArch = platform: + if platform.isx86_64 then "x64" + else if platform.isx86_32 then "ia32" + else if platform.isAarch32 then "arm" + else if platform.isAarch64 then "arm64" + else if platform.isPower && platform.is64bit then + ( if platform.isLittleEndian then "ppc64le" else "ppc64" ) - else platform.parsed.cpu.name; - # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on - target = getArch stdenv.hostPlatform; - host = getArch stdenv.buildPlatform; - in '' - runHook preBuild + else platform.parsed.cpu.name; + # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on + target = getArch stdenv.hostPlatform; + host = getArch stdenv.buildPlatform; + in + '' + runHook preBuild - sed -i 's|nss_dist_dir="$dist_dir"|nss_dist_dir="'$out'"|;s|nss_dist_obj_dir="$obj_dir"|nss_dist_obj_dir="'$out'"|' build.sh - ./build.sh -v --opt \ - --with-nspr=${nspr.dev}/include:${nspr.out}/lib \ - --system-sqlite \ - --enable-legacy-db \ - --target ${target} \ - -Dhost_arch=${host} \ - -Duse_system_zlib=1 \ - --enable-libpkix \ - ${lib.optionalString enableFIPS "--enable-fips"} \ - ${lib.optionalString stdenv.isDarwin "--clang"} \ - ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} + sed -i 's|nss_dist_dir="$dist_dir"|nss_dist_dir="'$out'"|;s|nss_dist_obj_dir="$obj_dir"|nss_dist_obj_dir="'$out'"|' build.sh + ./build.sh -v --opt \ + --with-nspr=${nspr.dev}/include:${nspr.out}/lib \ + --system-sqlite \ + --enable-legacy-db \ + --target ${target} \ + -Dhost_arch=${host} \ + -Duse_system_zlib=1 \ + --enable-libpkix \ + ${lib.optionalString enableFIPS "--enable-fips"} \ + ${lib.optionalString stdenv.isDarwin "--clang"} \ + ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} - runHook postBuild - ''; + runHook postBuild + ''; NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\""; @@ -130,36 +144,38 @@ in stdenv.mkDerivation rec { chmod 0755 $out/bin/nss-config ''; - postFixup = let - isCross = stdenv.hostPlatform != stdenv.buildPlatform; - nss = if isCross then buildPackages.nss.tools else "$out"; - in - (lib.optionalString enableFIPS ('' - for libname in freebl3 nssdbm3 softokn3 - do '' + + postFixup = + let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; + nss = if isCross then buildPackages.nss.tools else "$out"; + in + (lib.optionalString enableFIPS ('' + for libname in freebl3 nssdbm3 softokn3 + do '' + (if stdenv.isDarwin - then '' - libfile="$out/lib/lib$libname.dylib" - DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ - '' else '' - libfile="$out/lib/lib$libname.so" - LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ - '') + '' - ${nss}/bin/shlibsign -v -i "$libfile" - done - '')) + - '' - moveToOutput bin "$tools" - moveToOutput bin/nss-config "$dev" - moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example - rm -f "$out"/lib/*.a + then '' + libfile="$out/lib/lib$libname.dylib" + DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '' else '' + libfile="$out/lib/lib$libname.so" + LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '') + '' + ${nss}/bin/shlibsign -v -i "$libfile" + done + '')) + + '' + moveToOutput bin "$tools" + moveToOutput bin/nss-config "$dev" + moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example + rm -f "$out"/lib/*.a - runHook postInstall - ''; + runHook postInstall + ''; meta = with lib; { - homepage = "https://developer.mozilla.org/en-US/docs/NSS"; + homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; + maintainers = with maintainers; [ ]; license = licenses.mpl20; platforms = platforms.all; }; From d7a6dc0bb96b6f879b2ad8e90772a66d3d3ba327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 13:01:51 +0200 Subject: [PATCH 252/375] nss: format, cleanup --- pkgs/development/libraries/nss/default.nix | 150 +++++++++++---------- 1 file changed, 82 insertions(+), 68 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 1d38ed4531f7..2df6214ab091 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,7 +1,16 @@ -{ lib, stdenv, fetchurl, nspr, perl, zlib -, sqlite, ninja -, darwin, fixDarwinDylibNames, buildPackages -, useP11kit ? true, p11-kit +{ lib +, stdenv +, fetchurl +, nspr +, perl +, zlib +, sqlite +, ninja +, darwin +, fixDarwinDylibNames +, buildPackages +, useP11kit ? true +, p11-kit , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false @@ -19,14 +28,14 @@ let # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert version = "3.68"; - underscoreVersion = builtins.replaceStrings ["."] ["_"] version; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "nss"; inherit version; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; + url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz"; sha256 = "0nvj7h2brcw21p1z99nrsxka056d0r1yy9nqqg0lw0w3mhnb60n4"; }; @@ -56,55 +65,58 @@ in stdenv.mkDerivation rec { substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep" ''; - patches = - [ - # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch - ./85_security_load.patch - ./ckpem.patch - ./fix-cross-compilation.patch - ]; + patches = [ + # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch + ./85_security_load.patch + ./ckpem.patch + ./fix-cross-compilation.patch + ]; patchFlags = [ "-p0" ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" - substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" - ''; + substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" + substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" + ''; outputs = [ "out" "dev" "tools" ]; preConfigure = "cd nss"; - buildPhase = let - getArch = platform: if platform.isx86_64 then "x64" - else if platform.isx86_32 then "ia32" - else if platform.isAarch32 then "arm" - else if platform.isAarch64 then "arm64" - else if platform.isPower && platform.is64bit then ( + buildPhase = + let + getArch = platform: + if platform.isx86_64 then "x64" + else if platform.isx86_32 then "ia32" + else if platform.isAarch32 then "arm" + else if platform.isAarch64 then "arm64" + else if platform.isPower && platform.is64bit then + ( if platform.isLittleEndian then "ppc64le" else "ppc64" ) - else platform.parsed.cpu.name; - # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on - target = getArch stdenv.hostPlatform; - host = getArch stdenv.buildPlatform; - in '' - runHook preBuild + else platform.parsed.cpu.name; + # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on + target = getArch stdenv.hostPlatform; + host = getArch stdenv.buildPlatform; + in + '' + runHook preBuild - sed -i 's|nss_dist_dir="$dist_dir"|nss_dist_dir="'$out'"|;s|nss_dist_obj_dir="$obj_dir"|nss_dist_obj_dir="'$out'"|' build.sh - ./build.sh -v --opt \ - --with-nspr=${nspr.dev}/include:${nspr.out}/lib \ - --system-sqlite \ - --enable-legacy-db \ - --target ${target} \ - -Dhost_arch=${host} \ - -Duse_system_zlib=1 \ - --enable-libpkix \ - ${lib.optionalString enableFIPS "--enable-fips"} \ - ${lib.optionalString stdenv.isDarwin "--clang"} \ - ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} + sed -i 's|nss_dist_dir="$dist_dir"|nss_dist_dir="'$out'"|;s|nss_dist_obj_dir="$obj_dir"|nss_dist_obj_dir="'$out'"|' build.sh + ./build.sh -v --opt \ + --with-nspr=${nspr.dev}/include:${nspr.out}/lib \ + --system-sqlite \ + --enable-legacy-db \ + --target ${target} \ + -Dhost_arch=${host} \ + -Duse_system_zlib=1 \ + --enable-libpkix \ + ${lib.optionalString enableFIPS "--enable-fips"} \ + ${lib.optionalString stdenv.isDarwin "--clang"} \ + ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} - runHook postBuild - ''; + runHook postBuild + ''; NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\" " + lib.optionalString stdenv.hostPlatform.is64bit "-DNSS_USE_64=1"; @@ -147,36 +159,38 @@ in stdenv.mkDerivation rec { ln -sf ${p11-kit}/lib/pkcs11/p11-kit-trust.so $out/lib/libnssckbi.so ''; - postFixup = let - isCross = stdenv.hostPlatform != stdenv.buildPlatform; - nss = if isCross then buildPackages.nss.tools else "$out"; - in - (lib.optionalString enableFIPS ('' - for libname in freebl3 nssdbm3 softokn3 - do '' + + postFixup = + let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; + nss = if isCross then buildPackages.nss.tools else "$out"; + in + (lib.optionalString enableFIPS ('' + for libname in freebl3 nssdbm3 softokn3 + do '' + (if stdenv.isDarwin - then '' - libfile="$out/lib/lib$libname.dylib" - DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ - '' else '' - libfile="$out/lib/lib$libname.so" - LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ - '') + '' - ${nss}/bin/shlibsign -v -i "$libfile" - done - '')) + - '' - moveToOutput bin "$tools" - moveToOutput bin/nss-config "$dev" - moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example - rm -f "$out"/lib/*.a + then '' + libfile="$out/lib/lib$libname.dylib" + DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '' else '' + libfile="$out/lib/lib$libname.so" + LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '') + '' + ${nss}/bin/shlibsign -v -i "$libfile" + done + '')) + + '' + moveToOutput bin "$tools" + moveToOutput bin/nss-config "$dev" + moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example + rm -f "$out"/lib/*.a - runHook postInstall - ''; + runHook postInstall + ''; meta = with lib; { - homepage = "https://developer.mozilla.org/en-US/docs/NSS"; + homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; + maintainers = with maintainers; [ ]; license = licenses.mpl20; platforms = platforms.all; }; From cf42c5992106c90b112abc93b0bed1c13905d0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 13:01:56 +0200 Subject: [PATCH 253/375] nss_wrapper: switch to pname + version --- pkgs/development/libraries/nss_wrapper/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 0e08083c4d82..a4538aa370cc 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { - name = "nss_wrapper-1.1.11"; + pname = "nss_wrapper"; + version = "1.1.11"; src = fetchurl { - url = "mirror://samba/cwrap/${name}.tar.gz"; + url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz"; sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv"; }; From 22a46ba471b89bf5536fbecc84f8639c335a67e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 13:04:10 +0200 Subject: [PATCH 254/375] nuclei: 2.4.2 -> 2.4.3 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 24ab55900f97..04a0df6c7db6 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "0qgpkxb3wm5lwg8kvhfnirw60l81nrs0qv4z07740amnqzd6by4b"; + sha256 = "1wg9kqwc2h2689xqb2m9fgxc4rhi3pnml08q3hg4fq6l31damaj5"; }; - vendorSha256 = "1ddr986rqmd57m8k4x78c4xkbja580ix6xdj5rbysfkr6g073qmq"; + vendorSha256 = "0pcxadyhppaf7iarl2y6f2crjzg85x4hrg1m1pg3mydqm4gvg5vx"; modRoot = "./v2"; subPackages = [ From 07ebaed9748fa97ccf3784b88193076211d2c865 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 11:05:35 +0000 Subject: [PATCH 255/375] antsimulator: 1.2 -> 3.1 --- pkgs/games/antsimulator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/antsimulator/default.nix b/pkgs/games/antsimulator/default.nix index b43b91d5cb99..bb17add2cc9d 100644 --- a/pkgs/games/antsimulator/default.nix +++ b/pkgs/games/antsimulator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "antsimulator"; - version = "1.2"; + version = "3.1"; src = fetchFromGitHub { owner = "johnBuffer"; repo = "AntSimulator"; rev = "v${version}"; - sha256 = "0wz80971rf86kb7mcnxwrq75vriwhmyir5s5n3wzml12rzfnj5f1"; + sha256 = "sha256-1KWoGbdjF8VI4th/ZjAzASgsLEuS3xiwObulzxQAppA="; }; nativeBuildInputs = [ cmake ]; From e2b0f0ea710e484b001fb92ab9874ac88d1fab4e Mon Sep 17 00:00:00 2001 From: Vonfry Date: Tue, 10 Aug 2021 19:22:52 +0800 Subject: [PATCH 256/375] zsh-fzf-tab: unstable-2021-04-01 -> unstable-2021-08-05 Bug fix --- pkgs/shells/zsh/zsh-fzf-tab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index ee0f702780f3..ccf60e6d76af 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -4,13 +4,13 @@ let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "unstable-2021-04-01"; + version = "unstable-2021-08-05"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; - rev = "0c36bdcf6a80ec009280897f07f56969f94d377e"; - sha256 = "0ymp9ky0jlkx9b63jajvpac5g3ll8snkf8q081g0yw42b9hwpiid"; + rev = "89a33154707c09789177a893e5a8ebbb131d5d3d"; + sha256 = "1g8011ldrghbw5ibchsp0p93r31cwyx2r1z5xplksd779jw79wdx"; }; buildInputs = [ ncurses ]; From 4ccee1f01274bc8b4150b2f4e272f665a2ceeec0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 10 Aug 2021 13:25:01 +0200 Subject: [PATCH 257/375] home-assistant: 2021.8.4 -> 2021.8.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 717f83d54870..6677be105bb9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.8.4"; + version = "2021.8.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 87dcd3f545d0..384766852c2e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -138,7 +138,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.8.4"; + hassVersion = "2021.8.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -155,7 +155,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0xnw6a1wfk0br0lyplhbp64fqbywa3ld3ggj0czyi1c0n8pqx7cq"; + sha256 = "0alyr87vm0szljw1lgdsv7085rl0m9r16nwdprwskhcjlwllk1bh"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 72e48629a6d2..926cb48ce30e 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210804.0"; + version = "20210809.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0VCukSHI4PXAecxHc1DJSQ1GrErenNb0K4OhSIgkQbs="; + sha256 = "sha256-5NWNDhQ7XKK9/tC+SbpwOm2MSA2VGHLcE1ggyl6vPkc="; }; # there is nothing to strip in this package From c3a7c4531ac79480592fe5a2e61d1fbea7535113 Mon Sep 17 00:00:00 2001 From: VergeDX Date: Tue, 10 Aug 2021 11:25:51 +0000 Subject: [PATCH 258/375] nodePackages.generator-code: init at 1.5.5 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1009 +++++++++++------ 2 files changed, 655 insertions(+), 355 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3ce357cecb23..95f6cb7ecf8f 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -104,6 +104,7 @@ , "fx" , "ganache-cli" , "gatsby-cli" +, "generator-code" , "get-graphql-schema" , "git-run" , "git-ssb" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 38e65ad8159f..5bf9d0be0546 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -238,13 +238,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apollo/client-3.4.5" = { + "@apollo/client-3.4.7" = { name = "_at_apollo_slash_client"; packageName = "@apollo/client"; - version = "3.4.5"; + version = "3.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.5.tgz"; - sha512 = "arvzqyh+SmcJ9jGmdP1QhboTCq6YoowidqbDTigJ8LqA4jywOvgy3GMSPKUtyyxter12rQ+42cXjGI9+ZMVuyA=="; + url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.7.tgz"; + sha512 = "EmqGxXD8hr05cIFWJFwtGXifc+Lo8hTCEuiaQMtKknHszJfqIFXSxqP+H+eJnjfuoxH74aTSsZKtJlnE83Vt6w=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -2731,6 +2731,15 @@ let sha512 = "v7+LQFbqZKmd/Tvf5/j1Xlbq6jXL/4d+gUtm2TNX4QiEC3ELWADmGr2dGlUyLl6aKTuYfsN72vAsO5zmavYkEg=="; }; }; + "@grpc/grpc-js-1.3.7" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.7.tgz"; + sha512 = "CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA=="; + }; + }; "@grpc/proto-loader-0.6.2" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -3127,22 +3136,22 @@ let sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.28" = { + "@joplin/fork-htmlparser2-4.1.30" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.28"; + version = "4.1.30"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.28.tgz"; - sha512 = "aY8o+hi42Rn0BCcjI33nXC/tHwm1mYoAMrqnEfNVQ1ZDGJbbKVnYWADf6o5tGMR+Klkn9lbbR9tn+U8hKHbFhA=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.30.tgz"; + sha512 = "zcuFx0Jxd+nmV+YRT2tjVjU6b1yB/pDxPE/PzBaiXzwLCpJrQKL7hUMsJiqfyyXbXwQkFRqu3pKVsBkuZjM0pw=="; }; }; - "@joplin/fork-sax-1.2.32" = { + "@joplin/fork-sax-1.2.34" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.32"; + version = "1.2.34"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.32.tgz"; - sha512 = "N6Nk2qdsmCM31zIYjyIEH2hTSFd9rZv6tcvN9bjsuxTQ97WW74d6fI8+ReBWz2cFs7joXxaPay0iNwwDDXV0Kg=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.34.tgz"; + sha512 = "H+uKVcUvvRzzBkydbkTDF1w6SeTYzLSnAeUHCjEFG8zEZ2HlOxNt+418Iy74U00tbl2m4/uKPoXhjNz8wQhFGQ=="; }; }; "@joplin/lib-2.1.1" = { @@ -3172,22 +3181,22 @@ let sha512 = "XxmquKGZxlrjUorx924ogAACc39p22pzWp06DJX/eElU2kLZ/s+RC0EXAFj503EuDj/dd2voV+Tciz0wfCPc0Q=="; }; }; - "@joplin/turndown-4.0.50" = { + "@joplin/turndown-4.0.52" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.50"; + version = "4.0.52"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.50.tgz"; - sha512 = "oqMCmkudn3OUxkI68mbBy5AWqnmgWBlIL9lz3XSoq3iYJZdXYCDyYUA0Wb64eRHf6muUN8V23WdeVjc02dsbEQ=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.52.tgz"; + sha512 = "e8F+si5xTer0OQlpSGKh2rSu7YnSCpkvh3n7N85x61Z2WvhV96RfXAhNvRahGdzF9WNVwJgudirapHDJ+zeO3A=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.32" = { + "@joplin/turndown-plugin-gfm-1.0.34" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.32"; + version = "1.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.32.tgz"; - sha512 = "5jodAeZz90xt4p5FSvnRi4V1NyiPS0L9O7WufG8lN55sacZ9pkXUvELex4PQ7kiHvmOv67x4XcvTjfqX/mnKnA=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.34.tgz"; + sha512 = "0UZDcrMS/rViZZ50UPUpNy5qG8pWatyAWVSxZiKNmQ1+SJIwb6pzukGH25s3SxDmvW8lr7bQkBOn11hDxNFrug=="; }; }; "@josephg/resolvable-1.0.1" = { @@ -4270,13 +4279,13 @@ let sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g=="; }; }; - "@netlify/plugins-list-3.2.1" = { + "@netlify/plugins-list-3.3.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-3.2.1.tgz"; - sha512 = "bmJGfMfXs3byjVUUOoNU78TMiIGx3yD0yl/2B5IKyXpkQw4a4UNgvIx53zmBCDwIub2HC2tTCFUZz9ESpfc3SQ=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-3.3.0.tgz"; + sha512 = "wuwDeBx8FK/jY1hQoI0w2MK+Q/6hcEnbaDDBzw+W0Ueu48r7QRIcZMin2OnOSMkTRpAHXqXyQUrm1lnULXKBfg=="; }; }; "@netlify/routing-local-proxy-0.31.0" = { @@ -5566,13 +5575,13 @@ let sha512 = "TVwlUvYnNjotd4010I9Vh0Dr0c2XByaUTEjpxLJm/Ti51Ka6vLIJ44JxuNZ6TmvkRh66yFZbaZUsVv6W4wNUVQ=="; }; }; - "@serverless/platform-client-china-2.2.1" = { + "@serverless/platform-client-china-2.2.2" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.1.tgz"; - sha512 = "S1q6LOxpgMc872s/pXZwwat4Mr5DE8IilqKcgEcaGhydRFp85QeOqtFtunTzQ0n9Uo7OCfuIwL4GUC/i093pWA=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.2.tgz"; + sha512 = "58B0UOueZIZiR8btPgSav53Jvzz8ce0LMVp2bPnWUyu4oKrmlCSgO/vYCeklyCd4kBDGZQ3aefHNxLMusE/XRQ=="; }; }; "@serverless/template-1.1.4" = { @@ -7933,13 +7942,13 @@ let sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw=="; }; }; - "@typescript-eslint/eslint-plugin-4.29.0" = { + "@typescript-eslint/eslint-plugin-4.29.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.29.0"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz"; - sha512 = "eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz"; + sha512 = "AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7951,13 +7960,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.29.0" = { + "@typescript-eslint/experimental-utils-4.29.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.29.0"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz"; - sha512 = "FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz"; + sha512 = "kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7969,22 +7978,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.29.0" = { + "@typescript-eslint/parser-4.29.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.29.0"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz"; - sha512 = "+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.1.tgz"; + sha512 = "3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg=="; }; }; - "@typescript-eslint/scope-manager-4.29.0" = { + "@typescript-eslint/scope-manager-4.29.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.29.0"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz"; - sha512 = "HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz"; + sha512 = "Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7996,13 +8005,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.29.0" = { + "@typescript-eslint/types-4.29.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.29.0"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz"; - sha512 = "2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.1.tgz"; + sha512 = "Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -8014,13 +8023,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.29.0" = { + "@typescript-eslint/typescript-estree-4.29.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.29.0"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz"; - sha512 = "8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz"; + sha512 = "lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -8032,13 +8041,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.29.0" = { + "@typescript-eslint/visitor-keys-4.29.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.29.0"; + version = "4.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz"; - sha512 = "LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz"; + sha512 = "zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8140,13 +8149,13 @@ let sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084"; }; }; - "@vercel/build-utils-2.12.1" = { + "@vercel/build-utils-2.12.2" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "2.12.1"; + version = "2.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.12.1.tgz"; - sha512 = "85FUGmNQWL+gWORGIfW2amNeDt3vBgliZ51j3D9s+2qcAv+Li+ghLfzjoP5w5E+DhO8OxHfy53WbqR5aprAWEA=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.12.2.tgz"; + sha512 = "KbSgG2ZCVXhUsdbnpv6gC7buygd31jaKiKhrd4Lzv1NwjnoeDZAXlm4hzvSPYHVtCY2jirKJWP2rFtMW8iAh9g=="; }; }; "@vercel/go-1.2.3" = { @@ -8158,13 +8167,13 @@ let sha512 = "BZCHRz43Qfr0DwZlZQCcofR+3cr+H+HK72/ZPkZy1Uq0NYjJMlmZ3ahuMgvJxT9lfC1RA6eOEUlUsZ+gqKcMCg=="; }; }; - "@vercel/node-1.12.0" = { + "@vercel/node-1.12.1" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-1.12.0.tgz"; - sha512 = "McwhEg6KI0y7R875IG87Ry3HrFvws+60/yKk1KqJxbOud/n/Mj9eEZTI5mxxMFj8tT7KhmFaRdl8pJz8ISR1Cg=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-1.12.1.tgz"; + sha512 = "NcawIY05BvVkWlsowaxF2hl/hJg475U8JvT2FnGykFPMx31q1/FtqyTw/awSrKfOSRXR0InrbEIDIelmS9NzPA=="; }; }; "@vercel/python-2.0.5" = { @@ -8221,31 +8230,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.1.5" = { + "@vue/compiler-core-3.2.1" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.5.tgz"; - sha512 = "TXBhFinoBaXKDykJzY26UEuQU1K07FOp/0Ie+OXySqqk0bS0ZO7Xvl7UmiTUPYcLrWbxWBR7Bs/y55AI0MNc2Q=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.1.tgz"; + sha512 = "UEJf2ZGww5wGVdrWIXIZo04KdJFGPmI2bHRUsBZ3AdyCAqJ5ykRXKOBn1OR1hvA2YzimudOEyHM+DpbBv91Kww=="; }; }; - "@vue/compiler-dom-3.1.5" = { + "@vue/compiler-dom-3.2.1" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.5.tgz"; - sha512 = "ZsL3jqJ52OjGU/YiT/9XiuZAmWClKInZM2aFJh9gnsAPqOrj2JIELMbkIFpVKR/CrVO/f2VxfPiiQdQTr65jcQ=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.1.tgz"; + sha512 = "tXg8tkPb3j54zNfWqoao9T1JI41yWPz8TROzmif/QNNA46eq8/SRuRsBd36i47GWaz7mh+yg3vOJ87/YBjcMyQ=="; }; }; - "@vue/shared-3.1.5" = { + "@vue/shared-3.2.1" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.5.tgz"; - sha512 = "oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.1.tgz"; + sha512 = "INN92dVBNgd0TW9BqfQQKx/HWGCHhUUbAV5EZ5FgSCiEdwuZsJbGt1mdnaD9IxGhpiyOjP2ClxGG8SFp7ELcWg=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -10903,6 +10912,15 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; + "array-union-3.0.1" = { + name = "array-union"; + packageName = "array-union"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz"; + sha512 = "1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw=="; + }; + }; "array-uniq-1.0.3" = { name = "array-uniq"; packageName = "array-uniq"; @@ -11650,13 +11668,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.963.0" = { + "aws-sdk-2.964.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.963.0"; + version = "2.964.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.963.0.tgz"; - sha512 = "EY7EPap1c/1RxPx+Py56t9btJug3Z3PJkCfplqzNuU1QlFGs+rN8yYm9xIn8J6gbJ5D8F4Qab0GCtTmGstlHfQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.964.0.tgz"; + sha512 = "yDRLkPUiGvIXpccFd1PqOQZ1MJvYkh0RVBNWfquDoPonQuJ9QOCZoPrpe3VlB8IGMOODbVRSH1NRqPa12gNjBA=="; }; }; "aws-sign2-0.6.0" = { @@ -17779,13 +17797,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.117" = { + "constructs-3.3.118" = { name = "constructs"; packageName = "constructs"; - version = "3.3.117"; + version = "3.3.118"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.117.tgz"; - sha512 = "y5PVROPr7XFlz2/ZAXNHhkb8Y7HzJs4kBrUcjI5B5tbQz/YXsOmZV73AGRYDiUvMstqvpq+UOVBhL3zoA9vg7Q=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.118.tgz"; + sha512 = "Fe3XE/kVbfFomPtogd3h+5X9JHyMSLO8swjKYqUexgifX4qwOjsUYMHfZpB0a3xNBHr/YfJjbVikfY8Wzr0wNA=="; }; }; "consume-http-header-1.0.0" = { @@ -21713,24 +21731,6 @@ let sha512 = "cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg=="; }; }; - "dockerfile-ast-0.1.0" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.1.0.tgz"; - sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ=="; - }; - }; - "dockerfile-ast-0.2.0" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.2.0.tgz"; - sha512 = "iQyp12k1A4tF3sEfLAq2wfFPKdpoiGTJeuiu2Y1bdEqIZu0DfSSL2zm0fk7a/UHeQkngnYaRRGuON+C+2LO1Fw=="; - }; - }; "dockerfile-ast-0.2.1" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -21740,31 +21740,31 @@ let sha512 = "ut04CVM1G6zIITTcYPDIXhPZk9mCa21m4dfW8FcDDGxwgTQhYyHDu6U7M8klZ7QsjqVcJhryKi+TGOX6bjgKdQ=="; }; }; - "dockerfile-language-service-0.3.0" = { - name = "dockerfile-language-service"; - packageName = "dockerfile-language-service"; + "dockerfile-ast-0.3.0" = { + name = "dockerfile-ast"; + packageName = "dockerfile-ast"; version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.3.0.tgz"; - sha512 = "BUStimzz1Ozh41o+2AgMfwW8M7KsqzOBllNlLkf7NDe6W9KvcC3d8j4MTc+cU9wfRUoVckK39M2btvRFFDK61w=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.3.0.tgz"; + sha512 = "wEbFtqeHZffyOYP2pMfMLQ0m2wdHUzty0UTDoAMNa6/nvLfDRSEaPkszIWFy86tuWwHucBtcczIHQlFATJ54eA=="; }; }; - "dockerfile-utils-0.2.0" = { - name = "dockerfile-utils"; - packageName = "dockerfile-utils"; - version = "0.2.0"; + "dockerfile-language-service-0.4.0" = { + name = "dockerfile-language-service"; + packageName = "dockerfile-language-service"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.2.0.tgz"; - sha512 = "B8tEGwLd3w0dWALshXS0gkAwDYdqFKAKm9zIyp/nCFkx8+BOhbz5CiAFlVU+WRvv6kd6AP/YtYVOzSL54MJlmQ=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.4.0.tgz"; + sha512 = "P4yj9in7PMLeN3StBn5e+Ofiju+nfs5ZdDv4EqfK91mYx/+U7wm8QipyP05iUXaVKFh6I9tn9Qmi1tpt5jj2hw=="; }; }; - "dockerfile-utils-0.4.2" = { + "dockerfile-utils-0.5.0" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.4.2.tgz"; - sha512 = "WfJEuXWdVdiarhxJgRlZ9bkMO/9un6dZDz+u3z6AYEXfsH2XRwYqdIvyOqFzaDDP0Hc6pR5rb9FJRSKyo+NuxA=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.5.0.tgz"; + sha512 = "a12B6qAwLpl7D9Y6Zxt0AhW74g0k5NarpWF+NUb66A6la5vs1igI/KfdXZbFoQtpTOsv1T+OfKmhlE982Ars1w=="; }; }; "doctoc-2.0.1" = { @@ -22514,13 +22514,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-13.1.8" = { + "electron-13.1.9" = { name = "electron"; packageName = "electron"; - version = "13.1.8"; + version = "13.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-13.1.8.tgz"; - sha512 = "ei2ZyyG81zUOlvm5Zxri668TdH5GNLY0wF+XrC2FRCqa8AABAPjJIWTRkhFEr/H6PDVPNZjMPvSs3XhHyVVk2g=="; + url = "https://registry.npmjs.org/electron/-/electron-13.1.9.tgz"; + sha512 = "By4Zb72XNQLrPb70BXdIW3NtEHFwybP5DIQjohnCxOYONq5vojuHjNcTuWnBgMvwQ2qwykk6Tw5EwF2Pt0CWjA=="; }; }; "electron-notarize-1.1.0" = { @@ -22559,13 +22559,22 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.799" = { + "electron-to-chromium-1.3.800" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.799"; + version = "1.3.800"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz"; - sha512 = "V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.800.tgz"; + sha512 = "qagikPjZJSDWP85uWoxs32oK/xk/y3MhDZELfKRCWI7pBc0ZFlmjnXb+3+aNMaiqboeDJJa0v7CJd5cO1HKwEQ=="; + }; + }; + "electron-to-chromium-1.3.801" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.801"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.801.tgz"; + sha512 = "xapG8ekC+IAHtJrGBMQSImNuN+dm+zl7UP1YbhvTkwQn8zf/yYuoxfTSAEiJ9VDD+kjvXaAhNDPSxJ+VImtAJA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23668,13 +23677,22 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.15.1" = { + "eslint-plugin-vue-7.15.2" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.15.1"; + version = "7.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.15.1.tgz"; - sha512 = "4/r+n/i+ovyeW2gVRRH92kpy4lkpFbyPR4BMxGBTLtGnwqOKKzjSo6EMSaT0RhWPvEjK9uifcY8e7z5n8BIEgw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.15.2.tgz"; + sha512 = "h5ws2GewwJ02HwnDo3WdPbc867MQieg9wrWgbpzh9ELBIiuy79EWK0zfyUxYzUWNd1EECCZ/8f50UCC7Hvbamw=="; + }; + }; + "eslint-plugin-vue-7.16.0" = { + name = "eslint-plugin-vue"; + packageName = "eslint-plugin-vue"; + version = "7.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.16.0.tgz"; + sha512 = "0E2dVvVC7I2Xm1HXyx+ZwPj9CNX4NJjs4K4r+GVsHWyt5Pew3JLD4fI7A91b2jeL0TXE7LlszrwLSTJU9eqehw=="; }; }; "eslint-scope-3.7.3" = { @@ -25144,6 +25162,15 @@ let sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; }; }; + "fast-plist-0.1.2" = { + name = "fast-plist"; + packageName = "fast-plist"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-plist/-/fast-plist-0.1.2.tgz"; + sha1 = "a45aff345196006d406ca6cdcd05f69051ef35b8"; + }; + }; "fast-printf-1.6.6" = { name = "fast-printf"; packageName = "fast-printf"; @@ -27772,6 +27799,15 @@ let sha1 = "f985fedcc0a9aa579dc88d7aff068d55cc6251a0"; }; }; + "github-username-6.0.0" = { + name = "github-username"; + packageName = "github-username"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-username/-/github-username-6.0.0.tgz"; + sha512 = "7TTrRjxblSI5l6adk9zd+cV5d6i1OrJSo3Vr9xdGqFLBQo0mz5P9eIfKCDJ7eekVGGFLbce0qbPSnktXV2BjDQ=="; + }; + }; "gl-matrix-2.8.1" = { name = "gl-matrix"; packageName = "gl-matrix"; @@ -28178,6 +28214,15 @@ let sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; }; }; + "globby-12.0.0" = { + name = "globby"; + packageName = "globby"; + version = "12.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-12.0.0.tgz"; + sha512 = "3mOIUduqSMHm6gNjIw9E641TZ93NB8lFVt+6MKIw6vUaIS5aSsw/6cl0gT86z1IoKlaL90BiOQlA593GUMlzEA=="; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -34074,13 +34119,13 @@ let sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ=="; }; }; - "jsii-srcmak-0.1.319" = { + "jsii-srcmak-0.1.320" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.319"; + version = "0.1.320"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.319.tgz"; - sha512 = "6FxGDXgt2utZnz0NC/wrBiILM3ZxQXsJF6eflNcadkhKhcjOwe9qCxSZWs6eDwJq6REckVn24iy+8H6pdpHbog=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.320.tgz"; + sha512 = "+XiaSKCrauom9xazpWr7O8pAEEDrrW1qYJ6O0vHG4YKZxJYJN7md6qwAurk3iamwtyuIW/Io2XEnB6ZypAk3bw=="; }; }; "json-bigint-0.2.3" = { @@ -34389,13 +34434,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.289" = { + "json2jsii-0.1.290" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.289"; + version = "0.1.290"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.289.tgz"; - sha512 = "HzFig1AW9qqN0Po2qLB3CD6C+UJcAA2dU+0kmpuOtY79WMVaKahj7yHQDvf0yZoEbFO5T4RyMwYyOCMOpCgY5w=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.290.tgz"; + sha512 = "r6Ab98tTR1NiD385ce5VpwH98Frhhmg7Kzq0t1Vte4FEx0icDcZIDIngqOoQWpMTMYFctTNggrswxkAvFeFBVA=="; }; }; "json3-3.2.6" = { @@ -40888,6 +40933,15 @@ let sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; }; }; + "multer-1.4.3" = { + name = "multer"; + packageName = "multer"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.4.3.tgz"; + sha512 = "np0YLKncuZoTzufbkM6wEKp68EhWJXcU6fq6QqrSwkckd2LlMgd1UqhUJLj6NS/5sZ8dE8LYDWslsltJznnXlg=="; + }; + }; "multi-progress-2.0.0" = { name = "multi-progress"; packageName = "multi-progress"; @@ -49559,13 +49613,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.160" = { + "pyright-1.1.161" = { name = "pyright"; packageName = "pyright"; - version = "1.1.160"; + version = "1.1.161"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.160.tgz"; - sha512 = "SBgUVitoBS+VvGEG1IoPJNgJ9PSjsjCqeJPZ7DWMz9s4SvYHeZz57VtWlGGGpgjT19nmH/zPe8Cxk4CLXmDhiA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.161.tgz"; + sha512 = "ahZ8KyDAMdyFTt9j0P/WL6SAeZWKI9qxoFRmTxw71JwyCVPSqXaeo2rK3304YjfKZKAtuHNMgtuZiAVT8U/Pbw=="; }; }; "q-0.9.7" = { @@ -49856,6 +49910,15 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; + "queue-tick-1.0.0" = { + name = "queue-tick"; + packageName = "queue-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.0.tgz"; + sha512 = "ULWhjjE8BmiICGn3G8+1L9wFpERNxkf8ysxkAer4+TFdRefDaXOCV5m92aMB9FtBVmn/8sETXLXY6BfW7hyaWQ=="; + }; + }; "quick-format-unescaped-4.0.3" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; @@ -53051,13 +53114,13 @@ let sha512 = "8xfDbAtBleXotb6qKEHWuo/jkn94a9dVqGc7Rwl3sqspCVlnCfbRek7ldhCARSi7h32H0xR4QThm1t9zHN+3uw=="; }; }; - "rollup-2.56.1" = { + "rollup-2.56.2" = { name = "rollup"; packageName = "rollup"; - version = "2.56.1"; + version = "2.56.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.56.1.tgz"; - sha512 = "KkrsNjeiTfGJMUFBi/PNfj3fnt70akqdoNXOjlzwo98uA1qrlkmgt6SGaK5OwhyDYCVnJb6jb2Xa2wbI47P4Nw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.2.tgz"; + sha512 = "s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -54968,6 +55031,15 @@ let sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; + "slash-4.0.0" = { + name = "slash"; + packageName = "slash"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"; + sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; + }; + }; "slasp-0.0.4" = { name = "slasp"; packageName = "slasp"; @@ -55319,13 +55391,13 @@ let sha512 = "MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA=="; }; }; - "snyk-policy-1.19.0" = { + "snyk-policy-1.22.0" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.19.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.19.0.tgz"; - sha512 = "XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg=="; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.22.0.tgz"; + sha512 = "torzlNhDWcoMQLcX2xsTbCXfKXE614+5YvLHxEefQPwC1JNkbCN5u3/pU0c+2RfC2cPCa1AKEBqIx5gvr6mNyQ=="; }; }; "snyk-python-plugin-1.19.11" = { @@ -56048,13 +56120,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.9" = { + "spdx-license-ids-3.0.10" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; - sha512 = "Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; + sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; }; }; "spdx-license-list-6.4.0" = { @@ -56651,13 +56723,13 @@ let sha512 = "/QX6+DJkghqq1ZTbgYpOvaI+gx2O7ee1TRUM9yiOlVjh1XAQBevcBj0zO+W3TsNllX86urqBrySd/AEfFfUpIw=="; }; }; - "ssb-ref-2.14.3" = { + "ssb-ref-2.16.0" = { name = "ssb-ref"; packageName = "ssb-ref"; - version = "2.14.3"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.3.tgz"; - sha512 = "XhzVmezsUJLlKxTfWlicxhiPRTEYHfJLskYQNRSnw4USqgo9LVx53+MJAhdZOYpZTW2jINR0TeetWs9M27gcbA=="; + url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.16.0.tgz"; + sha512 = "ylyrfz9NLxwTCbeDDAdLo++O3elhNs6/gUqMhZ22F+gSOIjwXy2X7dpg5Q1YTH7uALOSu307Rpo1UfK9sj7Sjw=="; }; }; "ssb-replicate-1.3.3" = { @@ -56696,13 +56768,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.40" = { + "sscaff-1.2.41" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.40"; + version = "1.2.41"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.40.tgz"; - sha512 = "XAt/qwEqrzt7uXEkhLW1oVXi1f/Q1qtTaw8TjIuRjryNpbzF0mvFvag4rF/2jWdWC/TJ7HIQXx3mAce3rPb45A=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.41.tgz"; + sha512 = "l0TA0Wp/06N+P9qrpX70/ueNOukRkfF3aasxtfVSbvrwy2gi8xCA31/rTtJ/Kb2OcqU1vdxWIDUOB82JCG+wqg=="; }; }; "ssh-config-1.1.6" = { @@ -57353,13 +57425,13 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; - "streamx-2.11.0" = { + "streamx-2.11.1" = { name = "streamx"; packageName = "streamx"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.11.0.tgz"; - sha512 = "Cv8hFlHwVRKg35EXAxCSmRRzCR8Nyphx3v58hkx8nqfRe3GM8kAPfDY16GvpU2V4m/U8Ri9Fdoi+K5X3z8VpMA=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.11.1.tgz"; + sha512 = "GG/cBcuwhKEu2MxJIdlFnrstgtwERx0yX0tjZUVFHmmq65ROrCEAVrfoYbNQnXdq76rH0Y/SuO9VcgW+ZPkeMQ=="; }; }; "strftime-0.10.0" = { @@ -58127,13 +58199,13 @@ let sha1 = "3a26ab96e06f78cf4ace8d083f6227fa55970947"; }; }; - "sucrase-3.20.0" = { + "sucrase-3.20.1" = { name = "sucrase"; packageName = "sucrase"; - version = "3.20.0"; + version = "3.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/sucrase/-/sucrase-3.20.0.tgz"; - sha512 = "Rsp+BX7DRuCleJvBAHN7gQ3ddk7U0rJev19XlIBF6dAq9vX4Tr5mHk4E7+ig/I7BM3DLYotCmm20lfBElT2XtQ=="; + url = "https://registry.npmjs.org/sucrase/-/sucrase-3.20.1.tgz"; + sha512 = "BIG59HaJOxNct9Va6KvT5yzBA/rcMGetzvZyTx0ZdCcspIbpJTPS64zuAfYlJuOj+3WaI5JOdA+F0bJQQi8ZiQ=="; }; }; "sudo-block-1.2.0" = { @@ -58875,13 +58947,13 @@ let sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA=="; }; }; - "tar-4.4.15" = { + "tar-4.4.16" = { name = "tar"; packageName = "tar"; - version = "4.4.15"; + version = "4.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.15.tgz"; - sha512 = "ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.16.tgz"; + sha512 = "gOVUT/KWPkGFZQmCRDVFNUWBl7niIo/PRR7lzrIqtZpit+st54lGROuVjc6zEQM9FhH+dJfQIl+9F0k8GNXg5g=="; }; }; "tar-4.4.6" = { @@ -58911,13 +58983,13 @@ let sha512 = "EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q=="; }; }; - "tar-6.1.6" = { + "tar-6.1.7" = { name = "tar"; packageName = "tar"; - version = "6.1.6"; + version = "6.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz"; - sha512 = "oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.7.tgz"; + sha512 = "PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA=="; }; }; "tar-fs-1.16.3" = { @@ -67013,6 +67085,15 @@ let sha512 = "XIJoCQDNlttjFubWL+tpf+t1MkFUdsqwtJvR2qhfzhHi8Z7ZzAwiBPgCtTiLK1mwPTfqzV/V0E9l7zX7hrhBdg=="; }; }; + "yeoman-generator-5.4.0" = { + name = "yeoman-generator"; + packageName = "yeoman-generator"; + version = "5.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.4.0.tgz"; + sha512 = "ZOzoe8pAenTw8q7X3TdG3u5S7EM/ErCNue7Jvcb/ZDfank6Nnu3J249PtgTbyAuN+VYVZ/VVFIAJxjlrqJpldQ=="; + }; + }; "yesno-0.3.1" = { name = "yesno"; packageName = "yesno"; @@ -67426,7 +67507,7 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" - sources."tar-6.1.6" + sources."tar-6.1.7" sources."through-2.3.8" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" @@ -68302,6 +68383,7 @@ in sources."readable-stream-3.6.0" ]; }) + sources."queue-tick-1.0.0" sources."random-access-file-2.2.0" sources."random-access-memory-3.1.2" sources."random-access-storage-1.4.1" @@ -68370,7 +68452,7 @@ in sources."stream-collector-1.0.1" sources."stream-equal-1.1.1" sources."stream-shift-1.0.1" - sources."streamx-2.11.0" + sources."streamx-2.11.1" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -68581,7 +68663,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.800" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -69005,13 +69087,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.1.5" // { + (sources."@vue/compiler-core-3.2.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.1.5" - sources."@vue/shared-3.1.5" + sources."@vue/compiler-dom-3.2.1" + sources."@vue/shared-3.2.1" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -69261,7 +69343,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.800" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -69826,7 +69908,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -70285,7 +70367,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.800" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -70416,7 +70498,7 @@ in sources."browserslist-4.16.7" sources."caniuse-lite-1.0.30001249" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.800" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -70450,7 +70532,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.963.0" // { + (sources."aws-sdk-2.964.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -71841,7 +71923,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -72484,7 +72566,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."standard-error-1.1.0" @@ -72896,7 +72978,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" @@ -73000,7 +73082,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.117" + sources."constructs-3.3.118" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -73075,13 +73157,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.319" // { + (sources."jsii-srcmak-0.1.320" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.289" + sources."json2jsii-0.1.290" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -73117,7 +73199,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.40" + sources."sscaff-1.2.41" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -73172,7 +73254,7 @@ in sha512 = "53HldFlYJdptaQ9yZyx8xuN0pxmBwI7yaVImmPwGmauoOYWsO89YrAjyPIiAaR+GWI8avbQeg3jz5Z1Q+MoIGA=="; }; dependencies = [ - sources."@apollo/client-3.4.5" + sources."@apollo/client-3.4.7" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -73380,7 +73462,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.117" + sources."constructs-3.3.118" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -73580,7 +73662,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.319" // { + (sources."jsii-srcmak-0.1.320" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -73738,7 +73820,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.40" + sources."sscaff-1.2.41" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -74080,10 +74162,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.12"; + version = "0.18.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.12.tgz"; - sha512 = "zVTZb+SUwBt6ZljFG+u+vBMj+DLr4IEDqjpBsgnZ+tOldKSbPUtsvbeXOR/PxkLN4unxKxaZBkG1BaP34YrYpw=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.14.tgz"; + sha512 = "nfJl0hw1/fMhXbaSNEVBHUQTUIGfiBRVQ5KLmYO4gJ7pNvhIcEUas+DKKONDr3WtmV3ZlEWmR0SbvVnaRzKB5w=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -74534,7 +74616,7 @@ in sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-6.1.6" + sources."tar-6.1.7" sources."traverse-0.3.9" sources."tslib-2.3.0" sources."unbox-primitive-1.0.1" @@ -74770,7 +74852,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -75365,7 +75447,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."specificity-0.3.2" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -75569,13 +75651,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.159"; + version = "1.1.161"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.159.tgz"; - sha512 = "0CoePhEzGBHBin0mGtGhUV+hkg6Uh8+Qz0tN4a1A+vqiip/juRRmokB/yxMyFbhUftDXmkiF/JmrSC04uYCTAw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.161.tgz"; + sha512 = "CFWLqQ3t0o73tioZHqJip0avZ7K9p9sBCMz81voAkBDoaSvUvrqT/SGpbhwXjzsvwBF6H1WY9aEK8FDMVAh+XA=="; }; dependencies = [ - sources."pyright-1.1.160" + sources."pyright-1.1.161" ]; buildInputs = globalBuildInputs; meta = { @@ -75819,7 +75901,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -76002,7 +76084,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."specificity-0.4.1" sources."string-width-4.2.2" (sources."string_decoder-1.3.0" // { @@ -76265,7 +76347,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.15.1" // { + (sources."eslint-plugin-vue-7.15.2" // { dependencies = [ sources."semver-6.3.0" ]; @@ -76410,10 +76492,10 @@ in coc-vimlsp = nodeEnv.buildNodePackage { name = "coc-vimlsp"; packageName = "coc-vimlsp"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.12.2.tgz"; - sha512 = "vfWz0wpyuyj1U/8v6kXaBnJrhlTK40FWezeKKW/UNLLi9v3rWiV4QoV3uTmJqIMbvW97mhIzD5EynXgqPlD8Bg=="; + url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.12.3.tgz"; + sha512 = "mq6V4fQmcQSiGvilJ0j1pbbj5EHeS8QC6ThuLVBJ+2wRqO8fiTkPYJrXPDUQDcICV9hUjdTBE8klaFYlK6oviA=="; }; buildInputs = globalBuildInputs; meta = { @@ -77181,7 +77263,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sshpk-1.16.1" sources."ssri-8.0.1" sources."statuses-1.5.0" @@ -77195,7 +77277,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."systeminformation-4.34.23" - sources."tar-6.1.6" + sources."tar-6.1.7" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -77581,7 +77663,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -78899,8 +78981,8 @@ in sources."dom4-2.1.6" sources."duplexer3-0.1.4" sources."earcut-2.2.3" - sources."electron-13.1.8" - sources."electron-to-chromium-1.3.799" + sources."electron-13.1.9" + sources."electron-to-chromium-1.3.801" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -79440,30 +79522,20 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.4.1.tgz"; - sha512 = "7mB+HdMd4dfjChK1+37++ylA+sy7wFaf0/3HDy6cJDj5dTx4C4vVDmDKQpZgNJU1gIkxDnW6QCLCxpoe5FPyVA=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.5.0.tgz"; + sha512 = "aDwANs1c1xIh5lQTbMlsGx8tMDk1k+sjsYbIXYjWvGY9Ff2e40MQ6RgALItVVij1dj1049FkG9MOHLFqekxZoA=="; }; dependencies = [ - (sources."dockerfile-ast-0.2.0" // { + (sources."dockerfile-ast-0.3.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0" ]; }) - (sources."dockerfile-language-service-0.3.0" // { + sources."dockerfile-language-service-0.4.0" + (sources."dockerfile-utils-0.5.0" // { dependencies = [ - (sources."dockerfile-utils-0.4.2" // { - dependencies = [ - sources."dockerfile-ast-0.2.1" - sources."vscode-languageserver-types-3.16.0" - ]; - }) - ]; - }) - (sources."dockerfile-utils-0.2.0" // { - dependencies = [ - sources."dockerfile-ast-0.1.0" sources."vscode-languageserver-types-3.16.0" ]; }) @@ -79474,6 +79546,7 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) + sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.17.0-next.1" ]; buildInputs = globalBuildInputs; @@ -80047,7 +80120,7 @@ in (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" - sources."tar-4.4.15" + sources."tar-4.4.16" ]; }) sources."nopt-4.0.3" @@ -80174,7 +80247,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."speedometer-0.1.4" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" @@ -80194,7 +80267,7 @@ in sources."sudo-prompt-9.2.1" sources."sumchecker-3.0.1" sources."supports-color-7.2.0" - (sources."tar-6.1.6" // { + (sources."tar-6.1.7" // { dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" @@ -80421,7 +80494,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -80598,7 +80671,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -80931,7 +81004,7 @@ in sources."minizlib-2.1.2" sources."p-map-4.0.0" sources."rimraf-3.0.2" - sources."tar-6.1.6" + sources."tar-6.1.7" ]; }) sources."cache-base-1.0.1" @@ -82044,7 +82117,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."split2-3.2.2" sources."sprintf-js-1.0.3" @@ -82122,9 +82195,10 @@ in sources."swagger-ui-dist-3.34.0" sources."tail-2.2.3" sources."tapable-1.1.3" - (sources."tar-4.4.15" // { + (sources."tar-4.4.16" // { dependencies = [ sources."mkdirp-0.5.5" + sources."safe-buffer-5.2.1" sources."yallist-3.1.1" ]; }) @@ -83439,7 +83513,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -84662,7 +84736,7 @@ in ]; }) sources."subscriptions-transport-ws-0.9.8" - (sources."sucrase-3.20.0" // { + (sources."sucrase-3.20.1" // { dependencies = [ sources."commander-4.1.1" ]; @@ -84692,7 +84766,7 @@ in }) sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."tar-6.1.6" // { + (sources."tar-6.1.7" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -85155,7 +85229,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -85287,7 +85361,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -86010,7 +86084,7 @@ in sources."google-auth-library-7.5.0" ]; }) - sources."@grpc/grpc-js-1.3.6" + sources."@grpc/grpc-js-1.3.7" sources."@grpc/proto-loader-0.6.4" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/move-file-1.1.2" // { @@ -86129,7 +86203,7 @@ in (sources."cacache-15.2.0" // { dependencies = [ sources."mkdirp-1.0.4" - sources."tar-6.1.6" + sources."tar-6.1.7" ]; }) (sources."cacheable-request-6.1.0" // { @@ -86598,7 +86672,7 @@ in dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" - sources."tar-6.1.6" + sources."tar-6.1.7" sources."which-2.0.2" ]; }) @@ -86779,7 +86853,7 @@ in sources."has-flag-2.0.0" ]; }) - (sources."tar-4.4.15" // { + (sources."tar-4.4.16" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -87101,7 +87175,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" @@ -88092,7 +88166,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -88586,6 +88660,193 @@ in bypassCache = true; reconstructLock = true; }; + generator-code = nodeEnv.buildNodePackage { + name = "generator-code"; + packageName = "generator-code"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.5.5.tgz"; + sha512 = "KxmZfEzhV0JYIonYtKBihZAFFVt0tqKoGL1OAbW8RdFQAgR/Yt5H0zF5K/7q7/M446JRcHCrI/pn9dmWmCXiDA=="; + }; + dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.9" + (sources."@babel/highlight-7.14.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@octokit/auth-token-2.4.5" + sources."@octokit/core-3.5.1" + sources."@octokit/endpoint-6.0.12" + sources."@octokit/graphql-4.6.4" + sources."@octokit/openapi-types-9.4.0" + sources."@octokit/plugin-paginate-rest-2.15.0" + sources."@octokit/plugin-request-log-1.0.4" + sources."@octokit/plugin-rest-endpoint-methods-5.7.0" + sources."@octokit/request-5.6.0" + sources."@octokit/request-error-2.1.0" + sources."@octokit/rest-18.9.0" + sources."@octokit/types-6.24.0" + sources."@types/normalize-package-data-2.4.1" + sources."agent-base-4.3.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-4.3.0" + sources."balanced-match-1.0.2" + sources."before-after-hook-2.2.2" + sources."brace-expansion-1.1.11" + sources."chalk-4.1.2" + sources."cli-boxes-1.0.0" + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."concat-map-0.0.1" + sources."cross-spawn-7.0.3" + sources."dargs-7.0.0" + sources."debug-3.1.0" + sources."deprecation-2.3.1" + sources."end-of-stream-1.4.4" + sources."error-ex-1.3.2" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."execa-4.1.0" + sources."fast-plist-0.1.2" + sources."find-up-4.1.0" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."get-stdin-4.0.1" + sources."get-stream-5.2.0" + sources."github-username-6.0.0" + sources."glob-7.1.7" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-4.0.0" + sources."hosted-git-info-2.8.9" + sources."http-proxy-agent-2.1.0" + sources."https-proxy-agent-2.2.4" + sources."human-signals-1.1.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."interpret-1.4.0" + sources."is-arrayish-0.2.1" + sources."is-core-module-2.5.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-plain-object-5.0.0" + sources."is-stream-2.0.1" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lru-cache-6.0.0" + sources."merge-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."ms-2.0.0" + sources."node-fetch-2.6.1" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."npm-run-path-4.0.1" + sources."number-is-nan-1.0.1" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."pad-component-0.0.1" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" + sources."pump-3.0.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + sources."read-pkg-up-7.0.1" + sources."rechoir-0.6.2" + sources."request-light-0.4.0" + sources."resolve-1.20.0" + sources."run-async-2.4.1" + sources."sanitize-filename-1.6.3" + sources."semver-7.3.5" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."shelljs-0.8.4" + sources."signal-exit-3.0.3" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.10" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."strip-final-newline-2.0.0" + sources."supports-color-7.2.0" + sources."taketalk-1.0.0" + sources."text-table-0.2.0" + sources."truncate-utf8-bytes-1.0.2" + sources."type-fest-0.8.1" + sources."universal-user-agent-6.0.0" + sources."utf8-byte-length-1.0.4" + sources."validate-npm-package-license-3.0.4" + sources."vscode-nls-4.1.2" + sources."which-2.0.2" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + ]; + }) + sources."wrappy-1.0.2" + sources."yallist-4.0.0" + (sources."yeoman-generator-5.4.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + (sources."yosay-2.0.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."supports-color-2.0.0" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Yeoman generator for Visual Studio Code Extensions"; + homepage = "http://code.visualstudio.com"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; get-graphql-schema = nodeEnv.buildNodePackage { name = "get-graphql-schema"; packageName = "get-graphql-schema"; @@ -88806,7 +89067,7 @@ in }) sources."ssb-msgs-5.2.0" sources."ssb-pull-requests-1.0.0" - sources."ssb-ref-2.14.3" + sources."ssb-ref-2.16.0" (sources."stream-to-pull-stream-1.7.3" // { dependencies = [ sources."looper-3.0.0" @@ -89157,7 +89418,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."statuses-1.5.0" sources."string-width-4.2.2" sources."string_decoder-1.3.0" @@ -90468,7 +90729,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -90865,7 +91126,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -91954,7 +92215,7 @@ in ]; }) sources."supports-color-7.2.0" - sources."tar-4.4.15" + sources."tar-4.4.16" sources."through-2.3.8" sources."through2-3.0.2" sources."tmp-0.0.33" @@ -92335,10 +92596,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "2.1.2"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-2.1.2.tgz"; - sha512 = "8xDS/I9zMH0wHuZGZ0xENBn/Ml4gHk2WLMDfShN7L2VNRK/9xowunf2c/fAwI0eNXn/aw2QcMrcgqj37uZ0gbw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-2.2.1.tgz"; + sha512 = "6meo5eWRPmmZACLY+5atvtaecNsclzxcwYeFOUyAPf1JctSH/nCGow2nVkZoLtwNJGgXAnIEzwn08CpNIecDEQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -92399,8 +92660,8 @@ in sources."@babel/types-7.15.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.28" - sources."@joplin/fork-sax-1.2.32" + sources."@joplin/fork-htmlparser2-4.1.30" + sources."@joplin/fork-sax-1.2.34" (sources."@joplin/lib-2.1.1" // { dependencies = [ (sources."@joplin/renderer-1.8.2" // { @@ -92417,13 +92678,13 @@ in sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - (sources."@joplin/turndown-4.0.50" // { + (sources."@joplin/turndown-4.0.52" // { dependencies = [ sources."css-2.2.4" sources."source-map-0.6.1" ]; }) - sources."@joplin/turndown-plugin-gfm-1.0.32" + sources."@joplin/turndown-plugin-gfm-1.0.34" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -92518,14 +92779,12 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.963.0" // { + (sources."aws-sdk-2.964.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" - sources."sax-1.2.1" sources."uuid-3.3.2" sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" ]; }) sources."aws-sign2-0.7.0" @@ -92733,7 +92992,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ @@ -93130,6 +93389,7 @@ in (sources."needle-2.8.0" // { dependencies = [ sources."debug-3.2.7" + sources."sax-1.2.4" ]; }) sources."neo-async-2.6.2" @@ -93318,7 +93578,7 @@ in sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.2.1" sources."saxes-3.1.11" sources."semver-7.3.5" sources."server-destroy-1.0.1" @@ -93460,7 +93720,7 @@ in sources."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" - (sources."tar-4.4.15" // { + (sources."tar-4.4.16" // { dependencies = [ sources."yallist-3.1.1" ]; @@ -93574,8 +93834,12 @@ in sources."write-file-atomic-2.4.3" sources."ws-7.5.3" sources."xml-name-validator-3.0.0" - sources."xml2js-0.4.23" - sources."xmlbuilder-11.0.1" + (sources."xml2js-0.4.23" // { + dependencies = [ + sources."xmlbuilder-11.0.1" + ]; + }) + sources."xmlbuilder-9.0.7" sources."xmlchars-2.2.0" sources."yallist-4.0.0" sources."yaml-1.10.2" @@ -94596,7 +94860,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { @@ -96527,7 +96791,7 @@ in sources."resolve-from-4.0.0" sources."rimraf-2.7.1" sources."semver-5.7.1" - sources."tar-4.4.15" + sources."tar-4.4.16" sources."which-1.3.1" sources."yallist-3.1.1" ]; @@ -96651,7 +96915,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-1.0.1" sources."split-on-first-1.1.0" sources."split2-3.2.2" @@ -96673,7 +96937,7 @@ in sources."strip-indent-3.0.0" sources."strong-log-transformer-2.1.0" sources."supports-color-7.2.0" - sources."tar-6.1.6" + sources."tar-6.1.7" sources."temp-dir-1.0.0" (sources."temp-write-4.0.0" // { dependencies = [ @@ -98087,7 +98351,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -98599,7 +98863,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -99328,10 +99592,10 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.11.0"; + version = "8.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.11.0.tgz"; - sha512 = "UyYOnVhvKcfh9e2S4QnK53uRa2hvdgQVo3ZT+FcaP56ZeBDNWKB3IZI/sNzAbxqJBEuRpW6HxoEzHCleis1dFw=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.11.4.tgz"; + sha512 = "4Ke9t29EF84LUbUE4mQOQYVdIJcZpJyOs1dyVq4KqDDKWtyQDrXbdt1JGJ1NxyKqJt9vEmR2e3BZyiLd9vJ/CQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -99575,7 +99839,7 @@ in sources."devtools-protocol-0.0.901419" sources."dir-glob-3.0.1" sources."dompurify-2.3.0" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -100622,10 +100886,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.0.8"; + version = "6.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.8.tgz"; - sha512 = "pYqdFgEw/2pWjSZQ4r+UEmXy1UkR4WDSf8INBJOEJvIzw4HaBD/pjsUadwkGvMX/iUjSy2/dD9SLZbESFA8lTA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.9.tgz"; + sha512 = "eOZSTnEZO6bPMJWvsKxYgm0+lG3uv6anqEylomDEZEszfd8jXO8B5DIpGholtoCC9WKTeiE7XfizrdTXLFI3UQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -100834,7 +101098,7 @@ in sources."@types/node-14.17.9" ]; }) - sources."@netlify/plugins-list-3.2.1" + sources."@netlify/plugins-list-3.3.0" sources."@netlify/routing-local-proxy-0.31.0" (sources."@netlify/run-utils-2.0.0" // { dependencies = [ @@ -101035,8 +101299,8 @@ in sources."@types/semver-7.3.8" sources."@types/yargs-13.0.12" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.29.0" - (sources."@typescript-eslint/typescript-estree-4.29.0" // { + sources."@typescript-eslint/types-4.29.1" + (sources."@typescript-eslint/typescript-estree-4.29.1" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -101053,7 +101317,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.29.0" + sources."@typescript-eslint/visitor-keys-4.29.1" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" @@ -101451,7 +101715,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -102270,7 +102534,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.56.1" + sources."rollup-2.56.2" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -102375,7 +102639,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."split2-1.1.1" sources."sprintf-js-1.0.3" @@ -102727,7 +102991,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.6" + sources."tar-6.1.7" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."util-deprecate-1.0.2" @@ -102985,7 +103249,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -103131,7 +103395,11 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.15" + (sources."tar-4.4.16" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."util-deprecate-1.0.2" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -103700,7 +103968,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -103710,7 +103978,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.1.6" // { + (sources."tar-6.1.7" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -104383,7 +104651,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-1.0.1" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" @@ -104766,7 +105034,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.6" + sources."tar-6.1.7" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" @@ -105444,7 +105712,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106684,7 +106952,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -108202,10 +108470,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.160"; + version = "1.1.161"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.160.tgz"; - sha512 = "SBgUVitoBS+VvGEG1IoPJNgJ9PSjsjCqeJPZ7DWMz9s4SvYHeZz57VtWlGGGpgjT19nmH/zPe8Cxk4CLXmDhiA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.161.tgz"; + sha512 = "ahZ8KyDAMdyFTt9j0P/WL6SAeZWKI9qxoFRmTxw71JwyCVPSqXaeo2rK3304YjfKZKAtuHNMgtuZiAVT8U/Pbw=="; }; buildInputs = globalBuildInputs; meta = { @@ -109107,7 +109375,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110898,7 +111166,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -110980,10 +111248,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.56.1"; + version = "2.56.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.56.1.tgz"; - sha512 = "KkrsNjeiTfGJMUFBi/PNfj3fnt70akqdoNXOjlzwo98uA1qrlkmgt6SGaK5OwhyDYCVnJb6jb2Xa2wbI47P4Nw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.2.tgz"; + sha512 = "s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -111039,13 +111307,13 @@ in sources."@types/node-fetch-2.5.12" sources."@types/resolve-1.17.1" sources."@types/vscode-1.59.0" - sources."@typescript-eslint/eslint-plugin-4.29.0" - sources."@typescript-eslint/experimental-utils-4.29.0" - sources."@typescript-eslint/parser-4.29.0" - sources."@typescript-eslint/scope-manager-4.29.0" - sources."@typescript-eslint/types-4.29.0" - sources."@typescript-eslint/typescript-estree-4.29.0" - sources."@typescript-eslint/visitor-keys-4.29.0" + sources."@typescript-eslint/eslint-plugin-4.29.1" + sources."@typescript-eslint/experimental-utils-4.29.1" + sources."@typescript-eslint/parser-4.29.1" + sources."@typescript-eslint/scope-manager-4.29.1" + sources."@typescript-eslint/types-4.29.1" + sources."@typescript-eslint/typescript-estree-4.29.1" + sources."@typescript-eslint/visitor-keys-4.29.1" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -111758,7 +112026,7 @@ in sources."jwt-decode-2.2.0" ]; }) - (sources."@serverless/platform-client-china-2.2.1" // { + (sources."@serverless/platform-client-china-2.2.2" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" @@ -111843,7 +112111,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.963.0" // { + (sources."aws-sdk-2.964.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -112461,7 +112729,7 @@ in sources."untildify-3.0.3" ]; }) - (sources."tar-6.1.6" // { + (sources."tar-6.1.7" // { dependencies = [ sources."chownr-2.0.0" sources."mkdirp-1.0.4" @@ -113198,10 +113466,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.676.0"; + version = "1.677.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.676.0.tgz"; - sha512 = "3B+YZ5mf/fXcb6PmbXBhZHQPY9BuK5g+KeI+HsLlNeLIEqc+PPxyL0XKv8W1VKFsaY8J1d3JQ68fjXeJie2OoA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.677.0.tgz"; + sha512 = "2CALWUc+gOmOmpK9ehsJiaU0SYJEEmpJYalVw1Gh8pk4S/8bZWx5OdaQyD3ep29ZX5BCVSDQvOE22NPtTs8X7g=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -113809,9 +114077,10 @@ in sources."tslib-2.3.0" ]; }) - (sources."snyk-policy-1.19.0" // { + (sources."snyk-policy-1.22.0" // { dependencies = [ sources."lru-cache-5.1.1" + sources."semver-7.3.5" sources."snyk-try-require-2.0.1" sources."yallist-3.1.1" ]; @@ -113873,7 +114142,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.6" + sources."tar-6.1.7" sources."tar-stream-2.2.0" sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { @@ -114129,7 +114398,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."speedtest-net-1.6.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -114953,7 +115222,7 @@ in }) sources."ssb-plugins-1.0.0" sources."ssb-query-2.4.5" - sources."ssb-ref-2.14.3" + sources."ssb-ref-2.16.0" sources."ssb-replicate-1.3.3" sources."ssb-unix-socket-1.0.0" (sources."ssb-validate-4.1.4" // { @@ -115164,7 +115433,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.963.0" // { + (sources."aws-sdk-2.964.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -115532,7 +115801,7 @@ in sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."ms-2.1.3" - sources."multer-1.4.2" + sources."multer-1.4.3" sources."mustache-2.3.2" sources."mv-2.1.1" sources."my-local-ip-1.0.0" @@ -115726,7 +115995,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -116041,7 +116310,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -116222,7 +116491,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."specificity-0.4.1" sources."string-width-4.2.2" (sources."string_decoder-1.3.0" // { @@ -116818,7 +117087,12 @@ in }) sources."mpath-0.5.2" sources."ms-2.0.0" - sources."multer-1.4.2" + (sources."multer-1.4.3" // { + dependencies = [ + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + ]; + }) sources."mute-stream-0.0.5" sources."nan-2.15.0" sources."nanomatch-1.2.13" @@ -117588,7 +117862,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sprintf-js-1.0.3" (sources."string-width-1.0.2" // { dependencies = [ @@ -118004,7 +118278,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -118903,7 +119177,7 @@ in sources."strip-outer-1.0.1" sources."strtok3-6.2.4" sources."supports-color-7.2.0" - sources."tar-4.4.15" + sources."tar-4.4.16" sources."tlds-1.208.0" sources."to-array-0.1.4" sources."to-readable-stream-1.0.0" @@ -120067,7 +120341,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.6" + sources."tar-6.1.7" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" sources."vega-5.20.2" @@ -120182,18 +120456,18 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "23.1.1"; + version = "23.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-23.1.1.tgz"; - sha512 = "9HScSWBFGHmFvvInD0IgbkIrP1+rPjajDlI0n/7HTPOgZ68l2DShEpN6Igt2BPFQhbMK8Fwt5MNuC5RM6JTI2Q=="; + url = "https://registry.npmjs.org/vercel/-/vercel-23.1.2.tgz"; + sha512 = "uS1k7wuXI6hbxiW+kn9vdAWL0bBi4jjVxc7Jwp8NhJjcRuzlydtt3gUEnhnC9AOIKQ4LxoAgmg50lSyYkrC8Hg=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/node-16.4.13" - sources."@vercel/build-utils-2.12.1" + sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" - sources."@vercel/node-1.12.0" + sources."@vercel/node-1.12.1" sources."@vercel/python-2.0.5" sources."@vercel/ruby-1.2.7" (sources."ansi-align-3.0.0" // { @@ -120380,7 +120654,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.15.1" // { + (sources."eslint-plugin-vue-7.16.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -120777,7 +121051,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -122017,7 +122291,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -122425,7 +122699,7 @@ in sources."svg-pathdata-5.0.5" sources."svg2img-0.9.3" sources."symbol-tree-3.2.4" - sources."tar-6.1.6" + sources."tar-6.1.7" (sources."tough-cookie-4.0.0" // { dependencies = [ sources."universalify-0.1.2" @@ -123107,7 +123381,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.799" + sources."electron-to-chromium-1.3.801" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -124106,6 +124380,7 @@ in sources."pump-3.0.0" sources."qap-3.3.1" sources."queue-microtask-1.2.3" + sources."queue-tick-1.0.0" sources."random-access-file-2.2.0" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" @@ -124151,7 +124426,7 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.11.0" + sources."streamx-2.11.1" sources."string-width-4.2.2" sources."string2compact-1.3.2" sources."string_decoder-1.3.0" @@ -125016,7 +125291,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.9" + sources."spdx-license-ids-3.0.10" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" sources."ssri-8.0.1" @@ -125079,7 +125354,7 @@ in ]; }) sources."taketalk-1.0.0" - (sources."tar-6.1.6" // { + (sources."tar-6.1.7" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -125254,34 +125529,58 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-2.0.0.tgz"; - sha512 = "OF8YvqseMMmtDaASqO+8+0/tJZvykLK0hX9YBAaRO9l7Hc+YjNKjpgJTjrmncgEURoyDr9Ln4r/qBtEuDNZstg=="; + url = "https://registry.npmjs.org/zx/-/zx-2.1.0.tgz"; + sha512 = "7mCJ92ev894l94w5aXkdQoZ9iE6qXERLMPp/uMhTumGKtyhvN8tWprqFFHiXGS/31HxEy1NtNd9NHmYjGHd85A=="; }; dependencies = [ + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" sources."@types/node-16.4.13" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" + sources."array-union-3.0.1" sources."asynckit-0.4.0" + sources."braces-3.0.2" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."delayed-stream-1.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.7" + sources."fastq-1.11.1" + sources."fill-range-7.0.1" sources."form-data-3.0.1" sources."fs-extra-10.0.0" + sources."glob-parent-5.1.2" + sources."globby-12.0.0" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" + sources."ignore-5.1.8" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" sources."isexe-2.0.0" sources."jsonfile-6.1.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."node-fetch-2.6.1" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" + sources."queue-microtask-1.2.3" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" + sources."slash-4.0.0" sources."supports-color-7.2.0" + sources."to-regex-range-5.0.1" sources."universalify-2.0.0" sources."which-2.0.2" ]; From 7032cf2944fee72c4c5115ce68057fb547e11b60 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 10 Aug 2021 13:26:14 +0200 Subject: [PATCH 259/375] python3Packages.hass-nabucasa: 0.44.0 -> 0.45.1 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 201337ef7717..556576459695 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.44.0"; + version = "0.45.1"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-cfKuqkIgmbo7/kUIpJFbckyQ0uDrxXmdsI7qORX0PWc="; + sha256 = "sha256-ZDPlYoLAQLXiV+LUMdu/8v3TrG5/Zz4+r4PtThrLAas="; }; propagatedBuildInputs = [ From aeb4364bb340448cf52526e426ba58086dc5f18d Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 10 Aug 2021 13:22:53 +0200 Subject: [PATCH 260/375] haskellPackages.witch: Add maralorn as maintainer --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index c476862fb090..bc221e2fe511 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -236,6 +236,7 @@ package-maintainers: - stm-containers - streamly - taskwarrior + - witch pacien: - ldgallery-compiler peti: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 84ab38feb8f3..597157d77765 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -284546,6 +284546,7 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.isc; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "with-index" = callPackage From 1445bec521a45d4ef3b06705b50739f6fa0258a4 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 10 Aug 2021 13:45:36 +0200 Subject: [PATCH 261/375] haskellPackages.cabal-install: Switch Cabal back to 3.4 on older ghcs --- .../configuration-ghc-8.10.x.nix | 4 +-- .../configuration-ghc-8.8.x.nix | 2 +- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 30 +++++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index ca4b974449a1..5ef659349b38 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -44,12 +44,12 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_0_0; + Cabal = self.Cabal_3_4_0_0; base16-bytestring = self.base16-bytestring_0_1_1_7; }); # cabal-install-parsers is written for Cabal 3.4 - cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_0_0; }; + cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_4_0_0; }; # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index cfc19f6b35f4..7e495474c84f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -58,7 +58,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and random, but an older # version of base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_0_0; + Cabal = self.Cabal_3_4_0_0; base16-bytestring = self.base16-bytestring_0_1_1_7; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bc221e2fe511..2884225bc8bd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -97,6 +97,7 @@ extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - Cabal == 3.2.* # required for cabal-install etc. + - Cabal == 3.4.* # required for cabal-install etc. - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - dhall == 1.29.0 # required for ats-pkg diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 597157d77765..8986db34cb2a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2732,6 +2732,36 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal_3_4_0_0" = callPackage + ({ mkDerivation, array, async, base, base-compat, base-orphans + , binary, bytestring, clock, containers, deepseq, Diff, directory + , filepath, integer-logarithms, mtl, optparse-applicative, parsec + , pretty, process, QuickCheck, rere, stm, tagged, tar, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, text + , time, transformers, tree-diff, unix + }: + mkDerivation { + pname = "Cabal"; + version = "3.4.0.0"; + sha256 = "1za1cl14fkw8y89hhw6sqirzmkixjaa4wpqsibyk0fvnjs59jydq"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty process text time transformers unix + ]; + testHaskellDepends = [ + array async base base-compat base-orphans binary bytestring clock + containers deepseq Diff directory filepath integer-logarithms + optparse-applicative pretty process QuickCheck rere stm tagged tar + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text + transformers tree-diff + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Cabal_3_6_0_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text From 14d9f4f6976b082942cb723991195ccdb5e8e950 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 10 Aug 2021 12:22:38 +0000 Subject: [PATCH 262/375] electron_13: 13.1.7 -> 13.1.8 https://github.com/electron/electron/releases/tag/v13.1.8 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 1c23ca5bf8d3..40eee4cd5eaf 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,13 +115,13 @@ rec { headers = "1gbnjgf1pfbca2czn8j74rafiwmgc64nxi6drzm1b7qy2f6lxrl0"; }; - electron_13 = mkElectron "13.1.7" { - x86_64-linux = "0bb38a5e45609a8c46dd6173447a45477651f3c2ea58f724807d79c8e4a8876e"; - x86_64-darwin = "be8d05a7f853b9e7020c095c3d8075269832ccf821ca9785135884e6bc893df8"; - i686-linux = "2a1c84ca8fd2a5b10b918bda11c5e546f4b77f85484a32af24ed44d6f877587d"; - armv7l-linux = "3d4ed4cbd2ea9dd01d5ad09ed5b408762c69b5827be6fdae2e19681f2a159509"; - aarch64-linux = "68e174bee2a686926ec2da193831aefc16ff8ec43b46e423044918e6d25d5925"; - aarch64-darwin = "95489cc66c5638d95cde80189a5ae3477ce09c6cfa4c421b1e8bceea94f4dfba"; - headers = "0zsnkgixch0c6ihg4drdx9a7gsl35wwfsphgiz80mhbw84slvq0n"; + electron_13 = mkElectron "13.1.8" { + x86_64-linux = "a4630aadd7e510e46ffe30632a69183b240bc19db226c83fab43e998d080e0ef"; + x86_64-darwin = "05c58efb89c69da53c8a512c2bd1ecb5996d996de16af3a2ed937e1f3bf126bb"; + i686-linux = "59e6d0d13640ee674a0b1ba96d51704eba8be1220fadf922832f6f52a72e12ec"; + armv7l-linux = "2b62f9874b4553782e8e5c7d7b667271fe4a5916adb2074a3b56ab9076076617"; + aarch64-linux = "2071c389cff1196e3ce1be4f5b486372003335bc132a2dbf4dc3b983dd26ee52"; + aarch64-darwin = "c870b31e30611a4d38557d6992bf5afe8d80f75548a427381aaf37d1d46af524"; + headers = "1q5gbsxrvf2mqfm91llkzcdlqg8lkpgxqxmzfmrm7na1r01lb4hr"; }; } From 4f7a4bd0fe213f3f4baa6c1dafeb55b3f26e339f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 10 Aug 2021 12:23:21 +0000 Subject: [PATCH 263/375] electron_12: 12.0.15 -> 12.0.16 https://github.com/electron/electron/releases/tag/v12.0.16 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 40eee4cd5eaf..49f9bba3412d 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "0c7qms8vbirblg6z86s19p5l472p3h8lw1rj7ckgnwna4b68vn33"; }; - electron_12 = mkElectron "12.0.15" { - x86_64-linux = "0ba1803ba64f2c155dcfc5452a4b7c034390aaea6197395b6195693b5d0bf605"; - x86_64-darwin = "7da73a8e3eb82a035f0d720709dbbb44cac0166d52ad4858fca9f3d96e6a32ed"; - i686-linux = "597f5710e6e55e4fb75c769af6e3c7db1924f6795f417e3ff6b37c4da2ae39fc"; - armv7l-linux = "01138b036812e5461a5871c2f8912baf0adf316df6597eb5c4fd3df8d41fb95e"; - aarch64-linux = "fe24cf90e3768cafa9939a0107261a97b4f132f9dec24bf0d1d15b591cdad2d6"; - aarch64-darwin = "c48323f1fd6cd4ebc67a248a83bd7c460a640bf32613d4fecf6be705f3d6803c"; - headers = "1gbnjgf1pfbca2czn8j74rafiwmgc64nxi6drzm1b7qy2f6lxrl0"; + electron_12 = mkElectron "12.0.16" { + x86_64-linux = "ba20154a752d93f15264619c05c4a08ce6a00fbe13e1f5655b0cca2d4053014c"; + x86_64-darwin = "0279c9907f4c87861259e686463e910eac214ca4f3da6a4608974b4030347689"; + i686-linux = "bacfb2135395bbc31de479f81e8392e5619337684e71f8973d4c04dab75a2569"; + armv7l-linux = "b3ce3e60f5cb9135fa8cb8859f62194ab1ba1d792c6ee7c451877a96bd13d47c"; + aarch64-linux = "d3ab4f93d32d8fe9674d807c4b216e141b75ee116f73458cc496c57032ebe66f"; + aarch64-darwin = "d7f390dca9f6af1eb647b65217f470b89a2dc3b2360351e016e283db8f2ce7d8"; + headers = "0b66a7nbi1mybqy0j8x6hnp9k0jzvr6lpp4zsazhbfpk47px116y"; }; electron_13 = mkElectron "13.1.8" { From 79744f0ea04aff8d206e9312da2e4a24fd83f3c3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 10 Aug 2021 12:23:58 +0000 Subject: [PATCH 264/375] electron_11: 11.4.10 -> 11.4.11 https://github.com/electron/electron/releases/tag/v11.4.11 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 49f9bba3412d..2bc10265ebc6 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -95,14 +95,14 @@ rec { headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6"; }; - electron_11 = mkElectron "11.4.10" { - x86_64-linux = "bad6af91183bcb27428a258fba3fab24ef3e8435402d6cb2d500fe215b8c920c"; - x86_64-darwin = "aaa11e61697ec2eec99950082a68eef32bc1231e51ac77cde6d96a12837f5b73"; - i686-linux = "8e956bad6a6c5f85fe5a53304ffe878191c670ffbc13176fbe01911ba7d6da0f"; - armv7l-linux = "c9e3873316416426151fbff9a190526e40a3e311d0f348ee6965a8c7948cb9c1"; - aarch64-linux = "4ee0dab2af08f0d8f0d141a165744c949b068a8a6537ef5ff7973b63266c2abf"; - aarch64-darwin = "53f96ba6099617c219ca75bde1682abb9e961927e5a3645b38dee11b95517659"; - headers = "0c7qms8vbirblg6z86s19p5l472p3h8lw1rj7ckgnwna4b68vn33"; + electron_11 = mkElectron "11.4.11" { + x86_64-linux = "8c9525bffa3479e3a2de88f65348585948e4d03ecfc35b71641dc3833d9b639f"; + x86_64-darwin = "48b89a46c6d4d117bcac6a45fbe0690adfd2b7f1f3602976d8e0859f16324bff"; + i686-linux = "33eff09dfc655da756b247580b790060c93f306c4a8f33a457e8df1fd4f196c3"; + armv7l-linux = "58251a2b9fc5ac68ad7e5fd8a1ab07b6e4cd675e8476e6f177388310b1831a3c"; + aarch64-linux = "edd622f99cd628a90d46fe62cdf8ca473b8125680d4b46a82dfd6dfee6f71088"; + aarch64-darwin = "03e6023e80b7d1b3e8df23dc69db53b4cc32c0663899f920f9bed8be504d7076"; + headers = "1rar3c4qx3rylxjqryfr16bcqph8ivs0qgzmiqglyc9avgz9bn9z"; }; electron_12 = mkElectron "12.0.16" { From 50dc9c1b67f7471e576cc10a4b30c7287da7a325 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 10 Aug 2021 14:33:36 +0200 Subject: [PATCH 265/375] haskellPackages.chs-cabal: Fix build by overriding Cabal dep --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f5c05c0c7162..6683dcc55bb1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1937,4 +1937,9 @@ EOT sha256 = "0l15ccfdys100jf50s9rr4p0d0ikn53bkh7a9qlk9i0y0z5jc6x1"; }); + # Needs Cabal >= 3.4 + chs-cabal = super.chs-cabal.override { + Cabal = self.Cabal_3_6_0_0; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 642b36cb7acc925a72da48ae597c97dfb9198faa Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 10 Aug 2021 12:23:56 +0200 Subject: [PATCH 266/375] opensc: 0.21.0 -> 0.22.0 --- pkgs/tools/security/opensc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 51e0c1f58f93..c48d19fbe87d 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "opensc"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "sha256-OjOfA1pIu8NeN+hPuow5UVMKsg0PrsLojw5h05/Qm+o="; + sha256 = "sha256-0IFpiG1SJq4cpS5z6kwpWSPVWjO0q0SHs+doD2vbUKs="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From d3841d1e7bcfe061800816f1b414288bc04b4663 Mon Sep 17 00:00:00 2001 From: Smittyvb Date: Tue, 10 Aug 2021 08:38:41 -0400 Subject: [PATCH 267/375] CONTRIBUTING.md: fix link to COPYING The current link 404s when viewed on GitHub due to using a relative path that refers to an upper directory. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5cf674ab10a2..0219aec7f528 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ # How to contribute Note: contributing implies licensing those contributions -under the terms of [COPYING](../COPYING), which is an MIT-like license. +under the terms of [COPYING](COPYING), which is an MIT-like license. ## Opening issues From fa0f9b76a3ea7828d7a71ba7e78ea087308f619e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 14:46:40 +0200 Subject: [PATCH 268/375] gpsd: remove ? null --- pkgs/servers/gpsd/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index d6f7fbea3ded..e7746fa34f0a 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -15,17 +15,17 @@ # optional deps for GUI packages , guiSupport ? true -, dbus-glib ? null -, libX11 ? null -, libXt ? null -, libXpm ? null -, libXaw ? null -, libXext ? null -, gobject-introspection ? null -, pango ? null -, gdk-pixbuf ? null -, atk ? null -, wrapGAppsHook ? null +, dbus-glib +, libX11 +, libXt +, libXpm +, libXaw +, libXext +, gobject-introspection +, pango +, gdk-pixbuf +, atk +, wrapGAppsHook , gpsdUser ? "gpsd", gpsdGroup ? "dialout" }: From 31a66b9239ac272d59e7ff7694e67dc8224f719d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 13:08:09 +0000 Subject: [PATCH 269/375] distrobuilder: 1.2 -> 1.3 --- pkgs/tools/virtualization/distrobuilder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index a6f479dc71ab..73f602cbf695 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -21,15 +21,15 @@ let in buildGoModule rec { pname = "distrobuilder"; - version = "1.2"; + version = "1.3"; - vendorSha256 = "sha256-G5FUO6Ul4dA4MZZI9Ho1kE9ptX31tAWak9rWAoD/iuU="; + vendorSha256 = "sha256-FKnpoLA4enZ1vGSJQFLbp/OjoEgdxagL73ucxUgIoKY="; src = fetchFromGitHub { owner = "lxc"; repo = "distrobuilder"; rev = "distrobuilder-${version}"; - sha256 = "CE3Tq0oWpVZnSfBBY3/2E2GdZLFsO0NzkPABT8lu+TY="; + sha256 = "sha256-cvxbJbg9yTcAPWQccH+1nQivwRh8CIN3Cga2HKY8VlQ="; fetchSubmodules = false; }; From 14088c31893f79927b3750eaa29b283ff66b76a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 13:15:50 +0000 Subject: [PATCH 270/375] doctl: 1.62.0 -> 1.63.1 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 74cb56c201d9..f5c485e5b014 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.62.0"; + version = "1.63.1"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-5YqGNuC1mmsIsEtnbgumaLuZGy3k6L9jZNbVwZln8WY="; + sha256 = "sha256-SSjTrCR5H+3nIKHKEfrQX917HjgpViS6H1RwmRe4coI="; }; meta = with lib; { From ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 4 Aug 2021 22:01:07 +0200 Subject: [PATCH 271/375] mosquitto: 2.0.10 -> 2.0.11 Fixes CVE-2021-34431. https://github.com/eclipse/mosquitto/blob/v2.0.11/ChangeLog.txt --- pkgs/servers/mqtt/mosquitto/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 9e251e1bc224..984d21155989 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -12,19 +12,29 @@ , openssl , withSystemd ? stdenv.isLinux , systemd +, fetchpatch }: stdenv.mkDerivation rec { pname = "mosquitto"; - version = "2.0.10"; + version = "2.0.11"; src = fetchFromGitHub { owner = "eclipse"; repo = pname; rev = "v${version}"; - sha256 = "144vw7b9ja4lci4mplbxs048x9aixd9c3s7rg6wc1k31w099rb12"; + sha256 = "1i0kkqhjxqahkhsl60s46zlywa87jakv7h4sr3fhi1v53vwpb9mg"; }; + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "revert-cmake-shared-to-module.patch"; # See https://github.com/eclipse/mosquitto/issues/2277 + url = "https://github.com/eclipse/mosquitto/commit/e21eaeca37196439b3e89bb8fd2eb1903ef94845.patch"; + sha256 = "14syi2c1rks8sl2aw09my276w45yq1iasvzkqcrqwy4drdqrf069"; + revert = true; + }) + ]; + postPatch = '' for f in html manpage ; do substituteInPlace man/$f.xsl \ From e86780a18e2a40041673fec39904e29e5a25c7ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 13:21:11 +0000 Subject: [PATCH 272/375] doppler: 3.31.0 -> 3.31.1 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index fb87251d737c..ad49251aae86 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.31.0"; + version = "3.31.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-jmOHr32mDnjY3n9/nU/YaQ/ZuVsCKTo2likM2homToM="; + sha256 = "sha256-m8dugkZ0n51RnclZwKGgjVG3OrDMz3MsOQMvNbG4BPU="; }; vendorSha256 = "sha256-yb7L4GSKtlwagwdxBMd5aSk9fre1NKKsy6CM4Iv2ya8="; From b5c36a1d5b607f018d30e3d95140e66f16bb6c1d Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 10 Aug 2021 15:21:27 +0200 Subject: [PATCH 273/375] zeroad: recurse into zeroadPackages to make sure hydra builds zeroad-unwrapped --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6e0b37b5cf8..27d414d35848 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30023,9 +30023,9 @@ with pkgs; keen4 = callPackage ../games/keen4 { }; - zeroadPackages = callPackage ../games/0ad { + zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK31; - }; + }); zeroad = zeroadPackages.zeroad; From 01a6d30016c254660464ed1ed351d9d0146552f0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 10 Aug 2021 13:25:40 +0000 Subject: [PATCH 274/375] xorg.xrdb: 1.2.0 -> 1.2.1 https://lists.x.org/archives/xorg-announce/2021-August/003107.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2999d4a99a59..81f813aae9c7 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3177,11 +3177,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xrdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { pname = "xrdb"; - version = "1.2.0"; + version = "1.2.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2"; - sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; + url = "mirror://xorg/individual/app/xrdb-1.2.1.tar.bz2"; + sha256 = "1d78prd8sfszq2rwwlb32ksph4fymf988lp75aj8iysg44f06pag"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 11adba253334..0f6ab40ed906 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -62,7 +62,7 @@ mirror://xorg/individual/app/xmore-1.0.3.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 mirror://xorg/individual/app/xprop-1.2.5.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.1.tar.xz -mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2 +mirror://xorg/individual/app/xrdb-1.2.1.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 mirror://xorg/individual/app/xset-1.2.4.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 From 6856e6ecee7e5de23baeb29452b07eab8d95da99 Mon Sep 17 00:00:00 2001 From: luhuaei Date: Mon, 9 Aug 2021 09:45:06 +0800 Subject: [PATCH 275/375] pymupdf: add patches for nix --- .../python-modules/pymupdf/default.nix | 39 +++++++++++++++---- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 501f829dc142..ff7b9a464998 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,28 +1,53 @@ -{ lib, buildPythonPackage, fetchPypi, mupdf, swig }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, mupdf +, swig +, freetype +, harfbuzz +, openjpeg +, jbig2dec +, libjpeg_turbo +, gumbo +}: + buildPythonPackage rec { pname = "pymupdf"; - version = "1.18.0"; + version = "1.18.16"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "64ce58f92d9edd2631e447175fa13b4024ac3b6dce6e718e0b003c41de6f7952"; + sha256 = "b21e39098fbbe0fdf269fdb2d1dd25a3847bbf22785ee8903d3a5637c2d0b9d7"; }; - patchPhase = '' + patchFlags = [ "--binary" "--ignore-whitespace" ]; + patches = [ + # Add NIX environment support. + # Should be removed next pyMuPDF release. + (fetchpatch { + url = "https://github.com/pymupdf/PyMuPDF/commit/d9b2d42019e5705a1c6621ea0cdfa26da1ce9ad5.patch"; + sha256 = "fc3f6ad88c8f3933ed9ab9d4db9ebec8bc30ed5113f6ca9d72080b56dfa52ad6"; + }) + ]; + + postPatch = '' substituteInPlace setup.py \ --replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf - ''; + ''; nativeBuildInputs = [ swig ]; - buildInputs = [ mupdf ]; + buildInputs = [ mupdf freetype harfbuzz openjpeg jbig2dec libjpeg_turbo gumbo ]; doCheck = false; + pythonImportsCheck = [ "fitz" ]; + meta = with lib; { description = "Python bindings for MuPDF's rendering library."; homepage = "https://github.com/pymupdf/PyMuPDF"; maintainers = with maintainers; [ teto ]; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.linux; }; } From 55444245f8cb67b86012815d6168492ad6ec46c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 13:29:29 +0000 Subject: [PATCH 276/375] duperemove: 0.11.2 -> 0.11.3 --- pkgs/tools/filesystems/duperemove/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index bbc346d46f71..98e652a05f9d 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "duperemove"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "markfasheh"; repo = "duperemove"; rev = "v${version}"; - sha256 = "1a87mka2sfzhbch2jip6wlvvs0glxq9lqwmyrp359d1rmwwmqiw9"; + sha256 = "sha256-WjUM52IqMDvBzeGHo7p4JcvMO5iPWPVOr8GJ3RSsnUs="; }; nativeBuildInputs = [ pkg-config ]; From 1488241dbc567480aaba33dd1f47138a15fbdd70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 15:54:13 +0200 Subject: [PATCH 277/375] python3Packages.pymyq: 3.0.4 -> 3.1.0 --- pkgs/development/python-modules/pymyq/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index 71788db45c9a..9fffbab03848 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymyq"; - version = "3.0.4"; + version = "3.1.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jeoFlLBjD81Bt6E75rk4U1Ach53KGy23QGx+A6X2rpg="; + sha256 = "0nrsivgd3andlq9c0p72x06mz1s4ihhibbphccrm5v1fmbzj09zp"; }; propagatedBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "pymyq" ]; meta = with lib; { From a3df0491aadb30e64bd0cd727b6f8396beb9025f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 16:00:50 +0200 Subject: [PATCH 278/375] python3Packages.dbutils: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/dbutils/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index 294456cc85bd..fef630e86831 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -1,17 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { - version = "2.0.1"; + version = "2.0.2"; pname = "dbutils"; src = fetchPypi { inherit version; pname = "DBUtils"; - sha256 = "sha256-Vw590TbBMRb+74vKGGCeP2a4ZoqcPV8hCdh0TERE2GE="; + sha256 = "1cc8zyd4lapzf9ny6c2jf1vysphlhr19m8miyvw5spbyq4pxpnsf"; }; checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "dbutils" ]; + meta = with lib; { description = "Database connections for multi-threaded environments"; homepage = "https://webwareforpython.github.io/DBUtils/"; From 0eb2e14a7fad2eec497942de06f1ed12d5c33221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Aug 2021 16:09:39 +0200 Subject: [PATCH 279/375] mcfly: 0.5.6 -> 0.5.8 --- pkgs/tools/misc/mcfly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 6412eaa1f802..a6d635a6f7ed 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.6"; + version = "0.5.8"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-x2cED+WEc50RB8BxiDEm/XnauT1RqqGjSIdL5MMaFBY="; + sha256 = "sha256-D8ScF/3qyT0VuMGmWkkeGRyCu4LdOXt1wvR9whbNURE="; }; postInstall = '' @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { install -Dm644 -t $out/share/mcfly mcfly.fish ''; - cargoSha256 = "sha256-7RKewz5jBS2HhHvXHBUWaQQ/wq9nryS9E+DqzBOVjPs="; + cargoSha256 = "sha256-VZgxfVmAa5lPfdLNbsotNoRpTLe3HID36sF8T/0mywI="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; From fd5c6aada3c38e7410f130ebf8fb01ef00257cd7 Mon Sep 17 00:00:00 2001 From: veleth Date: Tue, 10 Aug 2021 17:14:10 +0300 Subject: [PATCH 280/375] disfetch: change owner username (#133377) --- pkgs/tools/misc/disfetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index 8ad6ba00c8c4..1e6c466d8f39 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.9"; src = fetchFromGitHub { - owner = "llathasa-veleth"; + owner = "q60"; repo = "disfetch"; rev = version; sha256 = "sha256-dmDDO1DcDMGWtQtIQncOjSc114tL5QH1Jaq1n4vAe5M="; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Yet another *nix distro fetching program, but less complex"; - homepage = "https://github.com/llathasa-veleth/disfetch"; + homepage = "https://github.com/q60/disfetch"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.vel ]; From 4abb57f19bcf2e58a9852c54501a4c6424e1f8da Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 14:14:37 +0000 Subject: [PATCH 281/375] findomain: 4.3.0 -> 5.0.0 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 018a210e4aa2..37499757e757 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "4.3.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-UC70XmhAVf2a2QO9bkIRE5vEsWyIA0DudZfKraNffGY="; + sha256 = "sha256-xuabmlpejQVN8pYCNa97aL2IJUAgV7zLXpkEIp9SZRI="; }; - cargoSha256 = "sha256-Cdfh3smX6UjiG29L9hG22bOQQIjaNrv+okl153mIiso="; + cargoSha256 = "sha256-hrgTWB5D0eKmfuR+lrMN4mx6yGomHe/jUJxw2uyrjHg="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From c0097aa84adb19a9e5d947487c118505faf98bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Aug 2021 16:15:57 +0200 Subject: [PATCH 282/375] nixos/tests: unbreak the tested job I expect it suffices that the channel only blocks on one firefox ESR test - the one for the default ESR. I didn't want to have the information about the default in two places, so either of the tests will be evaluated twice (but to the same *.drv I hope). --- nixos/tests/all-tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e94259d07cad..30c1c77c6c94 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -127,6 +127,7 @@ in fcitx = handleTest ./fcitx {}; ferm = handleTest ./ferm.nix {}; firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; + firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job firefox-esr-78 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-78; }; firefox-esr-91 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-91; }; firejail = handleTest ./firejail.nix {}; From 4477421b05b9e3e1d801c8bb08bd6d5db9ee49ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 16:26:18 +0200 Subject: [PATCH 283/375] changelog: re-add by accident deleted sections --- .../from_md/release-notes/rl-2111.section.xml | 35 +++++++++++++++++++ .../manual/release-notes/rl-2111.section.md | 6 ++++ 2 files changed, 41 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 535c63dfd3f5..5d2a7189a2d2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -661,6 +661,32 @@ to use wildcards in the source argument. + + + The openrazer and + openrazer-daemon packages as well as the + hardware.openrazer module now require users + to be members of the openrazer group + instead of plugdev. With this change, users + no longer need be granted the entire set of + plugdev group permissions, which can + include permissions other than those required by + openrazer. This is desirable from a + security point of view. The setting + harware.openrazer.users + can be used to add users to the openrazer + group. + + + + + The yambar package has been split into + yambar and + yambar-wayland, corresponding to the xorg + and wayland backend respectively. Please switch to + yambar-wayland if you are on wayland. + +
@@ -830,6 +856,15 @@ version of zfs. + + + Nginx will use the value of + sslTrustedCertificate if provided for a + virtual host, even if enableACME is set. + This is useful for providers not using the same certificate to + sign OCSP responses and server certificates. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index b03f2931becf..99bc47e4a12e 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -169,6 +169,10 @@ pt-services.clipcat.enable). - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument. +- The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group. + +- The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. @@ -214,3 +218,5 @@ pt-services.clipcat.enable). - The [services.syncoid.enable](options.html#opt-services.syncoid.enable) module now properly drops ZFS permissions after usage. Before it delegated permissions to whole pools instead of datasets and didn't clean up after execution. You can manually look this up for your pools by running `zfs allow your-pool-name` and use `zfs unallow syncoid your-pool-name` to clean this up. - Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs. + +- Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates. From 7b6af9e542eda798072b1951ffce91c600bc73ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 16:26:34 +0200 Subject: [PATCH 284/375] betterlockscreen: format --- .../screensavers/betterlockscreen/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 113c0f5d2e68..476b2ae872dd 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -3,7 +3,7 @@ , makeWrapper , stdenv -# Dependencies (@see https://github.com/pavanjadhaw/betterlockscreen/blob/master/shell.nix) + # Dependencies (@see https://github.com/pavanjadhaw/betterlockscreen/blob/master/shell.nix) , bc , coreutils , i3lock-color @@ -30,20 +30,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - installPhase = - let - PATH = - lib.makeBinPath - [ bc coreutils i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]; - in '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p $out/bin - cp betterlockscreen $out/bin/betterlockscreen - wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${PATH}" + mkdir -p $out/bin + cp betterlockscreen $out/bin/betterlockscreen + wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]}" - runHook preInstall - ''; + runHook preInstall + ''; meta = with lib; { description = "Fast and sweet looking lockscreen for linux systems with effects!"; From fe01052444c1d66ed6ef76df2af798c9769e9e79 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Tue, 10 Aug 2021 22:31:46 +0800 Subject: [PATCH 285/375] fnm: init at 1.26.0 (#130788) Co-authored-by: Sandro --- pkgs/development/tools/fnm/default.nix | 35 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/fnm/default.nix diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix new file mode 100644 index 000000000000..a11163385893 --- /dev/null +++ b/pkgs/development/tools/fnm/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: + +rustPlatform.buildRustPackage rec { + pname = "fnm"; + version = "1.26.0"; + + src = fetchFromGitHub { + owner = "Schniz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-wKtgMUt7QquT6mS3AI+XrZqbJOZxj6jlJi+7uC9w7xU="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + cargoSha256 = "sha256-TMhhCVVFTanKdbDp7L3ZaiNohWo5a/jFbQjdRiBlCkk="; + + doCheck = false; + + postInstall = '' + installShellCompletion --cmd fnm \ + --bash <($out/bin/fnm completions --shell bash) \ + --fish <($out/bin/fnm completions --shell fish) \ + --zsh <($out/bin/fnm completions --shell zsh) + ''; + + meta = with lib; { + description = "Fast and simple Node.js version manager"; + homepage = "https://github.com/Schniz/fnm"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kidonng ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e979697548e..f828f7992b27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10921,6 +10921,10 @@ with pkgs; recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter = flutterPackages.stable; + fnm = callPackage ../development/tools/fnm { + inherit (darwin.apple_sdk.frameworks) Security; + }; + fnlfmt = callPackage ../development/tools/fnlfmt { }; fpc = callPackage ../development/compilers/fpc { }; From 069a145ae033fe22f78220e752b9d2da88518cf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 16:32:50 +0200 Subject: [PATCH 286/375] python3Packages.eth-typing: 2.2.1 -> 2.2.2 --- pkgs/development/python-modules/eth-typing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 87aa914b59f7..66ff1ddc10ed 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "2.2.1"; + version = "2.2.2"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-typing/issues/8 @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0k9jydsclk81qpkvl7hpchwclm3c89gyzlk17480wcw90nkps9ap"; + sha256 = "0rkvkacxla4y2blkkfdsq1ywnyqsvg8pwhvadznbag1bfzja4xhv"; }; # setuptools-markdown uses pypandoc which is broken at the moment From bb0867389f00a23d7e451e1591f0d07121cf7863 Mon Sep 17 00:00:00 2001 From: David Yamnitsky Date: Tue, 10 Aug 2021 10:51:16 -0400 Subject: [PATCH 287/375] wasm-bindgen-cli: 0.2.74 -> 0.2.75 --- .../tools/wasm-bindgen-cli/Cargo.lock | 844 +++++++----------- .../tools/wasm-bindgen-cli/default.nix | 8 +- 2 files changed, 338 insertions(+), 514 deletions(-) diff --git a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock index 094c703b65f6..a51aef852d97 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock +++ b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "add" version = "0.1.0" @@ -15,9 +17,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" dependencies = [ "memchr", ] @@ -33,15 +35,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.40" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" [[package]] name = "arrayvec" @@ -91,7 +87,7 @@ checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" dependencies = [ "askama_escape", "humansize", - "nom 6.1.2", + "nom 6.2.1", "num-traits 0.2.14", "percent-encoding", "proc-macro2", @@ -103,13 +99,13 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88b6bd5df287567ffdf4ddf4d33060048e1068308e5f62d81c6f9824a045a48" +checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" dependencies = [ "bstr", "doc-comment", - "predicates", + "predicates 2.0.1", "predicates-core", "predicates-tree", "wait-timeout", @@ -126,18 +122,18 @@ dependencies = [ "winapi", ] -[[package]] -name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - [[package]] name = "autocfg" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +[[package]] +name = "base-x" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" + [[package]] name = "base64" version = "0.9.3" @@ -148,15 +144,6 @@ dependencies = [ "safemem", ] -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder", -] - [[package]] name = "base64" version = "0.13.0" @@ -187,22 +174,11 @@ dependencies = [ "wyz", ] -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - [[package]] name = "bstr" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" dependencies = [ "lazy_static", "memchr", @@ -242,9 +218,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" [[package]] name = "cfg-if" @@ -274,7 +250,7 @@ dependencies = [ "libc", "num-integer", "num-traits 0.2.14", - "time", + "time 0.1.43", "winapi", ] @@ -308,15 +284,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags 1.2.1", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -342,10 +309,10 @@ dependencies = [ ] [[package]] -name = "constant_time_eq" -version = "0.1.5" +name = "const_fn" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" [[package]] name = "crossbeam-channel" @@ -359,9 +326,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -408,9 +375,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.44+curl-7.77.0" +version = "0.4.45+curl-7.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1" +checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb" dependencies = [ "cc", "libc", @@ -451,15 +418,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" [[package]] -name = "dirs" -version = "1.0.5" +name = "difflib" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users", - "winapi", -] +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "doc-comment" @@ -504,13 +472,13 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ "atty", "humantime", - "log 0.4.14", + "log", "regex", "termcolor", ] @@ -529,13 +497,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.8", + "redox_syscall", "winapi", ] @@ -573,12 +541,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "funty" version = "1.1.0" @@ -587,9 +549,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" +checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" dependencies = [ "futures-channel", "futures-core", @@ -602,9 +564,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" dependencies = [ "futures-core", "futures-sink", @@ -621,9 +583,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" +checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" [[package]] name = "futures-core-preview" @@ -633,9 +595,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" [[package]] name = "futures-executor" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" +checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" dependencies = [ "futures-core", "futures-task", @@ -644,9 +606,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" +checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" [[package]] name = "futures-lite" @@ -660,11 +622,11 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" +checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" dependencies = [ - "autocfg 1.0.1", + "autocfg", "proc-macro-hack", "proc-macro2", "quote", @@ -673,23 +635,23 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" +checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" [[package]] name = "futures-task" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" +checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" [[package]] name = "futures-util" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" dependencies = [ - "autocfg 1.0.1", + "autocfg", "futures-channel", "futures-core", "futures-io", @@ -704,17 +666,6 @@ dependencies = [ "slab", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.3" @@ -723,7 +674,7 @@ checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -746,6 +697,7 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" name = "guide-supported-types-examples" version = "0.1.0" dependencies = [ + "js-sys", "wasm-bindgen", ] @@ -767,9 +719,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -842,6 +794,15 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" +[[package]] +name = "itertools" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.7" @@ -859,7 +820,7 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.51" +version = "0.3.52" dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", @@ -901,9 +862,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" +checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" [[package]] name = "libz-sys" @@ -917,15 +878,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.14", -] - [[package]] name = "log" version = "0.4.14" @@ -949,9 +901,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "memchr" -version = "2.4.0" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memoffset" @@ -959,43 +911,38 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" dependencies = [ - "autocfg 1.0.1", + "autocfg", ] [[package]] name = "mime" -version = "0.2.6" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -dependencies = [ - "log 0.3.9", -] +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "mime_guess" -version = "1.8.8" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3" +checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" dependencies = [ "mime", - "phf", - "phf_codegen", "unicase", ] [[package]] name = "multipart" -version = "0.16.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01" +checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" dependencies = [ "buf_redux", "httparse", - "log 0.4.14", + "log", "mime", "mime_guess", "quick-error", - "rand 0.6.5", + "rand", "safemem", "tempfile", "twoway", @@ -1015,20 +962,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ "memchr", - "version_check 0.9.3", + "version_check", ] [[package]] name = "nom" -version = "6.1.2" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" dependencies = [ "bitvec", "funty", "lexical-core", "memchr", - "version_check 0.9.3", + "version_check", ] [[package]] @@ -1043,7 +990,7 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ - "autocfg 1.0.1", + "autocfg", "num-traits 0.2.14", ] @@ -1053,7 +1000,7 @@ version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" dependencies = [ - "autocfg 1.0.1", + "autocfg", "num-integer", "num-traits 0.2.14", ] @@ -1083,7 +1030,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.0.1", + "autocfg", ] [[package]] @@ -1098,15 +1045,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "openssl" -version = "0.10.34" +version = "0.10.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8" +checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" dependencies = [ "bitflags 1.2.1", "cfg-if 1.0.0", @@ -1133,11 +1080,11 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.63" +version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ - "autocfg 1.0.1", + "autocfg", "cc", "libc", "openssl-src", @@ -1160,50 +1107,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "phf" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -dependencies = [ - "phf_shared", - "rand 0.6.5", -] - -[[package]] -name = "phf_shared" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -dependencies = [ - "siphasher", - "unicase", -] - [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "pin-utils" @@ -1248,6 +1156,17 @@ dependencies = [ "regex", ] +[[package]] +name = "predicates" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc3d91237f5de3bcd9d927e24d03b495adb6135097b001cea7403e2d573d00a9" +dependencies = [ + "difflib", + "itertools", + "predicates-core", +] + [[package]] name = "predicates-core" version = "1.0.2" @@ -1256,9 +1175,9 @@ checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" [[package]] name = "predicates-tree" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" +checksum = "d7dd0fd014130206c9352efbdc92be592751b2b9274dff685348341082c6ea3d" dependencies = [ "predicates-core", "treeline", @@ -1274,7 +1193,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "version_check 0.9.3", + "version_check", ] [[package]] @@ -1285,7 +1204,7 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "version_check 0.9.3", + "version_check", ] [[package]] @@ -1302,9 +1221,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" dependencies = [ "unicode-xid", ] @@ -1332,189 +1251,42 @@ checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "rand" -version = "0.6.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.7", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", + "rand_chacha", + "rand_core", + "rand_hc", ] [[package]] name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.2", -] - -[[package]] -name = "rand_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ - "rand_core 0.4.2", + "ppv-lite86", + "rand_core", ] [[package]] name = "rand_core" -version = "0.4.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -dependencies = [ - "getrandom 0.2.3", + "getrandom", ] [[package]] name = "rand_hc" -version = "0.1.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_hc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -dependencies = [ - "rand_core 0.6.2", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", + "rand_core", ] [[package]] @@ -1523,7 +1295,7 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ - "autocfg 1.0.1", + "autocfg", "crossbeam-deque", "either", "rayon-core", @@ -1567,46 +1339,20 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" -version = "0.1.57" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags 1.2.1", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - [[package]] name = "regex" -version = "1.5.4" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" dependencies = [ "aho-corasick", "memchr", @@ -1644,40 +1390,27 @@ dependencies = [ [[package]] name = "rouille" -version = "3.1.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cfaebc11a52b7415f07e69f18f8240a0ea5eedf0dcb888c5fb7b432e7b4729b" +checksum = "8263ea8c0988dbdd89e679d408eaa5505bb886677e997562646c2e2ba4d2e6db" dependencies = [ - "base64 0.10.1", + "base64 0.13.0", "chrono", "filetime", "multipart", "num_cpus", "percent-encoding", - "rand 0.7.3", + "rand", "serde", "serde_derive", "serde_json", "sha1", - "term", "threadpool", - "time", + "time 0.2.27", "tiny_http", "url", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - [[package]] name = "rust-duck-typed-interfaces" version = "0.1.0" @@ -1687,9 +1420,18 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" +checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] [[package]] name = "ryu" @@ -1742,19 +1484,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "serde" -version = "1.0.126" +name = "semver" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.126" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" +checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" dependencies = [ "proc-macro2", "quote", @@ -1763,9 +1520,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" dependencies = [ "itoa", "ryu", @@ -1778,23 +1535,17 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" -[[package]] -name = "siphasher" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - [[package]] name = "slab" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" dependencies = [ "libc", "winapi", @@ -1806,12 +1557,70 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1", + "syn", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + [[package]] name = "strsim" version = "0.8.0" @@ -1826,9 +1635,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" +checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" dependencies = [ "clap", "lazy_static", @@ -1837,9 +1646,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" +checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" dependencies = [ "heck", "proc-macro-error", @@ -1850,9 +1659,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.72" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" dependencies = [ "proc-macro2", "quote", @@ -1873,23 +1682,12 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if 1.0.0", "libc", - "rand 0.8.3", - "redox_syscall 0.2.8", + "rand", + "redox_syscall", "remove_dir_all", "winapi", ] -[[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder", - "dirs", - "winapi", -] - [[package]] name = "termcolor" version = "1.1.2" @@ -1927,6 +1725,44 @@ dependencies = [ "winapi", ] +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros", + "version_check", + "winapi", +] + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn", +] + [[package]] name = "tiny_http" version = "0.8.2" @@ -1936,15 +1772,15 @@ dependencies = [ "ascii", "chrono", "chunked_transfer", - "log 0.4.14", + "log", "url", ] [[package]] name = "tinyvec" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" dependencies = [ "tinyvec_macros", ] @@ -1983,9 +1819,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" [[package]] name = "trybuild" -version = "1.0.42" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1768998d9a3b179411618e377dbb134c58a88cda284b0aa71c42c40660127d46" +checksum = "c02c413315329fc96167f922b46fd0caa3a43f4697b7a7896b183c7142635832" dependencies = [ "glob", "lazy_static", @@ -2015,11 +1851,11 @@ dependencies = [ [[package]] name = "unicase" -version = "1.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "version_check 0.1.5", + "version_check", ] [[package]] @@ -2042,9 +1878,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" @@ -2072,9 +1908,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vec_map" @@ -2082,12 +1918,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -[[package]] -name = "version_check" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" - [[package]] name = "version_check" version = "0.9.3" @@ -2112,7 +1942,7 @@ dependencies = [ "anyhow", "id-arena", "leb128", - "log 0.4.14", + "log", "rayon", "walrus-macro", "wasmparser 0.77.0", @@ -2130,12 +1960,6 @@ dependencies = [ "syn", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" @@ -2144,7 +1968,7 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.74" +version = "0.2.75" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2160,11 +1984,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.74" +version = "0.2.75" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.14", + "log", "proc-macro2", "quote", "syn", @@ -2181,7 +2005,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli" -version = "0.2.74" +version = "0.2.75" dependencies = [ "anyhow", "assert_cmd", @@ -2189,9 +2013,9 @@ dependencies = [ "diff", "docopt", "env_logger", - "log 0.4.14", + "log", "openssl", - "predicates", + "predicates 1.0.8", "rayon", "rouille", "serde", @@ -2209,11 +2033,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.74" +version = "0.2.75" dependencies = [ "anyhow", "base64 0.9.3", - "log 0.4.14", + "log", "rustc-demangle", "serde_json", "tempfile", @@ -2231,7 +2055,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.74" +version = "0.2.75" dependencies = [ "anyhow", "rayon", @@ -2243,7 +2067,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.24" +version = "0.4.25" dependencies = [ "cfg-if 1.0.0", "futures-channel-preview", @@ -2257,7 +2081,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.74" +version = "0.2.75" dependencies = [ "quote", "trybuild", @@ -2268,7 +2092,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.74" +version = "0.2.75" dependencies = [ "proc-macro2", "quote", @@ -2279,7 +2103,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.74" +version = "0.2.75" dependencies = [ "anyhow", "rayon", @@ -2300,11 +2124,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.74" +version = "0.2.75" [[package]] name = "wasm-bindgen-test" -version = "0.3.24" +version = "0.3.25" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2330,7 +2154,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.24" +version = "0.3.25" dependencies = [ "proc-macro2", "quote", @@ -2338,7 +2162,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.74" +version = "0.2.75" dependencies = [ "anyhow", "walrus", @@ -2347,7 +2171,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.74" +version = "0.2.75" dependencies = [ "anyhow", "walrus", @@ -2355,10 +2179,10 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.74" +version = "0.2.75" dependencies = [ "anyhow", - "log 0.4.14", + "log", "tempfile", "walrus", "wasm-bindgen-wasm-conventions", @@ -2367,13 +2191,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-webidl" -version = "0.2.74" +version = "0.2.75" dependencies = [ "anyhow", "env_logger", "heck", "lazy_static", - "log 0.4.14", + "log", "proc-macro2", "quote", "sourcefile", @@ -2431,18 +2255,18 @@ checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" [[package]] name = "wasmparser" -version = "0.78.2" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" +checksum = "a5f71b80b8193e50910919e7d1bc956d2b4f42b1cb1fad84bacb59332c16f2cf" [[package]] name = "wasmprinter" -version = "0.2.26" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ccec894c70710c2e4669320a532cb2b9cfb97adb0429745642f8ce76916ed85" +checksum = "b48e4f2999b9930e9b037e328357d7d2367e0d8ea6e534be90aeff60976c0452" dependencies = [ "anyhow", - "wasmparser 0.78.2", + "wasmparser 0.80.0", ] [[package]] @@ -2456,25 +2280,25 @@ dependencies = [ [[package]] name = "wast" -version = "35.0.2" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68" +checksum = "9bc7b9a76845047ded00e031754ff410afee0d50fbdf62b55bdeecd245063d68" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.37" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec280a739b69173e0ffd12c1658507996836ba4e992ed9bc1e5385a0bd72a02" +checksum = "2ab2cc8d9a69d1ab28a41d9149bb06bb927aba8fc9d56625f8b597a564c83f50" dependencies = [ - "wast 35.0.2", + "wast 37.0.0", ] [[package]] name = "web-sys" -version = "0.3.51" +version = "0.3.52" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index ef8affdf2446..fba7c979390a 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.74"; + version = "0.2.75"; src = let @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - hash = "sha256-GsraYfWzUZjFpPpufTyXF0i2llBzjh04iTKio6m4NRA="; + hash = "sha256-eRAe6/v0Xrtd1d2k6p0WETZ2vkQkiDRZOds7y0DidY0="; }; in runCommand "source" { } '' @@ -31,14 +31,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-djeI7kSGRHMpXnsbVlM2CDek02u5tFAsyAdHwbKC0y8="; + cargoHash = "sha256-xZrGBRnsBQKvqGkZyU7FQCkx0dHt/hXlrVLSvGKx27k="; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; license = licenses.asl20; description = "Facilitating high-level interactions between wasm modules and JavaScript"; - maintainers = with maintainers; [ ma27 rizary ]; + maintainers = with maintainers; [ ma27 nitsky rizary ]; platforms = platforms.unix; }; } From 04f5726f4820e84a49de6377e238bc6f209496d7 Mon Sep 17 00:00:00 2001 From: VergeDX Date: Tue, 10 Aug 2021 14:52:17 +0000 Subject: [PATCH 288/375] nodePackages.clipboard-cli: init at 2.0.1 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 186 +++++++++++++----- 2 files changed, 137 insertions(+), 50 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 95f6cb7ecf8f..c21781cd2763 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -26,6 +26,7 @@ , "cdk8s-cli" , "cdktf-cli" , "clean-css-cli" +, "clipboard-cli" , "clubhouse-cli" , "coc-clangd" , "coc-cmake" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5bf9d0be0546..c293ce1cfcfd 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -16915,6 +16915,15 @@ let sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; }; }; + "colorette-1.3.0" = { + name = "colorette"; + packageName = "colorette"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz"; + sha512 = "ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="; + }; + }; "colornames-1.1.1" = { name = "colornames"; packageName = "colornames"; @@ -22559,15 +22568,6 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.800" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.3.800"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.800.tgz"; - sha512 = "qagikPjZJSDWP85uWoxs32oK/xk/y3MhDZELfKRCWI7pBc0ZFlmjnXb+3+aNMaiqboeDJJa0v7CJd5cO1HKwEQ=="; - }; - }; "electron-to-chromium-1.3.801" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; @@ -23677,15 +23677,6 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.15.2" = { - name = "eslint-plugin-vue"; - packageName = "eslint-plugin-vue"; - version = "7.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.15.2.tgz"; - sha512 = "h5ws2GewwJ02HwnDo3WdPbc867MQieg9wrWgbpzh9ELBIiuy79EWK0zfyUxYzUWNd1EECCZ/8f50UCC7Hvbamw=="; - }; - }; "eslint-plugin-vue-7.16.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -68655,7 +68646,7 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."commander-4.1.1" sources."concat-map-0.0.1" @@ -68663,7 +68654,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.800" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -69250,7 +69241,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -69343,7 +69334,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.800" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -70360,14 +70351,14 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."commander-8.1.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.800" + sources."electron-to-chromium-1.3.801" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -70497,8 +70488,8 @@ in dependencies = [ sources."browserslist-4.16.7" sources."caniuse-lite-1.0.30001249" - sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.800" + sources."colorette-1.3.0" + sources."electron-to-chromium-1.3.801" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -73962,6 +73953,101 @@ in bypassCache = true; reconstructLock = true; }; + clipboard-cli = nodeEnv.buildNodePackage { + name = "clipboard-cli"; + packageName = "clipboard-cli"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clipboard-cli/-/clipboard-cli-2.0.1.tgz"; + sha512 = "ze7ASsXpF2J27QMq5or4VZZcX9X+E8XtsvFXaRwdLBON0UjnXfIWykgIzffSmrdfHOw/8rAufyOE58+/OU1eGw=="; + }; + dependencies = [ + sources."arch-2.2.0" + sources."array-find-index-1.0.2" + sources."arrify-1.0.1" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."clipboardy-2.3.0" + sources."cross-spawn-6.0.5" + sources."currently-unhandled-0.4.1" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."end-of-stream-1.4.4" + sources."error-ex-1.3.2" + sources."execa-1.0.0" + sources."find-up-2.1.0" + sources."function-bind-1.1.1" + sources."get-stdin-7.0.0" + sources."get-stream-4.1.0" + sources."graceful-fs-4.2.8" + sources."has-1.0.3" + sources."hosted-git-info-2.8.9" + sources."indent-string-3.2.0" + sources."is-arrayish-0.2.1" + sources."is-core-module-2.5.0" + sources."is-docker-2.2.1" + sources."is-plain-obj-1.1.0" + sources."is-stream-1.1.0" + sources."is-wsl-2.2.0" + sources."isexe-2.0.0" + sources."json-parse-better-errors-1.0.2" + sources."load-json-file-4.0.0" + sources."locate-path-2.0.0" + sources."loud-rejection-1.6.0" + sources."map-obj-2.0.0" + sources."meow-5.0.0" + sources."minimist-options-3.0.2" + sources."nice-try-1.0.5" + sources."normalize-package-data-2.5.0" + sources."npm-run-path-2.0.2" + sources."once-1.4.0" + sources."p-finally-1.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parse-json-4.0.0" + sources."path-exists-3.0.0" + sources."path-key-2.0.1" + sources."path-parse-1.0.7" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."pump-3.0.0" + sources."quick-lru-1.1.0" + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + sources."redent-2.0.0" + sources."resolve-1.20.0" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.3" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.10" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."strip-indent-2.0.0" + sources."trim-newlines-2.0.0" + sources."validate-npm-package-license-3.0.4" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."yargs-parser-10.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Access the system clipboard (copy/paste)"; + homepage = "https://github.com/sindresorhus/clipboard-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; clubhouse-cli = nodeEnv.buildNodePackage { name = "clubhouse-cli"; packageName = "clubhouse-cli"; @@ -75879,7 +75965,7 @@ in sources."clone-regexp-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."cosmiconfig-7.0.0" @@ -76347,7 +76433,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.15.2" // { + (sources."eslint-plugin-vue-7.16.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -78938,7 +79024,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" (sources."concat-stream-1.6.2" // { @@ -80468,7 +80554,7 @@ in sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" (sources."conf-7.1.2" // { @@ -83324,7 +83410,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" @@ -85215,7 +85301,7 @@ in sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" @@ -88109,7 +88195,7 @@ in sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."combined-stream-1.0.8" sources."common-tags-1.8.0" sources."concat-map-0.0.1" @@ -92880,7 +92966,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" @@ -98276,7 +98362,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" (sources."combine-source-map-0.8.0" // { dependencies = [ @@ -99772,7 +99858,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."commander-8.1.0" sources."commondir-1.0.1" @@ -100886,10 +100972,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.0.9"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.9.tgz"; - sha512 = "eOZSTnEZO6bPMJWvsKxYgm0+lG3uv6anqEylomDEZEszfd8jXO8B5DIpGholtoCC9WKTeiE7XfizrdTXLFI3UQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.1.0.tgz"; + sha512 = "1jNmgR6DA3aoMLVhEfuagYBzxHVqK7x6pLRY+4c5Atn3PJ/hX1SU56rBED6BRTNiPfGTuudPNXHjWj75MUpj/w=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -101531,7 +101617,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -105589,7 +105675,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.20.3" @@ -107850,7 +107936,7 @@ in sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; dependencies = [ - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."nanoid-3.1.23" sources."source-map-js-0.6.2" ]; @@ -107888,7 +107974,7 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."dependency-graph-0.9.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" @@ -109204,7 +109290,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-4.1.1" sources."commondir-1.0.1" sources."component-bind-1.0.0" @@ -110824,7 +110910,7 @@ in sources."clsx-1.1.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" @@ -116288,7 +116374,7 @@ in sources."clone-regexp-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."cosmiconfig-7.0.0" @@ -121032,7 +121118,7 @@ in sources."clone-deep-4.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-6.2.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -122866,7 +122952,7 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."columnify-1.5.4" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -123379,7 +123465,7 @@ in sources."buffer-from-1.1.2" sources."caniuse-lite-1.0.30001249" sources."chrome-trace-event-1.0.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-2.20.3" sources."electron-to-chromium-1.3.801" sources."enhanced-resolve-5.8.2" @@ -123452,7 +123538,7 @@ in sources."@webpack-cli/info-1.3.0" sources."@webpack-cli/serve-1.5.1" sources."clone-deep-4.0.1" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-7.2.0" sources."cross-spawn-7.0.3" sources."envinfo-7.8.1" From 4f0e6e9879f821680bd588d701c760b67aa5677e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 15:14:36 +0000 Subject: [PATCH 289/375] glab: 1.18.1 -> 1.19.0 --- .../version-management/git-and-tools/glab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index f2a5e2368b4f..84a6417aed86 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ahP5y5i0SMj2+mP4RYc7MLZGElX5eLgKwiVhBYGOX2g="; + sha256 = "sha256-bg0uLivvLYnDS8h13RkmU8gSEa8q2yxUWN9TN19qjxQ="; }; - vendorSha256 = "sha256-ssVmqcJ/DxUqAkHm9tn4RwWuKzTHvxoqJquXPIRy4b8="; + vendorSha256 = "sha256-9+WBKc8PI0v6bnkC+78Ygv/eocQ3D7+xBb8lcv16QTE="; runVend = true; # Tests are trying to access /homeless-shelter From 724a0fc8464540846c384a94f640612d3d7e338c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 19:51:41 +0200 Subject: [PATCH 290/375] python3Packages.exchangelib: 4.4.0 -> 4.5.0 --- .../python-modules/exchangelib/default.nix | 75 ++++++++++++++----- 1 file changed, 56 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index c41b04790836..c568583dd378 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -1,40 +1,77 @@ -{ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, - lxml, tzlocal, python-dateutil, pygments, requests-kerberos, - defusedxml, cached-property, isodate, requests_ntlm, dnspython, - psutil, requests-mock, pyyaml, - oauthlib, requests_oauthlib, tzdata, - flake8, backports-zoneinfo +{ lib +, backports-datetime-fromisoformat +, backports-zoneinfo +, buildPythonPackage +, cached-property +, defusedxml +, dnspython +, fetchFromGitHub +, flake8 +, isodate +, lxml +, oauthlib +, psutil +, pygments +, python-dateutil +, pythonOlder +, pytz +, pyyaml +, requests +, requests_ntlm +, requests_oauthlib +, requests-kerberos +, requests-mock +, tzdata +, tzlocal }: buildPythonPackage rec { pname = "exchangelib"; - version = "4.4.0"; - disabled = pythonOlder "3.5"; + version = "4.5.0"; + disabled = pythonOlder "3.6"; - # tests are not present in the PyPI version src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "0d6hfbawp68x18ryxamkamf8kgc55xbrll89g3swrqnm2rrhzrqf"; + sha256 = "sha256-MtWcqsbKls9I7Oj0UlJzWtHsNfAxk4+ojSgK50ljEfs="; }; - checkInputs = [ psutil requests-mock pyyaml - flake8 - ]; propagatedBuildInputs = [ - lxml tzlocal tzdata python-dateutil pygments requests-kerberos - defusedxml cached-property isodate requests_ntlm dnspython - oauthlib requests_oauthlib + cached-property + defusedxml + dnspython + isodate + lxml + oauthlib + pygments + requests + requests_ntlm + requests_oauthlib + requests-kerberos + tzdata + tzlocal ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo + ] ++ lib.optionals (pythonOlder "3.7") [ + backports-datetime-fromisoformat ]; + checkInputs = [ + flake8 + psutil + python-dateutil + pytz + pyyaml + requests-mock + ]; + + pythonImportsCheck = [ "exchangelib" ]; + meta = with lib; { description = "Client for Microsoft Exchange Web Services (EWS)"; - homepage = "https://github.com/ecederstrand/exchangelib"; - license = licenses.bsd2; + homepage = "https://github.com/ecederstrand/exchangelib"; + license = licenses.bsd2; maintainers = with maintainers; [ catern ]; }; } From 2aaf41173d28c86c7037680b2ffbb91aec274d92 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 10 Aug 2021 20:36:58 +0200 Subject: [PATCH 291/375] linux_lqx: 5.12.19 -> 5.13.9 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 23a6b0b2d362..dae6072aa780 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.12.19"; - suffix = "lqx2"; + version = "5.13.9"; + suffix = "lqx1"; in buildLinux (args // { @@ -14,11 +14,11 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-r2DvKLlm1a1VuJwC81tRuRwCd6H21T3MsBAC3b9TUbs="; + sha256 = "sha256-aAnwPw1qoGhUdWN/uaQa+5bi0DFZB/wDfNow7FgMMFE="; }; extraMeta = { - branch = "5.12/master"; + branch = "5.13/master"; maintainers = with lib.maintainers; [ atemu ]; description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; }; From c946a8861adfd6dee13f16b687e768d9091f23fb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 10 Aug 2021 11:43:24 -0700 Subject: [PATCH 292/375] terraform.providers: use allowAliases for exposing deprecated providers --- .../networking/cluster/terraform-providers/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 3091c957490c..48923330afee 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -3,6 +3,7 @@ , buildGoPackage , fetchFromGitHub , callPackage +, config }: let list = lib.importJSON ./providers.json; @@ -50,12 +51,13 @@ let cloudfoundry = callPackage ./cloudfoundry {}; gandi = callPackage ./gandi {}; hcloud = callPackage ./hcloud {}; - kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; libvirt = callPackage ./libvirt {}; linuxbox = callPackage ./linuxbox {}; lxd = callPackage ./lxd {}; vpsadmin = callPackage ./vpsadmin {}; vercel = callPackage ./vercel {}; - }; + } // (lib.optionalAttrs (config.allowAliases or false) { + kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; + }); in automated-providers // special-providers From 6b21060861f82d4ac4cb2516aa67bcadc0789961 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 20:53:49 +0200 Subject: [PATCH 293/375] python3Packages.eventlet: 0.31.0 -> 0.31.1 --- pkgs/development/python-modules/eventlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 28c7e9c6eea5..87446ed95f39 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.31.0"; + version = "0.31.1"; src = fetchPypi { inherit pname version; - sha256 = "b36ec2ecc003de87fc87b93197d77fea528aa0f9204a34fdf3b2f8d0f01e017b"; + sha256 = "0xldgwjf9jkp28rn0pg0i32bg6m7pdh7dwgi0grcvqzs0iii5sdr"; }; propagatedBuildInputs = [ dnspython greenlet monotonic six ] From 6034866286a3d69d75e1c3ca97bb1d44af53566e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 21:01:01 +0200 Subject: [PATCH 294/375] python3Packages.fastapi: 0.67.0 -> 0.68.0 --- pkgs/development/python-modules/fastapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 3b14560eb9dd..27cb4e445258 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.67.0"; + version = "0.68.0"; format = "flit"; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "15zbalyib7ndcbxvf9prj0n9n6qb4bfzhmaacsjrvdmjzmqdjgw0"; + sha256 = "00cjkc90h0qlca30g981zvwlxh2wc3rfipw25v667jdl9x5gxv9p"; }; postPatch = '' From 2582176554c6e483f1dc777542684acd7244c4a0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 9 Aug 2021 10:31:32 +0200 Subject: [PATCH 295/375] catgirl: 1.8 -> 1.9 https://git.causal.agency/catgirl/tag/?h=1.9 --- pkgs/applications/networking/irc/catgirl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index d2e8e93d8534..1bc51def0cd2 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "catgirl"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "0svpd2nqsr55ac98vczyhihs6pvgw7chspf6bdlwl98gch39dxif"; + sha256 = "182l7yryqm1ffxqgz3i4lcnzwzpbpm2qvadddmj0xc8dh8513s0w"; }; nativeBuildInputs = [ ctags pkg-config ]; From 146007769fa8765e136e88c1f4c7104956f6a640 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 10 Aug 2021 21:16:37 +0200 Subject: [PATCH 296/375] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 4 ++++ .../configuration-hackage2nix/transitive-broken.yaml | 8 ++++++++ pkgs/development/haskell-modules/hackage-packages.nix | 10 ++++++++++ 3 files changed, 22 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7ab9fc76f8a4..11a78272fa4b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -713,6 +713,8 @@ broken-packages: - combinatorial-problems - combinator-interactive - combobuffer + - comfort-array-shape + - comfort-fftw - Command - commander - Commando @@ -2230,6 +2232,7 @@ broken-packages: - hscd - hs-cdb - hscdio + - hscim - hsclock - hScraper - hscuid @@ -4034,6 +4037,7 @@ broken-packages: - robin - robots-txt - roc-cluster + - rocksdb-haskell - roku-api - rollbar - rollbar-client diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 3186c369906b..fe7cf4b21597 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -406,6 +406,7 @@ dont-distribute-packages: - algebra-driven-design - algebra-sql - algolia + - align-audio - alms - alpha - alsa-gui @@ -1539,6 +1540,7 @@ dont-distribute-packages: - hmeap-utils - hmep - hmm-lapack + - hmm-lapack_0_4_1 - hmt - hmt-diagrams - hnormalise @@ -1888,6 +1890,8 @@ dont-distribute-packages: - lapack - lapack-carray - lapack-comfort-array + - lapack-comfort-array_0_0_1 + - lapack_0_4 - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -1932,6 +1936,7 @@ dont-distribute-packages: - lighttpd-conf - lighttpd-conf-qq - linear-circuit + - linear-circuit_0_1_0_3 - linearmap-category - linearscan-hoopl - linkchk @@ -2010,6 +2015,7 @@ dont-distribute-packages: - magic-wormhole - magicbane - magico + - magico_0_0_2_2 - mahoro - maid - mail-pool @@ -2560,6 +2566,7 @@ dont-distribute-packages: - representable-tries - req-oauth2 - resistor-cube + - resistor-cube_0_0_1_3 - resource-pool-catchio - resource-simple - respond @@ -3120,6 +3127,7 @@ dont-distribute-packages: - venzone - verdict-json - versioning-servant + - vessel - vflow-types - vformat-aeson - vformat-time diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8986db34cb2a..b23dc31b9ae0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -26679,6 +26679,7 @@ self: { ]; description = "Find relative time displacement of two recordings of the same music"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "align-text" = callPackage @@ -59448,6 +59449,8 @@ self: { doHaddock = false; description = "Additional shape types for the comfort-array package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "comfort-fftw" = callPackage @@ -59468,6 +59471,8 @@ self: { ]; description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "comfort-graph" = callPackage @@ -137230,6 +137235,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "hscim json schema and server implementation"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsclock" = callPackage @@ -226838,6 +226845,8 @@ self: { ]; description = "Haskell bindings to RocksDB"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) rocksdb;}; "rocksdb-haskell-jprupp" = callPackage @@ -278758,6 +278767,7 @@ self: { doHaddock = false; description = "Functor-parametric containers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "vflow-types" = callPackage From dbc59a8c8ddf7d7e60d59d1fd1ccb46ae80f6df4 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 10 Aug 2021 21:36:17 +0200 Subject: [PATCH 297/375] betterlockscreen: Fix duplicate preInstall hook introduced in #133306 --- pkgs/misc/screensavers/betterlockscreen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 476b2ae872dd..b7f8ce99b533 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cp betterlockscreen $out/bin/betterlockscreen wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]}" - runHook preInstall + runHook postInstall ''; meta = with lib; { From e14ecb19eaae281ee67e4d3f24bbe3e54a8308ab Mon Sep 17 00:00:00 2001 From: Ahmed El Gabri Date: Sat, 19 Jun 2021 18:50:41 +0200 Subject: [PATCH 298/375] vscode-langservers-extracted: init at 2.4.0 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 526 ++++++++++-------- 2 files changed, 306 insertions(+), 221 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 95f6cb7ecf8f..22fcff7c2b12 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -276,6 +276,7 @@ , "vscode-html-languageserver-bin" , "vscode-json-languageserver" , "vscode-json-languageserver-bin" +, "vscode-langservers-extracted" , { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" } , "vue-cli" , "vue-language-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5bf9d0be0546..fab34d9101cf 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -3136,22 +3136,22 @@ let sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.30" = { + "@joplin/fork-htmlparser2-4.1.31" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.30"; + version = "4.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.30.tgz"; - sha512 = "zcuFx0Jxd+nmV+YRT2tjVjU6b1yB/pDxPE/PzBaiXzwLCpJrQKL7hUMsJiqfyyXbXwQkFRqu3pKVsBkuZjM0pw=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.31.tgz"; + sha512 = "5v7vYawEQP+0wHjT3sXi5LgRiWWImbnNdsTf6mdKg+IeX9KCjYnc7aZRGdC+yQlEQbcIRpu8bKUQnh/WoaMG7g=="; }; }; - "@joplin/fork-sax-1.2.34" = { + "@joplin/fork-sax-1.2.35" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.34"; + version = "1.2.35"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.34.tgz"; - sha512 = "H+uKVcUvvRzzBkydbkTDF1w6SeTYzLSnAeUHCjEFG8zEZ2HlOxNt+418Iy74U00tbl2m4/uKPoXhjNz8wQhFGQ=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.35.tgz"; + sha512 = "+0K4PbooQweodhTIaehh9QdC9g6SH7IpFzeNsv3Eh3T7LT985XJ1mZfXEjRI5pfWrRj9ibvxHcgvMzEQuXPM3g=="; }; }; "@joplin/lib-2.1.1" = { @@ -3181,22 +3181,22 @@ let sha512 = "XxmquKGZxlrjUorx924ogAACc39p22pzWp06DJX/eElU2kLZ/s+RC0EXAFj503EuDj/dd2voV+Tciz0wfCPc0Q=="; }; }; - "@joplin/turndown-4.0.52" = { + "@joplin/turndown-4.0.53" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.52"; + version = "4.0.53"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.52.tgz"; - sha512 = "e8F+si5xTer0OQlpSGKh2rSu7YnSCpkvh3n7N85x61Z2WvhV96RfXAhNvRahGdzF9WNVwJgudirapHDJ+zeO3A=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.53.tgz"; + sha512 = "uYeROpicdZKWq2WLOuKTAsG5wEZu8cy/kjWRBIkuyql575NRzyONh9e4UtT6tiWmPWtuVNHmaBJJyIzAwstfLg=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.34" = { + "@joplin/turndown-plugin-gfm-1.0.35" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.34"; + version = "1.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.34.tgz"; - sha512 = "0UZDcrMS/rViZZ50UPUpNy5qG8pWatyAWVSxZiKNmQ1+SJIwb6pzukGH25s3SxDmvW8lr7bQkBOn11hDxNFrug=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.35.tgz"; + sha512 = "jMc8Cjq3K2szQGsi39yQpxMuR3JCCkIFWjQxKRlOW7JvbaTeMPuGqpEafuNqtn7qU6DoYF72p/glKmU8p2t3Dg=="; }; }; "@josephg/resolvable-1.0.1" = { @@ -4081,13 +4081,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-17.9.2" = { + "@netlify/build-17.10.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "17.9.2"; + version = "17.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-17.9.2.tgz"; - sha512 = "RbaHBWkbrwiXdLf73gjcjJAn7z3zsRqhXqaF2K9ycru7K7XIVG/BGEKztSD8IoAYR2DuY9KqmrlbPuiQg0IFFg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-17.10.0.tgz"; + sha512 = "3L0ps4b5u34Sj03a7tJMwGkuO+Tg2eXOFVdToINV3StgjB9lTU7fOEm0jCJOw9E9QFAVpemW0tRadofYY/Hzjg=="; }; }; "@netlify/cache-utils-2.0.0" = { @@ -4315,6 +4315,15 @@ let sha512 = "DkQemRkLTpAMvwwENRCQ9h5qJDaLrjEa+PpfEh0I64om4hTXVHcTd5+YMHW0wPr4OWABA7JAWlsFOVsZADFxfQ=="; }; }; + "@netlify/zip-it-and-ship-it-4.17.0" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "4.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.17.0.tgz"; + sha512 = "xcumwEFH7m/cw/XEcmv3OB8U94J5zWVsMhjROdfUdT+BE5QU5InEggYS6HnDoTOMgGpVM+mY1vgBQzdgaC+NZw=="; + }; + }; "@node-red/editor-api-2.0.5" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; @@ -4540,13 +4549,13 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; - "@oclif/core-0.5.28" = { + "@oclif/core-0.5.29" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "0.5.28"; + version = "0.5.29"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.28.tgz"; - sha512 = "t9jaGLRP5yJKwiMIzKmzYyP1eRxltWAY02lduUDp3d6cE+Dt2pcIGd7KtsOImKUWv+ClLI7O/CVHnMkOfNJvYA=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.29.tgz"; + sha512 = "v5MMxeTgEKbVcEl7D3jsTVL8Wy3lLTDj0KHX7cOmI751yfjdAOqy9frHQ6IXssxubDkBW6sXzbYN9Bw12zsBqg=="; }; }; "@oclif/errors-1.3.5" = { @@ -4675,13 +4684,22 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-9.4.0" = { + "@octokit/openapi-types-9.5.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "9.4.0"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.4.0.tgz"; - sha512 = "rKRkXikOJgDNImPl49IJuECLVXjj+t4qOXHhl8SBjMQCGGp1w4m5Ud/0kfdUx+zCpTvBN8vaOUDF4nnboZoOtQ=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.5.0.tgz"; + sha512 = "AEq5uAZJCnrOuNUg91yDjkE3mXyMq2lSiJpOpDyzy1e2mT1CSpsu8Yf7DuabD7TmQi0UEC8o0YrDjeXgNoI54Q=="; + }; + }; + "@octokit/openapi-types-9.6.0" = { + name = "_at_octokit_slash_openapi-types"; + packageName = "@octokit/openapi-types"; + version = "9.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.6.0.tgz"; + sha512 = "L+8x7DpcNtHkMbTxxCxg3cozvHUNP46rOIzFwoMs0piWwQzAGNXqlIQO2GLvnKTWLUh99DkY+UyHVrP4jXlowg=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4693,13 +4711,13 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.15.0" = { + "@octokit/plugin-paginate-rest-2.15.1" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.15.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.0.tgz"; - sha512 = "/vjcb0w6ggVRtsb8OJBcRR9oEm+fpdo8RJk45khaWw/W0c8rlB2TLCLyZt/knmC17NkX7T9XdyQeEY7OHLSV1g=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz"; + sha512 = "47r52KkhQDkmvUKZqXzA1lKvcyJEfYh3TKAIe5+EzMeyDM3d+/s5v11i2gTk8/n6No6DPi3k5Ind6wtDbo/AEg=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -4747,13 +4765,13 @@ let sha512 = "VrmrE8gjpuOoDAGjrQq2j9ZhOE6LxaqxaQg0yMrrEnnQZy2ZcAnr5qbVfKsMF0up/48PRV/VFS/2GSMhA7nTdA=="; }; }; - "@octokit/types-6.24.0" = { + "@octokit/types-6.25.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.24.0"; + version = "6.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.24.0.tgz"; - sha512 = "MfEimJeQ8AV1T2nI5kOfHqsqPHaAnG0Dw3MVoHSEsEq6iLKx2N91o+k2uAgXhPYeSE76LVBqjgTShnFFgNwe0A=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.25.0.tgz"; + sha512 = "bNvyQKfngvAd/08COlYIN54nRgxskmejgywodizQNyiKoXmWRAjKup2/LYwm+T9V0gsKH6tuld1gM0PzmOiB4Q=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -11677,6 +11695,15 @@ let sha512 = "yDRLkPUiGvIXpccFd1PqOQZ1MJvYkh0RVBNWfquDoPonQuJ9QOCZoPrpe3VlB8IGMOODbVRSH1NRqPa12gNjBA=="; }; }; + "aws-sdk-2.965.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.965.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.965.0.tgz"; + sha512 = "jifeFsA6IEKXM65WI5gvBNSCXKw4n64Wf9Q7/8E7wZ5vzRbBGoHzGpyhK6ZBBRvE2YvNp/ykTWChO7RydkA+AQ=="; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -12874,15 +12901,6 @@ let sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; - "bignumber.js-4.1.0" = { - name = "bignumber.js"; - packageName = "bignumber.js"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz"; - sha512 = "eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA=="; - }; - }; "bignumber.js-9.0.0" = { name = "bignumber.js"; packageName = "bignumber.js"; @@ -13108,15 +13126,6 @@ let sha512 = "CYS3HRGgIlm7A6/zqGFd/KPSUIv4EoEQVQ8mWcvBEdlf0db1q3j/fj5W/PXJasBfsvN2jM0Tzw3w1C7HUoR/fg=="; }; }; - "bitcoin-core-2.3.0" = { - name = "bitcoin-core"; - packageName = "bitcoin-core"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bitcoin-core/-/bitcoin-core-2.3.0.tgz"; - sha512 = "SMbw2kFu09iBajicODSE4pn/K0tOibWyqct71TlzR8cYUBk+u7rkhqGY7US2iYz0HmP851IW7F7eXfXvz09yXA=="; - }; - }; "bitcoin-ops-1.4.1" = { name = "bitcoin-ops"; packageName = "bitcoin-ops"; @@ -13648,13 +13657,13 @@ let sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; }; }; - "bootstrap-5.0.0-beta3" = { + "bootstrap-5.0.2" = { name = "bootstrap"; packageName = "bootstrap"; - version = "5.0.0-beta3"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta3.tgz"; - sha512 = "0urccjfIOzhrb9qJysN8XW/DRw6rg3zH7qLeKIp4Zyl8+Ens4JWB0NC0cB5AhnSFPd2tftRggjwCMxablo6Tpg=="; + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.2.tgz"; + sha512 = "1Ge963tyEQWJJ+8qtXFU6wgmAVj9gweEjibUdbmcCEYsn38tVwRk8107rk2vzt6cfQcRr3SlZ8aQBqaD8aqf+Q=="; }; }; "bootstrap-vue-helper-json-1.1.1" = { @@ -14161,6 +14170,16 @@ let sha512 = "66UkjoB9f7lhT+WKgYq8MQa6nkr96mlX64JYMlIsXe/X4VeqNwvsx7UOE3ZqD6lkwg8GvBhapRTWj0qWO3Pw8w=="; }; }; + "btc-rpc-client-git://github.com/btc21/btc-rpc-client" = { + name = "bitcoin-core"; + packageName = "bitcoin-core"; + version = "3.0.0"; + src = fetchgit { + url = "git://github.com/btc21/btc-rpc-client"; + rev = "8ed164d9ea4964d5c059084f48818b1a14bf86c9"; + sha256 = "963ea67486cf531755c04d655bcff31d24f64682debd05a6c0ef469fd1e09bbb"; + }; + }; "btcp-0.1.5" = { name = "btcp"; packageName = "btcp"; @@ -15538,6 +15557,15 @@ let sha512 = "+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw=="; }; }; + "chart.js-3.5.0" = { + name = "chart.js"; + packageName = "chart.js"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chart.js/-/chart.js-3.5.0.tgz"; + sha512 = "J1a4EAb1Gi/KbhwDRmoovHTRuqT8qdF0kZ4XgwxpGethJHUdDrkqyPYwke0a+BuvSeUxPf8Cos6AX2AB8H8GLA=="; + }; + }; "chartjs-color-2.4.1" = { name = "chartjs-color"; packageName = "chartjs-color"; @@ -16915,6 +16943,15 @@ let sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; }; }; + "colorette-1.3.0" = { + name = "colorette"; + packageName = "colorette"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz"; + sha512 = "ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="; + }; + }; "colornames-1.1.1" = { name = "colornames"; packageName = "colornames"; @@ -20354,13 +20391,13 @@ let sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; }; }; - "debugnyan-1.0.0" = { + "debugnyan-2.0.2" = { name = "debugnyan"; packageName = "debugnyan"; - version = "1.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/debugnyan/-/debugnyan-1.0.0.tgz"; - sha1 = "90386d5ebc2c63588f17f272be5c2a93b7665d83"; + url = "https://registry.npmjs.org/debugnyan/-/debugnyan-2.0.2.tgz"; + sha512 = "g4yO/Qc/bdu8JYCgC0L6RUTgGyQCH8fGJkDDicvd6G3k95glh96x9sIusgIdyjFRpWTH7xbnjhObOjYjJgRGQw=="; }; }; "decache-4.4.0" = { @@ -21443,13 +21480,13 @@ let sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; }; - "diff2html-3.4.8" = { + "diff2html-3.4.9" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.8"; + version = "3.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.8.tgz"; - sha512 = "ZkZXowZdEGu756Ka8kfmz3bEcH4j0ENC3FCDyomJ6Fz63U+tRoaoG1Qnjoej7fYMNk45AE+vsvn+woKMvm4zMg=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.9.tgz"; + sha512 = "33x45h6Xgfasjt49e0ldfLnUdCjLjHIdablpAlrKnQyyG1RA7w+4cbp9+bUfNLxfFj584BookXqh5KJEt4+MLA=="; }; }; "diff3-0.0.3" = { @@ -22559,15 +22596,6 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.800" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.3.800"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.800.tgz"; - sha512 = "qagikPjZJSDWP85uWoxs32oK/xk/y3MhDZELfKRCWI7pBc0ZFlmjnXb+3+aNMaiqboeDJJa0v7CJd5cO1HKwEQ=="; - }; - }; "electron-to-chromium-1.3.801" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; @@ -23677,15 +23705,6 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.15.2" = { - name = "eslint-plugin-vue"; - packageName = "eslint-plugin-vue"; - version = "7.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.15.2.tgz"; - sha512 = "h5ws2GewwJ02HwnDo3WdPbc867MQieg9wrWgbpzh9ELBIiuy79EWK0zfyUxYzUWNd1EECCZ/8f50UCC7Hvbamw=="; - }; - }; "eslint-plugin-vue-7.16.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -34128,15 +34147,6 @@ let sha512 = "+XiaSKCrauom9xazpWr7O8pAEEDrrW1qYJ6O0vHG4YKZxJYJN7md6qwAurk3iamwtyuIW/Io2XEnB6ZypAk3bw=="; }; }; - "json-bigint-0.2.3" = { - name = "json-bigint"; - packageName = "json-bigint"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.2.3.tgz"; - sha1 = "118d7f6ff1d38659f19f94cf73e64a75a3f988a8"; - }; - }; "json-bigint-1.0.0" = { name = "json-bigint"; packageName = "json-bigint"; @@ -42483,13 +42493,13 @@ let sha512 = "dBljNubVsolJkgfXUAF3KrCAO+hi5AXz+cftGjfHT76PyVB9pFUbAgTrkjZmKciC/B/14kEV5Ds+SwonqyTMfg=="; }; }; - "node-releases-1.1.73" = { + "node-releases-1.1.74" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.73"; + version = "1.1.74"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz"; - sha512 = "uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.74.tgz"; + sha512 = "caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw=="; }; }; "node-source-walk-4.2.0" = { @@ -64105,6 +64115,15 @@ let sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; }; }; + "vscode-css-languageservice-5.1.4" = { + name = "vscode-css-languageservice"; + packageName = "vscode-css-languageservice"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.4.tgz"; + sha512 = "fIJZJMXbaBsK0ifBb2RmSiLtzwn6NrZnKn7O+0ziIjwAY+rPvSK9St2qqQXFU3reZVRAt/I4GBp40dC/THcUDA=="; + }; + }; "vscode-debugadapter-testsupport-1.48.0" = { name = "vscode-debugadapter-testsupport"; packageName = "vscode-debugadapter-testsupport"; @@ -64159,6 +64178,15 @@ let sha512 = "UmC+GS0IqBeZnOAmdtQvaDzoH1c5/un+b7qALUziu/Y4SOPXso5dF+YkJeTqsde6YU2pLm78RtMDzl9BParwbw=="; }; }; + "vscode-html-languageservice-4.0.7" = { + name = "vscode-html-languageservice"; + packageName = "vscode-html-languageservice"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.0.7.tgz"; + sha512 = "P5TQMYpgxAdLs+PwpC7Lm+0lXCyQAC6kZ41YuPYNHVooC4XO7Y2+ncHBcQJVK4C9LU2cTOAl0lzq4WAxuwRHYw=="; + }; + }; "vscode-json-languageserver-1.3.4" = { name = "vscode-json-languageserver"; packageName = "vscode-json-languageserver"; @@ -65023,13 +65051,13 @@ let sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; - "webpack-5.49.0" = { + "webpack-5.50.0" = { name = "webpack"; packageName = "webpack"; - version = "5.49.0"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz"; - sha512 = "XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.50.0.tgz"; + sha512 = "hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -68655,7 +68683,7 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."commander-4.1.1" sources."concat-map-0.0.1" @@ -68663,7 +68691,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.800" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -68764,7 +68792,7 @@ in sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -69250,7 +69278,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -69343,7 +69371,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.800" + sources."electron-to-chromium-1.3.801" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -69679,7 +69707,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -70360,14 +70388,14 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."commander-8.1.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.800" + sources."electron-to-chromium-1.3.801" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -70413,7 +70441,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -70497,11 +70525,11 @@ in dependencies = [ sources."browserslist-4.16.7" sources."caniuse-lite-1.0.30001249" - sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.800" + sources."colorette-1.3.0" + sources."electron-to-chromium-1.3.801" sources."escalade-3.1.1" sources."fraction.js-4.1.1" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-range-0.1.2" sources."postcss-value-parser-4.1.0" ]; @@ -72182,10 +72210,10 @@ in btc-rpc-explorer = nodeEnv.buildNodePackage { name = "btc-rpc-explorer"; packageName = "btc-rpc-explorer"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-3.1.1.tgz"; - sha512 = "QHoiW1H2P6Sx7L5IEvbZnnQsfy7eaibY/KS2UAX9VINXNdGS9RxqEdLOe9yTdcy5pzIFpQKIBspOnHcBOjVa8A=="; + url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-3.2.0.tgz"; + sha512 = "Va/hSa8+LRP4o6neRo+us8XttwcmLfwgNykeXhtY3xMu3/Y7I2e4EXb6Zd9jElMVI3teWH7eiyLff0KDjnYJdg=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -72222,19 +72250,18 @@ in sources."base64-js-1.5.1" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" - sources."bech32-1.1.4" - sources."bignumber.js-4.1.0" + sources."bech32-2.0.0" + sources."bignumber.js-9.0.1" sources."bindings-1.5.0" sources."bip174-2.0.1" sources."bip32-2.0.6" sources."bip66-1.1.5" - (sources."bitcoin-core-2.3.0" // { + sources."bitcoin-ops-1.4.1" + (sources."bitcoinjs-lib-5.2.0" // { dependencies = [ - sources."semver-5.7.1" + sources."bech32-1.1.4" ]; }) - sources."bitcoin-ops-1.4.1" - sources."bitcoinjs-lib-5.2.0" sources."bluebird-3.7.2" sources."bn.js-4.12.0" (sources."body-parser-1.19.0" // { @@ -72242,11 +72269,12 @@ in sources."debug-2.6.9" ]; }) - sources."bootstrap-5.0.0-beta3" + sources."bootstrap-5.0.2" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."bs58-4.0.1" sources."bs58check-2.1.2" + sources."btc-rpc-client-git://github.com/btc21/btc-rpc-client" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -72261,6 +72289,7 @@ in sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."charenc-0.0.2" + sources."chart.js-3.5.0" sources."cipher-base-1.0.4" sources."cliui-5.0.0" sources."color-convert-1.9.3" @@ -72297,7 +72326,7 @@ in sources."ms-2.1.2" ]; }) - (sources."debugnyan-1.0.0" // { + (sources."debugnyan-2.0.2" // { dependencies = [ sources."debug-2.6.9" ]; @@ -72315,7 +72344,7 @@ in sources."destroy-1.0.4" sources."dijkstrajs-1.0.2" sources."doctypes-1.1.0" - sources."dotenv-8.6.0" + sources."dotenv-10.0.0" sources."dtrace-provider-0.8.8" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -72405,7 +72434,7 @@ in sources."js-stringify-1.0.2" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" - sources."json-bigint-0.2.3" + sources."json-bigint-1.0.0" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -75879,7 +75908,7 @@ in sources."clone-regexp-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."cosmiconfig-7.0.0" @@ -75998,7 +76027,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -76347,7 +76376,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.15.2" // { + (sources."eslint-plugin-vue-7.16.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -78938,7 +78967,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" (sources."concat-stream-1.6.2" // { @@ -79160,7 +79189,7 @@ in sources."napi-macros-2.0.0" sources."node-fetch-2.6.1" sources."node-gyp-build-4.2.3" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."normalize.css-8.0.1" @@ -80468,7 +80497,7 @@ in sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" (sources."conf-7.1.2" // { @@ -80591,7 +80620,7 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-package-data-2.5.0" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" @@ -83324,7 +83353,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" @@ -84105,7 +84134,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" @@ -85215,7 +85244,7 @@ in sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" @@ -85297,7 +85326,7 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."node-fetch-2.6.1" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -85456,7 +85485,7 @@ in sources."tslib-2.3.0" ]; }) - (sources."@oclif/core-0.5.28" // { + (sources."@oclif/core-0.5.29" // { dependencies = [ sources."chalk-4.1.2" (sources."cli-ux-5.6.3" // { @@ -88109,7 +88138,7 @@ in sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."combined-stream-1.0.8" sources."common-tags-1.8.0" sources."concat-map-0.0.1" @@ -88403,7 +88432,7 @@ in sources."node-eta-0.9.0" sources."node-fetch-2.6.1" sources."node-object-hash-2.3.8" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" @@ -88685,14 +88714,14 @@ in sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.4.0" - sources."@octokit/plugin-paginate-rest-2.15.0" + sources."@octokit/openapi-types-9.5.0" + sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.7.0" sources."@octokit/request-5.6.0" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.9.0" - sources."@octokit/types-6.24.0" + sources."@octokit/types-6.25.0" sources."@types/normalize-package-data-2.4.1" sources."agent-base-4.3.0" sources."ansi-regex-2.1.1" @@ -92660,8 +92689,8 @@ in sources."@babel/types-7.15.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.30" - sources."@joplin/fork-sax-1.2.34" + sources."@joplin/fork-htmlparser2-4.1.31" + sources."@joplin/fork-sax-1.2.35" (sources."@joplin/lib-2.1.1" // { dependencies = [ (sources."@joplin/renderer-1.8.2" // { @@ -92678,13 +92707,13 @@ in sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - (sources."@joplin/turndown-4.0.52" // { + (sources."@joplin/turndown-4.0.53" // { dependencies = [ sources."css-2.2.4" sources."source-map-0.6.1" ]; }) - sources."@joplin/turndown-plugin-gfm-1.0.34" + sources."@joplin/turndown-plugin-gfm-1.0.35" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -92694,7 +92723,7 @@ in sources."tslib-2.3.0" ]; }) - (sources."@oclif/core-0.5.28" // { + (sources."@oclif/core-0.5.29" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -92779,7 +92808,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.964.0" // { + (sources."aws-sdk-2.965.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -92880,7 +92909,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" @@ -93426,7 +93455,7 @@ in sources."semver-5.7.1" ]; }) - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."nopt-4.0.3" sources."normalize-path-3.0.0" sources."npm-bundled-1.1.2" @@ -94969,7 +94998,7 @@ in sources."tslib-2.3.0" ]; }) - (sources."@oclif/core-0.5.28" // { + (sources."@oclif/core-0.5.29" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -96384,9 +96413,9 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.4.0" + sources."@octokit/openapi-types-9.6.0" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.15.0" + sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.7.0" (sources."@octokit/request-5.6.0" // { @@ -96396,7 +96425,7 @@ in }) sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.9.0" - sources."@octokit/types-6.24.0" + sources."@octokit/types-6.25.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -98276,7 +98305,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" (sources."combine-source-map-0.8.0" // { dependencies = [ @@ -98654,7 +98683,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -99666,7 +99695,7 @@ in sources."tslib-2.3.0" ]; }) - (sources."@oclif/core-0.5.28" // { + (sources."@oclif/core-0.5.29" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -99772,7 +99801,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."commander-8.1.0" sources."commondir-1.0.1" @@ -100031,7 +100060,7 @@ in sources."node-dir-0.1.17" sources."node-fetch-2.6.1" sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -100246,10 +100275,10 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.7.1.tgz"; - sha512 = "1Igntd9BqPrUMMB2nhVSy2k6D/BzGx1yLC5GMHyyC7z2w+i27oDYuk7ZMfwBHMZS409F5desIOcDE6w3BFb1XA=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.8.0.tgz"; + sha512 = "uEJ8S5nMNq6MvtxnWso6jLkwfA62RVa0+E3+TbBTOthPeC0FagskjcA6KZb2xNuEkMFoeZUQcAZcMIY5mKkHgQ=="; }; dependencies = [ sources."@fluentui/date-time-utilities-8.2.2" @@ -100886,10 +100915,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.0.9"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.9.tgz"; - sha512 = "eOZSTnEZO6bPMJWvsKxYgm0+lG3uv6anqEylomDEZEszfd8jXO8B5DIpGholtoCC9WKTeiE7XfizrdTXLFI3UQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.1.0.tgz"; + sha512 = "1jNmgR6DA3aoMLVhEfuagYBzxHVqK7x6pLRY+4c5Atn3PJ/hX1SU56rBED6BRTNiPfGTuudPNXHjWj75MUpj/w=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -101023,15 +101052,33 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-17.9.2" // { + (sources."@netlify/build-17.10.0" // { dependencies = [ + (sources."@netlify/zip-it-and-ship-it-4.17.0" // { + dependencies = [ + sources."execa-5.1.1" + sources."locate-path-6.0.0" + sources."p-locate-5.0.0" + sources."pkg-dir-5.0.0" + sources."semver-7.3.5" + sources."yargs-16.2.0" + ]; + }) sources."ansi-styles-4.3.0" (sources."boxen-4.2.0" // { dependencies = [ sources."chalk-3.0.0" ]; }) - sources."execa-3.4.0" + sources."cp-file-9.1.0" + (sources."execa-3.4.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."human-signals-1.1.1" + ]; + }) + sources."get-stream-6.0.1" + sources."human-signals-2.1.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" @@ -101064,7 +101111,6 @@ in sources."@netlify/esbuild-0.13.6" (sources."@netlify/framework-info-5.8.0" // { dependencies = [ - sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) @@ -101096,6 +101142,7 @@ in (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ sources."@types/node-14.17.9" + sources."typescript-4.3.5" ]; }) sources."@netlify/plugins-list-3.3.0" @@ -101107,15 +101154,10 @@ in }) (sources."@netlify/zip-it-and-ship-it-4.16.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-7.0.4" sources."cp-file-9.1.0" sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" ]; }) (sources."@nodelib/fs.scandir-2.1.5" // { @@ -101166,10 +101208,9 @@ in sources."tslib-2.3.0" ]; }) - (sources."@oclif/core-0.5.28" // { + (sources."@oclif/core-0.5.29" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" - sources."ansi-styles-4.3.0" sources."array-union-2.1.0" sources."braces-3.0.2" sources."clean-stack-3.0.1" @@ -101188,15 +101229,12 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.3.0" sources."universalify-2.0.0" - sources."wrap-ansi-7.0.0" ]; }) (sources."@oclif/errors-1.3.5" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."clean-stack-3.0.1" sources."escape-string-regexp-4.0.0" - sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -101243,8 +101281,8 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.4.0" - sources."@octokit/plugin-paginate-rest-2.15.0" + sources."@octokit/openapi-types-9.6.0" + sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.7.0" (sources."@octokit/request-5.6.0" // { @@ -101254,7 +101292,7 @@ in }) sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.9.0" - sources."@octokit/types-6.24.0" + sources."@octokit/types-6.25.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -101408,10 +101446,8 @@ in }) (sources."boxen-5.0.1" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."camelcase-6.2.0" sources."type-fest-0.20.2" - sources."wrap-ansi-7.0.0" ]; }) sources."brace-expansion-1.1.11" @@ -101517,7 +101553,7 @@ in ]; }) sources."cli-width-2.2.1" - sources."cliui-6.0.0" + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -101531,7 +101567,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -101673,11 +101709,7 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - (sources."detective-typescript-7.0.0" // { - dependencies = [ - sources."typescript-3.9.10" - ]; - }) + sources."detective-typescript-7.0.0" (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -102148,7 +102180,6 @@ in }) (sources."locate-path-6.0.0" // { dependencies = [ - sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) @@ -102276,7 +102307,7 @@ in sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."node-source-walk-4.2.0" (sources."node-version-alias-1.0.1" // { dependencies = [ @@ -102383,8 +102414,12 @@ in }) sources."p-finally-2.0.1" sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.1.0" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) sources."p-map-4.0.0" sources."p-reduce-2.1.0" (sources."p-timeout-2.0.1" // { @@ -102760,7 +102795,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.3.5" + sources."typescript-3.9.10" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -102845,7 +102880,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -102854,15 +102889,20 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" + sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.9" sources."yarn-1.22.11" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -105589,7 +105629,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.20.3" @@ -105976,7 +106016,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -107850,7 +107890,7 @@ in sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; dependencies = [ - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."nanoid-3.1.23" sources."source-map-js-0.6.2" ]; @@ -107888,7 +107928,7 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."dependency-graph-0.9.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" @@ -109204,7 +109244,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-4.1.1" sources."commondir-1.0.1" sources."component-bind-1.0.0" @@ -109817,7 +109857,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -110824,7 +110864,7 @@ in sources."clsx-1.1.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" @@ -112111,7 +112151,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.964.0" // { + (sources."aws-sdk-2.965.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -115433,7 +115473,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.964.0" // { + (sources."aws-sdk-2.965.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -116288,7 +116328,7 @@ in sources."clone-regexp-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."cosmiconfig-7.0.0" @@ -116406,7 +116446,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -119858,7 +119898,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.8" + sources."diff2html-3.4.9" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -120953,6 +120993,50 @@ in bypassCache = true; reconstructLock = true; }; + vscode-langservers-extracted = nodeEnv.buildNodePackage { + name = "vscode-langservers-extracted"; + packageName = "vscode-langservers-extracted"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-2.4.0.tgz"; + sha512 = "dGTyYwuKd0miiTGG3ShL1u1MOni/iZLdY8GUyEf86jHIq2+P9h+El0IkXt8GsDGOAIty+DmhDOVZ/VTw2pjUEg=="; + }; + dependencies = [ + sources."agent-base-4.3.0" + sources."debug-3.1.0" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."http-proxy-agent-2.1.0" + sources."https-proxy-agent-2.2.4" + sources."jsonc-parser-3.0.0" + sources."ms-2.0.0" + (sources."request-light-0.4.0" // { + dependencies = [ + sources."vscode-nls-4.1.2" + ]; + }) + sources."typescript-4.3.5" + sources."vscode-css-languageservice-5.1.4" + sources."vscode-html-languageservice-4.0.7" + sources."vscode-json-languageservice-4.1.6" + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageserver-7.0.0" + sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.16.0" + sources."vscode-nls-5.0.0" + sources."vscode-uri-3.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "HTML/CSS/JSON language servers extracted from [vscode](https://github.com/Microsoft/vscode)."; + homepage = "https://github.com/hrsh7th/vscode-langservers-extracted#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; @@ -121032,7 +121116,7 @@ in sources."clone-deep-4.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-6.2.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -121153,7 +121237,7 @@ in sources."mute-stream-0.0.8" sources."nanoid-3.1.20" sources."neo-async-2.6.2" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.0" @@ -121260,7 +121344,7 @@ in sources."vscode-debugadapter-testsupport-1.48.0" sources."vscode-debugprotocol-1.48.0" sources."watchpack-2.2.0" - sources."webpack-5.49.0" + sources."webpack-5.50.0" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" @@ -122866,7 +122950,7 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."columnify-1.5.4" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -123343,10 +123427,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.49.0"; + version = "5.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz"; - sha512 = "XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.50.0.tgz"; + sha512 = "hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag=="; }; dependencies = [ sources."@types/eslint-7.28.0" @@ -123379,7 +123463,7 @@ in sources."buffer-from-1.1.2" sources."caniuse-lite-1.0.30001249" sources."chrome-trace-event-1.0.3" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-2.20.3" sources."electron-to-chromium-1.3.801" sources."enhanced-resolve-5.8.2" @@ -123406,7 +123490,7 @@ in sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."neo-async-2.6.2" - sources."node-releases-1.1.73" + sources."node-releases-1.1.74" sources."p-limit-3.1.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" @@ -123452,7 +123536,7 @@ in sources."@webpack-cli/info-1.3.0" sources."@webpack-cli/serve-1.5.1" sources."clone-deep-4.0.1" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."commander-7.2.0" sources."cross-spawn-7.0.3" sources."envinfo-7.8.1" From c591215a4c7ed16653a0107e93e3dcec50e28679 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 21:42:14 +0200 Subject: [PATCH 299/375] python3Packages.phonenumbers: 8.12.28 -> 8.12.29 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 6d2a4cac36b3..28c509c6d1bc 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.28"; + version = "8.12.29"; src = fetchPypi { inherit pname version; - sha256 = "1g86bf791lr9ggrfgllah9liwa3bx917h9ffrdb01kjwdna4zsj2"; + sha256 = "12h9l9kgviqvy7asax23ci12bwflpsf8c51ia7wg2k7dd56nlfcs"; }; checkInputs = [ From e5f407ad7a38e110fc095085bca135820442a633 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 21:49:19 +0200 Subject: [PATCH 300/375] python3Packages.typed-settings: 0.9.2 -> 0.10.0 --- pkgs/development/python-modules/typed-settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 9791c2b04688..47c98ad9531e 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "0.9.2"; + version = "0.10.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "203c1c6ec73dd1eb0fecd4981b31f8e05042f0dda16443190ac9ade1113ff53d"; + sha256 = "1fr6qkq3ldlp5i5l4b891w9ail9lfhaxlar3yij912slq5w0s8aw"; }; nativeBuildInputs = [ From 844bb647fb7dca7c1495ff218c4c020cdef0c843 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 10 Aug 2021 21:57:23 +0200 Subject: [PATCH 301/375] haskellPackages.hevm: Fix eval by disabling on aarch64 --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 2884225bc8bd..67da108858f9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -374,6 +374,7 @@ unsupported-platforms: gtk-sni-tray: [ x86_64-darwin ] haskell-snake: [ x86_64-darwin ] hcwiid: [ x86_64-darwin ] + hevm: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux HFuse: [ x86_64-darwin ] hidapi: [ x86_64-darwin ] hinotify-bytestring: [ x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b23dc31b9ae0..8042c63fbc0e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -127024,6 +127024,9 @@ self: { testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = lib.licenses.agpl3Only; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage From 41d065ef60347e246402e17c87835048d3bae18d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 20:01:17 +0000 Subject: [PATCH 302/375] crispyDoom: 5.10.1 -> 5.10.2 --- pkgs/games/crispy-doom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 04c0868510fe..987d0005d24e 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.10.1"; + version = "5.10.2"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-5doytVxemqaXWXiqDSQUEAe71xmY0pOLASj/NJNyM5g="; + sha256 = "sha256-NUBodIojvlw46yLZ9Bn2pCpBwyVW8noOHQMM4uGmO3U="; }; postPatch = '' From 77d6e9e66c80d292ae87b034b536d08ff11ff23a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:01:28 +0200 Subject: [PATCH 303/375] python3Packages.transmission-rpc: 3.2.5 -> 3.2.6 --- pkgs/development/python-modules/transmission-rpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 50e112583f1e..4918e69922ea 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "3.2.5"; + version = "3.2.6"; src = fetchPypi { inherit pname version; - sha256 = "59598c9aa338703951686420fea292d9ba2d83d2a81361f16b64c2603c4ebb45"; + sha256 = "1k4yyrbdqxp43zsmcg37a99x4s2kwsm7yyajf810y2wx61nq49d1"; }; propagatedBuildInputs = [ From 848798787ef464e6081398f595b22fe95ee7b516 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Tue, 10 Aug 2021 18:26:26 +0200 Subject: [PATCH 304/375] bklk: init at unstable-2020-12-29 --- pkgs/applications/misc/bklk/default.nix | 29 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/misc/bklk/default.nix diff --git a/pkgs/applications/misc/bklk/default.nix b/pkgs/applications/misc/bklk/default.nix new file mode 100644 index 000000000000..86b596d395ec --- /dev/null +++ b/pkgs/applications/misc/bklk/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + pname = "bklk"; + version = "unstable-2020-12-29"; + + src = fetchFromGitHub { + owner = "Ruunyox"; + repo = pname; + rev = "26f3420aa5726e152a745278ddb98dc99c0a935e"; + sha256 = "sha256-R3H6tv6fzQG41Y2rui0K8fdQ/+Ywnc5hqTPFjktrhF8="; + }; + + buildInputs = [ ncurses ]; + + installPhase = '' + mkdir -p $out/bin + cp bklk $out/bin + ''; + + meta = with lib; { + description = "Ncurses Binary Clock"; + longDescription = "bklk is a simple binary clock for your terminal."; + homepage = "https://github.com/Ruunyox/bklk"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f828f7992b27..a1431bce8baf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1341,6 +1341,8 @@ with pkgs; inherit (nodePackages) hyperspace-cli; + bklk = callPackage ../applications/misc/bklk { }; + bkyml = callPackage ../tools/misc/bkyml { }; blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; From 99784356acc5be1fd1de5e176093bfbc9148c96f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:23:30 +0200 Subject: [PATCH 305/375] python3Packages.env-canada: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/env-canada/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 22894ab9f2a6..5ea89392826b 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , geopy , imageio +, lxml , pillow , pytestCheckHook , python-dateutil @@ -11,19 +12,20 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "0v1wmjvi05i6mjh6yxqigbf2spf7842198yp98f7h0nyfjmz96hn"; + sha256 = "0dgw2mf760r1y0mq8bcvx6y3bcqpaf8p97rzf7pd0pbwvwrcsj3n"; }; propagatedBuildInputs = [ aiohttp geopy imageio + lxml pillow python-dateutil ]; From 8f69556be30a5f761b7dc46d485c9cabc51117a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:26:14 +0200 Subject: [PATCH 306/375] python3Packages.archinfo: 9.0.9355 -> 9.0.9438 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index d5d25b2c02ed..571e4e291ce7 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9355"; + version = "9.0.9438"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1mjs3aba204dqr6k0kgs6h3qyqjq80vinc7awql14rmyad2xndmb"; + sha256 = "sha256-C3ZBqCNzXcpeLmAPpXci2AA4D5A3cQC6rHPuf/BmT38="; }; checkInputs = [ From ab7ce2befea31ed773a5e00c81e322ca98c65edf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:26:17 +0200 Subject: [PATCH 307/375] python3Packages.ailment: 9.0.9355 -> 9.0.9438 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 6c1ab2e8b2d4..a9ff8c6d1819 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9355"; + version = "9.0.9438"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "102pixc5yy48ydmr3khvpfwm9bl33w07y8mpgjfrhp75qr5q4lrl"; + sha256 = "sha256-V/0plNgApk8S/xdd0I8zeE7dqb0xBhqCVSDW7jGHpzo="; }; propagatedBuildInputs = [ pyvex ]; From c950cc4deb97b0998edcf4532a8ac317f40930c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:26:20 +0200 Subject: [PATCH 308/375] python3Packages.pyvex: 9.0.9355 -> 9.0.9438 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 9f681e22be4a..716afd52ca39 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9355"; + version = "9.0.9438"; src = fetchPypi { inherit pname version; - sha256 = "0qnfi5z905lrzj8rf88prk5fz9cj0q2yag3xykv3gkmhs9fw3w0x"; + sha256 = "sha256-L7Y80qWecmAP9aBuUh1YMBNhvLGPJUfj80mdEbhzC9Y="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 32e6ac273b79687151b20e7c2ba70e8cc38d9940 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:26:23 +0200 Subject: [PATCH 309/375] python3Packages.claripy: 9.0.9355 -> 9.0.9438 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index c2b1fd903b93..155b46d2c07e 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9355"; + version = "9.0.9438"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1hmxkrzyhrc75z5d2ndf0z8icddrsd278lg640ihdjv1wabsa76w"; + sha256 = "sha256-QgBdR2Xs3OscJ1PQ3fSwe0vqsKVSl2E7xf7JZ6B2FYA="; }; # Use upstream z3 implementation From e2acd670bf2dd965737c0d92fce5c795f1a5d236 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:26:25 +0200 Subject: [PATCH 310/375] python3Packages.cle: 9.0.9355 -> 9.0.9438 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index e65843c81ab7..b29be9078d69 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9355"; + version = "9.0.9438"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "0jqbqp82arrxyiisj96n9laxhwjlrd0vj4a9wa8lgxafi6zv4lc6"; + sha256 = "sha256-BDhrKVnT1+zeEsQBM3qMDwcPJcePMPlAj/iL7M4GWtM="; }; propagatedBuildInputs = [ From 3acb8e0b718bbb5c90061161ab9fb468ea26ba69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:26:29 +0200 Subject: [PATCH 311/375] python3Packages.angr: 9.0.9355 -> 9.0.9438 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 4deb383f0aa7..d0805d062465 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9355"; + version = "9.0.9438"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0myk3xlvdw4szypivv6a90jw8cqdf1njjqxgqz5lqbx7fajqhrmy"; + sha256 = "sha256-wbyuphcRw9FtVcwwQq8w0vaYZqWQ0nIyJPaZh+r8ROU="; }; propagatedBuildInputs = [ From 36e0fc76ae6e0d68b6f40920a5daf910517aa361 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:26:32 +0200 Subject: [PATCH 312/375] python3Packages.angrop: 9.0.9355 -> 9.0.9438 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 1824a0d0e92e..2ee8671c0eaf 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9355"; + version = "9.0.9438"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1fs31yd8hhkrrx4gsq13fb5fqi86688pazpmsnsga7hznv60s2ks"; + sha256 = "sha256-+6fWdl5IcQTygFQbqPSfWvpqdooFN5yeBgPIblOyZEU="; }; propagatedBuildInputs = [ From 0ed4412e40b68d2ef500afaec9b75b4c6b7c1f4a Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Tue, 10 Aug 2021 21:27:14 +0100 Subject: [PATCH 313/375] remind: 03.03.06 -> 03.03.07 --- pkgs/tools/misc/remind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index d10811ffa049..1ef0ee9dd46f 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.03.06"; + version = "03.03.07"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-lpoMAXDJxwODY0/aoo25GRBYWFhE4uf11pR5/ITZX1s="; + sha256 = "sha256-h8lOKdHhiVT/XSIkfX7KMHzmIeEdIsFCCPkD9oo7ij0="; }; propagatedBuildInputs = tclLibraries; From 652340f7dd3511d21f06792a6f7fa6b22808a17c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:31:41 +0200 Subject: [PATCH 314/375] python3Packages.yfinance: 0.1.61 -> 0.1.63 --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 9a64572e3866..7a7a005efed0 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.61"; + version = "0.1.63"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "sha256-+tc0rwweGFaBkrl7LBHdsff98PuupqovKh4nRP3hRJ0="; + sha256 = "0k1saz0wknxv31vpqcfyi35mzi68c75hlqpw8lf83xqw9zllydhi"; }; propagatedBuildInputs = [ From 345e58292dd1b0a9ed3b83e6211b27a90f9546ce Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 9 Aug 2021 22:32:29 +0200 Subject: [PATCH 315/375] minio: 2021-05-16T05-32-34Z -> 2021-08-05T22-01-19Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 1651835e30e3..9f8ea6396a59 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-05-16T05-32-34Z"; + version = "2021-08-05T22-01-19Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-+zanqJMYNg/1c20cMm+bqVsW8VquucxEK5NiFAqOmS0="; + sha256 = "0lslgma04nby03bibhzgl4hl7wxk91xk3c46ibv6p33pc1a8ywrv"; }; - vendorSha256 = "sha256-5aDD68nugFyWsySLEj7LXAdtFXFKWnqfz+5zF5wC2qw="; + vendorSha256 = "1dhawj4gzm017qgf678i5lb7s0djddvf4923ipgnzm8q463sywd6"; doCheck = false; From 3417f18f96ccc1d9e6b3fccf8024515c87f4d183 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 9 Aug 2021 22:56:21 +0200 Subject: [PATCH 316/375] nixos/minio: allow configuring console port --- nixos/modules/services/web-servers/minio.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index d075449012f7..6b10afad4991 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -19,7 +19,13 @@ in listenAddress = mkOption { default = ":9000"; type = types.str; - description = "Listen on a specific IP address and port."; + description = "IP address and port of the server."; + }; + + consoleAddress = mkOption { + default = ":9001"; + type = types.str; + description = "IP address and port of the web UI (console)."; }; dataDir = mkOption { @@ -99,7 +105,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${toString cfg.dataDir}"; + ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --console-address ${cfg.consoleAddress} --config-dir=${cfg.configDir} ${toString cfg.dataDir}"; Type = "simple"; User = "minio"; Group = "minio"; From 1c54ce56abb405500984c260102d98eff0678b4f Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 9 Aug 2021 23:08:03 +0200 Subject: [PATCH 317/375] nixos/minio: add release notes --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 5d2a7189a2d2..eacdb902da14 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -687,6 +687,15 @@ yambar-wayland if you are on wayland. + + + The services.minio module gained an + additional option consoleAddress, that + configures the address and port the web UI is listening, it + defaults to :9001. To be able to access the + web UI this port needs to be opened in the firewall. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 99bc47e4a12e..3a08df5b341d 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -173,6 +173,10 @@ pt-services.clipcat.enable). - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. +- The `services.minio` module gained an additional option `consoleAddress`, that +configures the address and port the web UI is listening, it defaults to `:9001`. +To be able to access the web UI this port needs to be opened in the firewall. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. From 1eb62cee70d5b316376311389aa1981efbfbd1ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Aug 2021 22:40:53 +0200 Subject: [PATCH 318/375] python3Packages.yeelight: 0.6.3 -> 0.7.2 --- pkgs/development/python-modules/yeelight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 888708e799c7..dc10c3d58143 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.6.3"; + version = "0.7.2"; disabled = pythonOlder "3.4"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-71ncPGcqTRSldWVhJ2uZ2AEgkv1KO2i6UtAUTcJcru8="; + sha256 = "06pg5q50dw5a0h6jnln8419asi8nahzvlk0s65ymykqq0jxac31y"; }; propagatedBuildInputs = [ From 260181cf0ca9322a22a775a6ae31a76fc3436cb0 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Wed, 11 Aug 2021 07:10:38 +1000 Subject: [PATCH 319/375] python3Packages.debugpy: add apple silicon support --- pkgs/development/python-modules/debugpy/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 9e821bf2dd1a..35ac416d5992 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -57,10 +57,11 @@ buildPythonPackage rec { cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process rm *.so *.dylib *.dll *.exe *.pdb ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{ - "x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so"; - "i686-linux" = "-shared -m32 -o attach_linux_x86.so"; - "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; - "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; + "x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so"; + "i686-linux" = "-shared -m32 -o attach_linux_x86.so"; + "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; + "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; + "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; }.${stdenv.hostPlatform.system}} )''; @@ -95,6 +96,6 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/debugpy"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" "aarch64-darwin" ]; }; } From 42d109da85e06f07c7f6a833a653ce23974ef631 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 21:20:59 +0000 Subject: [PATCH 320/375] cargo-release: 0.16.2 -> 0.16.3 --- pkgs/tools/package-management/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 6b4e450a70cb..cc577098562b 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-o3AKA/uP6VWMO4c62H3ey0P98KIhbzhnng5ggKjNeZ8="; + sha256 = "sha256-VAXuxHCayjmuI26rhJroEBbnyJ4z+w7HY5TNTanYvpw="; }; - cargoSha256 = "sha256-SHLiUVH5LiQNd/Ipj/xrjSG0X2HXfcAwswqsbqweJBs="; + cargoSha256 = "sha256-cXuAPQ8xRkeixWNYGjStNipbn4xIc1NsfVqROd6RHdg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From 6a94af558bb30ca1494c19be46414f5549b6ace6 Mon Sep 17 00:00:00 2001 From: luhuaei Date: Tue, 10 Aug 2021 23:05:35 +0800 Subject: [PATCH 321/375] pymupdf: fix version incorrect cause build error --- .../python-modules/pymupdf/default.nix | 6 +----- .../python-modules/pymupdf/nix-support.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/pymupdf/nix-support.patch diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index ff7b9a464998..e749c467ab19 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , mupdf , swig , freetype @@ -26,10 +25,7 @@ buildPythonPackage rec { patches = [ # Add NIX environment support. # Should be removed next pyMuPDF release. - (fetchpatch { - url = "https://github.com/pymupdf/PyMuPDF/commit/d9b2d42019e5705a1c6621ea0cdfa26da1ce9ad5.patch"; - sha256 = "fc3f6ad88c8f3933ed9ab9d4db9ebec8bc30ed5113f6ca9d72080b56dfa52ad6"; - }) + ./nix-support.patch ]; postPatch = '' diff --git a/pkgs/development/python-modules/pymupdf/nix-support.patch b/pkgs/development/python-modules/pymupdf/nix-support.patch new file mode 100644 index 000000000000..e0a14337a8d9 --- /dev/null +++ b/pkgs/development/python-modules/pymupdf/nix-support.patch @@ -0,0 +1,17 @@ +--- a/setup.py ++++ b/setup.py +@@ -36,10 +36,14 @@ LIBRARIES = { + "opensuse": OPENSUSE, + "fedora": FEDORA, + "alpine": ALPINE, ++ "nix": FEDORA, + } + + + def load_libraries(): ++ if os.getenv("NIX_STORE"): ++ return LIBRARIES["nix"] ++ + try: + import distro + From 20f7b7517e28f4ac5a4c95a7e2042395120ed4e8 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 11 Aug 2021 00:01:07 +0200 Subject: [PATCH 322/375] ioquake3: 2020-12-26 -> 2021-07-20 --- pkgs/games/quake3/ioquake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index e006507a6335..1ac8a41ca1a7 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "ioquake3-git"; - version = "2020-12-26"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "05180e32dcfb9a4552e1b9652b56127248a9950c"; - sha256 = "0hcxxa1ambpdwhg7nb5hvb32g49rl5p9dcflpzcv5cax9drn166i"; + rev = "bc8737d707595aebd7cc11d6d5a5d65ede750f59"; + sha256 = "1icrkaw6c5c5ndy886bn65lycwnxzxwvz0ndz4p9i6r716k11add"; }; nativeBuildInputs = [ which pkg-config ]; From 79a86e7ef53d8ebd0ef944d8c2fca645798c43e7 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 1 Aug 2021 13:09:26 +0200 Subject: [PATCH 323/375] treewide: Port type adaptations --- .../services/continuous-integration/jenkins/default.nix | 2 +- nixos/modules/services/development/hoogle.nix | 2 +- nixos/modules/services/misc/home-assistant.nix | 2 +- nixos/modules/services/networking/i2pd.nix | 4 ++-- nixos/modules/services/networking/shout.nix | 2 +- nixos/modules/services/networking/syncplay.nix | 2 +- nixos/modules/services/networking/zeronet.nix | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 889688a26853..98ef1e2c691b 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -61,7 +61,7 @@ in { port = mkOption { default = 8080; - type = types.int; + type = types.port; description = '' Specifies port number on which the jenkins HTTP interface listens. The default is 8080. diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix index 6d6c88b9b2aa..a6693013b73c 100644 --- a/nixos/modules/services/development/hoogle.nix +++ b/nixos/modules/services/development/hoogle.nix @@ -17,7 +17,7 @@ in { enable = mkEnableOption "Haskell documentation server"; port = mkOption { - type = types.int; + type = types.port; default = 8080; description = '' Port number Hoogle will be listening to. diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index dcd825bba433..f1a1a88580eb 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -78,7 +78,7 @@ in { port = mkOption { default = 8123; - type = types.int; + type = types.port; description = "The port on which to listen."; }; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 93a21fd4c97e..fba0d817006e 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -32,9 +32,9 @@ let description = "Bind address for ${name} endpoint."; }; port = mkOption { - type = types.int; + type = types.port; default = port; - description = "Bind port for ${name} endoint."; + description = "Bind port for ${name} endpoint."; }; }; diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index a808a7f39d05..405808491ea4 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -41,7 +41,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 9000; description = "TCP port to listen on for http connections."; }; diff --git a/nixos/modules/services/networking/syncplay.nix b/nixos/modules/services/networking/syncplay.nix index e3147c10502c..27a16fb2e29f 100644 --- a/nixos/modules/services/networking/syncplay.nix +++ b/nixos/modules/services/networking/syncplay.nix @@ -21,7 +21,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 8999; description = '' TCP port to bind to. diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index f354a9d42c79..a34b2d871541 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -32,7 +32,7 @@ in with lib; { }; port = mkOption { - type = types.int; + type = types.port; default = 43110; example = 43110; description = "Optional zeronet web UI port."; @@ -41,7 +41,7 @@ in with lib; { fileserverPort = mkOption { # Not optional: when absent zeronet tries to write one to the # read-only config file and crashes - type = types.int; + type = types.port; default = 12261; example = 12261; description = "Zeronet fileserver port."; From 6418b5d2d54bdd3f103d69b4ce212129329cda54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Wed, 11 Aug 2021 01:06:34 +0200 Subject: [PATCH 324/375] neovide: Fix #133409 by backporting freetype --- .../editors/neovim/neovide/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 55f75777bee5..9e37079ee68f 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -3,6 +3,7 @@ , lib , fetchFromGitHub , fetchgit +, fetchurl , makeWrapper , pkg-config , python2 @@ -10,6 +11,7 @@ , openssl , SDL2 , fontconfig +, freetype , ninja , gn , llvmPackages @@ -82,7 +84,18 @@ rustPlatform.buildRustPackage rec { expat openssl SDL2 - fontconfig + (fontconfig.overrideAttrs (old: { + propagatedBuildInputs = [ + # skia is not compatible with freetype 2.11.0 + (freetype.overrideAttrs (old: rec { + version = "2.10.4"; + src = fetchurl { + url = "mirror://savannah/${old.pname}/${old.pname}-${version}.tar.xz"; + sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46"; + }; + })) + ]; + })) ]; postFixup = '' From a517d00046a3a0e9764de4a93b02d2e7cd50e704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Wed, 11 Aug 2021 01:10:31 +0200 Subject: [PATCH 325/375] neovide: Remove expat Expat is provided via skia. --- pkgs/applications/editors/neovim/neovide/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 9e37079ee68f..f0dd1e057e44 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -7,7 +7,6 @@ , makeWrapper , pkg-config , python2 -, expat , openssl , SDL2 , fontconfig @@ -81,7 +80,6 @@ rustPlatform.buildRustPackage rec { doCheck = false; buildInputs = [ - expat openssl SDL2 (fontconfig.overrideAttrs (old: { From 044315a1a5835c8a61561489e1b6f85b89c69f44 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 10 Aug 2021 23:13:07 +0000 Subject: [PATCH 326/375] helix: set meta.mainProgram --- pkgs/applications/editors/helix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index a36ff1cde464..315951b0e9e6 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec { description = "A post-modern modal text editor"; homepage = "https://helix-editor.com"; license = licenses.mpl20; + mainProgram = "hx"; maintainers = with maintainers; [ yusdacra ]; }; } From be03a55b3614e120eee65c8cfb9f95c4dab0cea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Wed, 11 Aug 2021 01:13:12 +0200 Subject: [PATCH 327/375] neovide: 2021-06-21 -> 2021-08-08 --- pkgs/applications/editors/neovim/neovide/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index f0dd1e057e44..7733f123ac01 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -22,16 +22,16 @@ }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "unstable-2021-06-21"; + version = "unstable-2021-08-08"; src = fetchFromGitHub { owner = "Kethku"; repo = "neovide"; - rev = "4159c47ff4f30073b92b9d63fc6ab70e07b74b6d"; - sha256 = "sha256-XwirJGXMGxc/NkpSeHBUc16ppvJ+H4ECnrOVu030Qfg="; + rev = "725f12cafd4a26babd0d6bbcbca9a99c181991ac"; + sha256 = "sha256-ThMobWKe3wHhR15TmmKrI6Gp1wvGVfJ52MzibK0ubkc="; }; - cargoSha256 = "sha256-WCk9kt81DtBwpEEdKH9gKQSVxAvH+vkyP2y24tU+vzY="; + cargoSha256 = "sha256-5lOGncnyA8DwetY5bU6k2KXNClFgp+xIBEeA0/iwGF0="; SKIA_SOURCE_DIR = let @@ -39,8 +39,8 @@ rustPlatform.buildRustPackage rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m90-0.38.3"; - sha256 = "sha256-l8c4vfO1PELAT8bDyr/yQGZetZsaufAlJ6bBOXz7E1w="; + rev = "m91-0.39.4"; + sha256 = "sha256-ovlR1vEZaQqawwth/UYVUSjFu+kTsywRpRClBaE1CEA="; }; # The externals for skia are taken from skia/DEPS externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json); From c78baa08d3f73d15fd063aaa71cbd08f86f64731 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 11 Aug 2021 01:35:31 +0200 Subject: [PATCH 328/375] openimageio2: 2.2.12.0 -> 2.2.17.0 --- pkgs/applications/graphics/openimageio/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 8c9639e3fd52..17a811aa87f8 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.2.12.0"; + version = "2.2.17.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "16z8lnsqhljbfaarfwx9rc95p0a9wxf4p271j6kxdfknjb88p56i"; + sha256 = "0jqpb1zci911wdm928addsljxx8zsh0gzbhv9vbw6man4wi93h6h"; }; outputs = [ "bin" "out" "dev" "doc" ]; From e8f74e79261f8b760a6ead718032aec091552f61 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 23:58:24 +0000 Subject: [PATCH 329/375] deno: 1.12.2 -> 1.13.0 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 308cf7b8f54f..a6c879f77fea 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xIFJv/roTD7sq7vCy4JDwe8gYDMuZd34vyjS08xeijI="; + sha256 = "sha256-iSL9YAcYdeZ9E5diAJG1oHzujPmfblOvheewOu9QIu8="; }; - cargoSha256 = "sha256-aETAFh5yTE+ZonDC0ITdaZ2YN3/SpYROsXP47aNEICE="; + cargoSha256 = "sha256-1aibJwZ3o3bU5PWPVPBsRpjGo4JgOsNAgnPVAk1ZQHE="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index a85d2bf76f2d..15c20cf4d768 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.25.3"; + version = "0.26.0"; shas = { - x86_64-linux = "sha256-Z3lEJT3QVhP8PoDiM6Fw0sm5rXWvasBqASBO5tZA5zM="; - aarch64-linux = "sha256-pbcd1zV7IIEqCIp8vsRiO0KBGrOv52SvMZ4gthxuN/I="; - x86_64-darwin = "sha256-BwYdgd1kK8EQFfDc9RgtNvwvx7agt9hYNVmBGwHoqz0="; - aarch64-darwin = "sha256-/RHeNuR7VjhfwdjZXWMMX3UnweAjJblSCUq9eIwGvWc="; + x86_64-linux = "sha256-eYvfsgkLuV//4NmnxTNgB5vGoQ2JdSpXwF34d1kNxBw="; + aarch64-linux = "sha256-t+0/bJI4q2XElYz398aig/widJEOAascOmv4qnnKMQY="; + x86_64-darwin = "sha256-lYJcx5Oe/nuF3l5coH4WIMbBbiFMwxNWlIYojrdiJfI="; + aarch64-darwin = "sha256-5blisZ4Z/f68fZg7aDr5WK4MNvL5IRZZSJrvFb9N5oY="; }; } From 46f4391873154fbdcff4093e7baf820b16d4c8e3 Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 10 Aug 2021 20:34:42 +0000 Subject: [PATCH 330/375] obs-studio: add aarch64 support --- .../applications/video/obs-studio/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index d7784279c315..82040203c4f3 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,4 +1,6 @@ -{ config, lib, stdenv +{ config +, lib +, stdenv , mkDerivation , fetchFromGitHub , addOpenGLRunpath @@ -41,7 +43,8 @@ let inherit (lib) optional optionals; -in mkDerivation rec { +in +mkDerivation rec { pname = "obs-studio"; version = "27.0.0"; @@ -61,7 +64,13 @@ in mkDerivation rec { ./Change-product_version-to-user_agent_product.patch ]; - nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config ]; + nativeBuildInputs = [ + addOpenGLRunpath + cmake + pkg-config + makeWrapper + ] + ++ optional scriptingSupport swig; buildInputs = [ curl @@ -81,10 +90,9 @@ in mkDerivation rec { wayland x264 libvlc - makeWrapper mbedtls ] - ++ optionals scriptingSupport [ luajit swig python3 ] + ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio ++ optional pipewireSupport pipewire; @@ -132,7 +140,7 @@ in mkDerivation rec { ''; homepage = "https://obsproject.com"; maintainers = with maintainers; [ jb55 MP2E V ]; - license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; }; } From f3209301351de3eed88683489e1fbbf708cd5a4a Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 10 Aug 2021 20:34:42 +0000 Subject: [PATCH 331/375] libcef: add aarch64 support --- pkgs/development/libraries/libcef/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index c3d6516a3dfd..de8164f06e57 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, cmake +{ lib +, stdenv +, fetchurl +, cmake , glib , nss , nspr @@ -52,18 +55,34 @@ let cups libxshmfence ]; -in stdenv.mkDerivation rec { + platforms = { + "aarch64-linux" = { + platformStr = "linuxarm64"; + projectArch = "arm64"; + sha256 = "1j93qawh9h6k2ic70i10npppv5f9dch961lc1wxwsi68daq8r081"; + }; + "x86_64-linux" = { + platformStr = "linux64"; + projectArch = "x86_64"; + sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj"; + }; + }; + + platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; +in +stdenv.mkDerivation rec { pname = "cef-binary"; version = "90.6.7"; gitRevision = "19ba721"; chromiumVersion = "90.0.4430.212"; src = fetchurl { - url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_linux64_minimal.tar.bz2"; - sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj"; + url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; + inherit (platformInfo) sha256; }; nativeBuildInputs = [ cmake ]; + cmakeFlags = "-DPROJECT_ARCH=${platformInfo.projectArch}"; makeFlags = [ "libcef_dll_wrapper" ]; dontStrip = true; dontPatchELF = true; @@ -83,6 +102,6 @@ in stdenv.mkDerivation rec { homepage = "https://cef-builds.spotifycdn.com/index.html"; maintainers = with maintainers; [ puffnfresh ]; license = licenses.bsd3; - platforms = with platforms; linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } From cee1de0975de331ba3de7734501de311adb2e6f9 Mon Sep 17 00:00:00 2001 From: Jade Date: Wed, 11 Aug 2021 01:16:34 +0000 Subject: [PATCH 332/375] libcef: support i686 Previously, libcef did not actually support i686!! It compiled against a 64 bit chromium, which may have actually worked on CI but it would not work so well on an actual 32 bit machine. --- pkgs/development/libraries/libcef/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index de8164f06e57..85163daad0a1 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -61,6 +61,11 @@ let projectArch = "arm64"; sha256 = "1j93qawh9h6k2ic70i10npppv5f9dch961lc1wxwsi68daq8r081"; }; + "i686-linux" = { + platformStr = "linux32"; + projectArch = "x86"; + sha256 = "0ki4zr8ih06kirgbpxbinv4baw3qvacx208q6qy1cvpfh6ll4fwb"; + }; "x86_64-linux" = { platformStr = "linux64"; projectArch = "x86_64"; @@ -102,6 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://cef-builds.spotifycdn.com/index.html"; maintainers = with maintainers; [ puffnfresh ]; license = licenses.bsd3; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; } From 58156d95e927cc51956b03b88a0f187a650fa4ac Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 11 Aug 2021 04:31:46 +0300 Subject: [PATCH 333/375] antsimulator: fix texture path --- pkgs/games/antsimulator/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/games/antsimulator/default.nix b/pkgs/games/antsimulator/default.nix index bb17add2cc9d..bac481c88f35 100644 --- a/pkgs/games/antsimulator/default.nix +++ b/pkgs/games/antsimulator/default.nix @@ -14,8 +14,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ sfml ]; + postPatch = '' + substituteInPlace src/main.cpp \ + --replace "res/" "$out/opt/antsimulator/" + + substituteInPlace include/simulation/config.hpp \ + --replace "res/" "$out/opt/antsimulator/" + + substituteInPlace include/render/colony_renderer.hpp \ + --replace "res/" "$out/opt/antsimulator/" + ''; + installPhase = '' - mkdir -p $out/bin + install -Dm644 -t $out/opt/antsimulator res/* install -Dm755 ./AntSimulator $out/bin/antsimulator ''; From 2220ca1e3ca809e34b105c35b32145d2ebbe0378 Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 9 Aug 2021 01:50:59 +0200 Subject: [PATCH 334/375] cryptpad: 3.20.1 -> 4.9.0 --- .../web-apps/cryptpad/bower-packages.nix | 24 +++-- pkgs/servers/web-apps/cryptpad/default.nix | 18 +++- pkgs/servers/web-apps/cryptpad/generate.sh | 13 ++- .../cryptpad/node-packages-generated.nix | 98 ++++++++++--------- .../web-apps/cryptpad/node-packages.json | 2 +- 5 files changed, 88 insertions(+), 67 deletions(-) diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix index be0c3ab72c75..83c707472931 100644 --- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix @@ -1,42 +1,40 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "jquery" "2.1.0" "~2.1.0" "02kwvz93vzpv10qnp7s0dz3al0jh77awwrizb6wadsvgifxssnlr") (fetchbower "jquery" "2.2.4" "2.2.4" "0kaln93pzjlr4vqf2zvsm9dwgjkrii9xlsqg48hc1vs16cl109rn") (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g") (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1") (fetchbower "ckeditor" "4.14.0" "4.14.0" "0lw9q0k8c0jlxvf35vrccab9c3c8rgpc6x66czj9si8yy2lyliyp") - (fetchbower "codemirror" "5.56.0+components1" "^5.19.0" "0fv8rxw6dspyv4bl6p2aka57544f45527rallnhnm5scv77qnakm") + (fetchbower "codemirror" "5.61.1" "^5.19.0" "1abm1fcps86y2qm033wa96pd6ixf9w01vlhly5i51j0j94arnz4g") (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli") (fetchbower "marked" "1.1.0" "1.1.0" "1sdgqw9iki9c1pfm4c5h6c956mchbip2jywjrcmrlb75k53flsjz") (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv") (fetchbower "json.sortify" "2.1.0" "~2.1.0" "1rz9xz0gnm4ak31n10vhslqsw8fw493gjylwj8xsy3bxqq1ygpnh") (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a") (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9") - (fetchbower "chainpad-crypto" "0.2.4" "^0.2.0" "0sqqc2j0pc34ig6319n18i85j03hibqkhz3cbr70vbd8x43vfzby") - (fetchbower "chainpad-listmap" "0.9.0" "^0.9.0" "173yr5a6zxq7nb3fha6f1ajv2vy0mvqwmm949ww7ihvrhh7cd0f5") - (fetchbower "chainpad" "5.2.2" "^5.2.0" "1rmh039bqk11xnnh99sqrqksr4idly75y5q4f5wyl9cg4slsqrdp") + (fetchbower "chainpad-crypto" "0.2.6" "^0.2.0" "0h6ibv6gcym7mm080swdw4l6l159xjmxgqnahyxw3aydha5cj1z0") + (fetchbower "chainpad-listmap" "0.10.2" "^0.10.0" "03j3qws0icam4c0yqrz7f6maf1dxhlc56hc6csr2d9dx0wshd57s") + (fetchbower "chainpad" "5.2.4" "^5.2.0" "1f4nap0r8w50qpmjdfhhjhpz5xcl0n4zaxxnav1qaxi5j6dyg8h6") (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg") (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l") (fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv") (fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq") (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556") - (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") - (fetchbower "bootstrap" "4.5.0" "^v4.0.0" "0cfdn6z8jwx6y8lbbq6xpkfhq2vra0i84nkj9ji2bil1fzgzi40f") + (fetchbower "bootstrap" "4.6.0" "^v4.0.0" "1pp2n88pkms25p7mbna7vxxl5mkpdn8nvnfzwcwpp6b0871njmr6") (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1") (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5") (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf") - (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6") - (fetchbower "localforage" "1.8.1" "^1.5.2" "0ci265385racnxvn4g1n672yaxi47msw6k042nxdb5vlpf5g327j") + (fetchbower "bootstrap-tokenfield" "0.12.1" "0.12.1" "1dh791s6ih8bf9ihck9n39h68c273jb3lg4mqk94bvqraz45fvwx") + (fetchbower "localforage" "1.9.0" "^1.5.2" "18ds5427gaschld5afwi128hqy8kysa1b1ckbrzbmqz8xnlshmc2") (fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69") (fetchbower "croppie" "2.6.5" "^2.5.0" "1j1v5620zi13ad42r358i4ay891abwn6nz357484kgq2bgjj6ccx") - (fetchbower "sortablejs" "1.10.2" "^1.6.0" "10q4gyblhjy7w51clr0k9j7h722l4ybzn5535givwpmp6xagv11v") + (fetchbower "sortablejs" "1.14.0" "^1.6.0" "104d688lrbwxi3hnfr4q169850ffyfv1s8qnycqxhx0zfh3887m0") (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi") - (fetchbower "jszip" "Stuk/jszip#3.5.0" "Stuk/jszip#^3.1.5" "1ra19d82cq1hrnbw88l8c61bs12kpgxvbfiiwpfi8fhy0l8hcsvk") + (fetchbower "jszip" "Stuk/jszip#3.7.1" "Stuk/jszip#^3.1.5" "0lzq1zd2glvfh3wwj73c9sffas56ql5472yj1cwq3g7iva5iliwq") (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5") (fetchbower "dragula.js" "3.7.2" "3.7.2" "0dbkmrl8bcxiplprmmp9fj96ri5nahb2ql8cc7zwawncv0drvlh0") (fetchbower "MathJax" "3.0.5" "3.0.5" "087a9av15qj43m8pr3b9g59ncmydhmg40m6dfzsac62ykianh2a0") - (fetchbower "chainpad-netflux" "0.11.2" "^0.11.0" "1dqfricbm6s8iv7w1bsx1700m5cpk5rk1f4spqv0fqyf6mdz366v") - (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz") + (fetchbower "chainpad-netflux" "0.12.9" "^0.12.0" "1b2jkfl354gs9iy05i6db9g0hnngacxd2wdv59lc0icbmx62fpvi") + (fetchbower "netflux-websocket" "0.1.21" "^0.1.20" "13ia8cqipq1jnyzzxwf9yy91gzwnwb2g5kzb6l8id5gdr415q5yn") (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz") ]; } diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix index abd20d644990..0d655ac5322d 100644 --- a/pkgs/servers/web-apps/cryptpad/default.nix +++ b/pkgs/servers/web-apps/cryptpad/default.nix @@ -2,6 +2,7 @@ , pkgs , lib , buildBowerComponents +, fetchbower , fetchurl , nodejs }: @@ -12,14 +13,21 @@ let inherit (stdenv.hostPlatform) system; }; - bowerPackages = buildBowerComponents { + bowerPackages = (buildBowerComponents { name = "${cryptpad.name}-bower-packages"; - # this list had to be tweaked by hand: - # * add the second jquery ~2.1.0 entry - # * add the second bootstrap ~3.1.1 entry generated = ./bower-packages.nix; src = cryptpad.src; - }; + }).overrideAttrs (old: { + bowerPackages = old.bowerPackages.override (old_: { + # add missing dependencies: + # * add the second jquery ~2.1.0 entry + # * add the second bootstrap ~3.1.1 entry + paths = old_.paths ++ [ + (fetchbower "jquery" "2.1.0" "~2.1.0" "02kwvz93vzpv10qnp7s0dz3al0jh77awwrizb6wadsvgifxssnlr") + (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") + ]; + }); + }); # find an element in an attribute set findValue = pred: default: set: diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh index 697b5a74a08a..dc4e230f316b 100755 --- a/pkgs/servers/web-apps/cryptpad/generate.sh +++ b/pkgs/servers/web-apps/cryptpad/generate.sh @@ -1,11 +1,16 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nodePackages.bower2nix +#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix -p nix + +cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw) +echo "cryptpad src: $cryptpadSrc" + +nix-shell -I nixpkgs=https://github.com/nixos/nixpkgs/tarball/18.03 -p nodePackages.bower2nix --run "bower2nix $cryptpadSrc/bower.json bower-packages.nix" + + set -euo pipefail node2nix --nodejs-12 \ --input node-packages.json \ --output node-packages-generated.nix \ --composition node-packages.nix \ - --node-env ../../../development/node-packages/node-env.nix \ - -# TODO: bower2nix > bower-packages.nix + --node-env ../../../development/node-packages/node-env.nix diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix index 47e64e9d911e..cbc12d113cfb 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -4,6 +4,15 @@ let sources = { + "@mcrowe/minibloom-0.2.0" = { + name = "_at_mcrowe_slash_minibloom"; + packageName = "@mcrowe/minibloom"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mcrowe/minibloom/-/minibloom-0.2.0.tgz"; + sha1 = "1bed96aec18388198da37443899b2c3ff5948053"; + }; + }; "accepts-1.3.7" = { name = "accepts"; packageName = "accepts"; @@ -49,22 +58,22 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "chainpad-crypto-0.2.5" = { + "chainpad-crypto-0.2.6" = { name = "chainpad-crypto"; packageName = "chainpad-crypto"; - version = "0.2.5"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.5.tgz"; - sha512 = "K9vRsAspuX+uU1goXPz0CawpLIaOHq+1JP3WfDLqaz67LbCX/MLIUt9aMcSeIJcwZ9uMpqnbMGRktyVPoz6MCA=="; + url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.6.tgz"; + sha512 = "yk7bBj22rs9PaX6LiqQxiw+Vj/afBStsNP1xP/B4Uh9a8iyJ7JrSZJ2Hj3d6fyqxJlBrMAX82Aj5PCZb5dzzHw=="; }; }; - "chainpad-server-4.0.9" = { + "chainpad-server-5.1.0" = { name = "chainpad-server"; packageName = "chainpad-server"; - version = "4.0.9"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.9.tgz"; - sha512 = "8h1W41ktE05TM6LuXrklpW2TUxWeNyIDiRaQygKsXaA/7pyJxF7+AmPVS+xW0c31VkHjQDPiaMzPoxhcxXnIyA=="; + url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-5.1.0.tgz"; + sha512 = "BdjgOOLTXXo1EjQ7lURDe7oqsqfQISNvwhILfp3K3diY2K1hxpPLbjYzOSgxNOTADeOAff0xnInR5eUCESVWaQ=="; }; }; "content-disposition-0.5.2" = { @@ -184,13 +193,13 @@ let sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; }; }; - "forwarded-0.1.2" = { + "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; "fresh-0.5.2" = { @@ -229,13 +238,13 @@ let sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "http-errors-1.6.3" = { @@ -337,22 +346,22 @@ let sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; }; }; - "mime-db-1.45.0" = { + "mime-db-1.49.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.45.0"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; - sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; }; }; - "mime-types-2.1.28" = { + "mime-types-2.1.32" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.28"; + version = "2.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; - sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; }; }; "ms-2.0.0" = { @@ -373,13 +382,13 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "netflux-websocket-0.1.20" = { + "netflux-websocket-0.1.21" = { name = "netflux-websocket"; packageName = "netflux-websocket"; - version = "0.1.20"; + version = "0.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.20.tgz"; - sha512 = "svFkw4ol4gmkcXKnx5kF/8tR9mmtTCDzUlLy4mSlcNl/4iWlbDmgwp/+aJ3nqtv8fg12m+DAFGX2+fbC0//dcg=="; + url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.21.tgz"; + sha512 = "Zjl5lefg8urC0a0T7YCPGiUgRsISZBsTZl1STylmQz8Bq4ohcZ8cP3r6VoCpeVcvJ1Y/e3ZCXPxndWlNP9Jfug=="; }; }; "nthen-0.1.8" = { @@ -418,13 +427,13 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-2.0.6" = { + "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; "pull-stream-3.6.14" = { @@ -647,27 +656,28 @@ let }; in { - "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.20.1" = nodeEnv.buildNodePackage { + "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#4.9.0" = nodeEnv.buildNodePackage { name = "cryptpad"; packageName = "cryptpad"; - version = "3.20.1"; + version = "4.9.0"; src = fetchgit { url = "https://github.com/xwiki-labs/cryptpad.git"; - rev = "9bc27d7d0d50d17c345bd545a45341a05293c558"; - sha256 = "4a1fc833b38b2097741500cef38c6b04f5b752c21736e95eb492c33012016332"; + rev = "b1281fb4abd14e9758d58df4801e0a00eda7bc44"; + sha256 = "ed2d0e2520645fccdada7fa5f25bb878c0ee0e61d6c81a98c18906c12750578c"; }; dependencies = [ + sources."@mcrowe/minibloom-0.2.0" sources."accepts-1.3.7" sources."array-flatten-1.1.1" sources."async-limiter-1.0.1" sources."body-parser-1.18.3" sources."bytes-3.0.0" - (sources."chainpad-crypto-0.2.5" // { + (sources."chainpad-crypto-0.2.6" // { dependencies = [ sources."tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2" ]; }) - sources."chainpad-server-4.0.9" + sources."chainpad-server-5.1.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" @@ -681,12 +691,12 @@ in sources."etag-1.8.1" sources."express-4.16.4" sources."finalhandler-1.1.1" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-extra-7.0.1" sources."gar-1.0.4" sources."get-folder-size-2.0.1" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.8" sources."http-errors-1.6.3" sources."iconv-lite-0.4.23" sources."inherits-2.0.3" @@ -698,16 +708,16 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.0.0" sources."negotiator-0.6.2" - sources."netflux-websocket-0.1.20" + sources."netflux-websocket-0.1.21" sources."nthen-0.1.8" sources."on-finished-2.3.0" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."pull-stream-3.6.14" sources."qs-6.5.2" sources."range-parser-1.2.1" diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json index 07e02a1a0a2e..fde63614a46a 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.json +++ b/pkgs/servers/web-apps/cryptpad/node-packages.json @@ -1,3 +1,3 @@ [ - { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.20.1" } + { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#4.9.0" } ] From 27c813679e9ecb403c9e63c8362a467f5574d57d Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 9 Aug 2021 17:08:55 +0200 Subject: [PATCH 335/375] cryptpad: generate.sh: stop using outdated nixpkgs --- pkgs/servers/web-apps/cryptpad/generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh index dc4e230f316b..f1e8e5e708fe 100755 --- a/pkgs/servers/web-apps/cryptpad/generate.sh +++ b/pkgs/servers/web-apps/cryptpad/generate.sh @@ -1,10 +1,10 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix -p nix +#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nix cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw) echo "cryptpad src: $cryptpadSrc" -nix-shell -I nixpkgs=https://github.com/nixos/nixpkgs/tarball/18.03 -p nodePackages.bower2nix --run "bower2nix $cryptpadSrc/bower.json bower-packages.nix" +nix-shell -I nixpkgs=../../../.. -p '(nodePackages.override { nodejs = nodejs-10_x; }).bower2nix' --run "bower2nix $cryptpadSrc/bower.json bower-packages.nix" set -euo pipefail From 6e59bc79696bc826fdbf6821c0e0eccad93703db Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 9 Aug 2021 17:09:46 +0200 Subject: [PATCH 336/375] cryptpad: use nodejs12 --- pkgs/servers/web-apps/cryptpad/generate.sh | 2 ++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh index f1e8e5e708fe..925420c49a58 100755 --- a/pkgs/servers/web-apps/cryptpad/generate.sh +++ b/pkgs/servers/web-apps/cryptpad/generate.sh @@ -1,6 +1,8 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nix +# This script is meant to be run in the current directory + cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw) echo "cryptpad src: $cryptpadSrc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1431bce8baf..4ac1624d7977 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3781,7 +3781,9 @@ with pkgs; cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; - cryptpad = callPackage ../servers/web-apps/cryptpad { }; + cryptpad = callPackage ../servers/web-apps/cryptpad { + nodejs = nodejs-12_x; + }; ethash = callPackage ../development/libraries/ethash { }; From df0f76b39ff419136f742e300eb7c07cc83bd54f Mon Sep 17 00:00:00 2001 From: DavHau Date: Tue, 10 Aug 2021 13:04:07 +0200 Subject: [PATCH 337/375] cryptpad: add test for nixos module --- nixos/tests/all-tests.nix | 1 + nixos/tests/cryptpad.nix | 18 ++++++++++++++++++ pkgs/servers/web-apps/cryptpad/default.nix | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 nixos/tests/cryptpad.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 30c1c77c6c94..8369f60e7b2e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -94,6 +94,7 @@ in cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {}; custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; + cryptpad = handleTest ./cryptpad.nix {}; deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./dendrite.nix {}; dhparams = handleTest ./dhparams.nix {}; diff --git a/nixos/tests/cryptpad.nix b/nixos/tests/cryptpad.nix new file mode 100644 index 000000000000..895f291abaca --- /dev/null +++ b/nixos/tests/cryptpad.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "cryptpad"; + meta.maintainers = with maintainers; [ davhau ]; + + nodes.machine = + { pkgs, ... }: + { services.cryptpad.enable = true; }; + + testScript = '' + machine.wait_for_unit("cryptpad.service") + machine.wait_for_open_port("3000") + machine.succeed("curl -L --fail http://localhost:3000/sheet") + ''; +}) diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix index 0d655ac5322d..88c9b30b1bb9 100644 --- a/pkgs/servers/web-apps/cryptpad/default.nix +++ b/pkgs/servers/web-apps/cryptpad/default.nix @@ -72,6 +72,9 @@ let EOF chmod +x $out/bin/cryptpad ''; + + meta.maintainers = with lib.maintainers; [ davhau ]; + }; in combined From 04412d1f518490214081c803362f9b8d14db09d4 Mon Sep 17 00:00:00 2001 From: DavHau Date: Tue, 10 Aug 2021 17:12:51 +0200 Subject: [PATCH 338/375] cryptpad: reformat with nixpkgs-fmt --- pkgs/servers/web-apps/cryptpad/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix index 88c9b30b1bb9..3d6c4ef55419 100644 --- a/pkgs/servers/web-apps/cryptpad/default.nix +++ b/pkgs/servers/web-apps/cryptpad/default.nix @@ -34,16 +34,16 @@ let let list = lib.concatMap - (name: - let v = set.${name}; in - if pred name v then [v] else [] - ) - (lib.attrNames set) - ; - in - if list == [] then default - else lib.head list + (name: + let v = set.${name}; in + if pred name v then [ v ] else [ ] + ) + (lib.attrNames set) ; + in + if list == [ ] then default + else lib.head list + ; # The cryptpad package attribute key changes for each release. Get it out # programatically instead. @@ -51,7 +51,7 @@ let (k: v: v.packageName == "cryptpad") (throw "cryptpad not found") nodePackages - ; + ; combined = cryptpad.override { postInstall = '' @@ -77,4 +77,4 @@ let }; in - combined +combined From 827142a43cdaca217a3106e77654c8dc6e5edf92 Mon Sep 17 00:00:00 2001 From: DavHau Date: Tue, 10 Aug 2021 17:19:11 +0200 Subject: [PATCH 339/375] cryptpad: add comment about EOL dependencies --- pkgs/servers/web-apps/cryptpad/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix index 3d6c4ef55419..3cb15c1e9765 100644 --- a/pkgs/servers/web-apps/cryptpad/default.nix +++ b/pkgs/servers/web-apps/cryptpad/default.nix @@ -20,6 +20,8 @@ let }).overrideAttrs (old: { bowerPackages = old.bowerPackages.override (old_: { # add missing dependencies: + # Those dependencies are EOL and they are not installed by buildBowerComponents, + # but they are required, otherwise the resolver crashes. # * add the second jquery ~2.1.0 entry # * add the second bootstrap ~3.1.1 entry paths = old_.paths ++ [ From 314fa1c0e620da78ee455b4dcffac498fe331a3e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 Aug 2021 00:16:56 +0200 Subject: [PATCH 340/375] grafana: 8.1.0 -> 8.1.1 ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.1.1 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 226efe51f56e..5648ea012938 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.1.0"; + version = "8.1.1"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-l7tVsxyUJ+WEPA3q3pcW3W74/2YlSgz84Au1A9a7s/E="; + sha256 = "sha256-dP0aBlp/956YyRGkIJTR9UtGBMTsSUBt9LYB5yIJvDU="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-OsjIK9NOU5XynzUOLyntTquH0UPwL/Eqw9XjaDsSO+g="; + sha256 = "sha256-kJHZmP+os+qmpdK2bm5FY7rdT0yyXrDYACn+U4xyUr8="; }; vendorSha256 = "sha256-cfErlr7YS+8TVy0+XWDiA3h1lMoV3efdsjuH+yEcwXs="; From e3324b346a0e8d6da6b34155e16d8f9cb384849b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Aug 2021 02:14:55 +0000 Subject: [PATCH 341/375] flyctl: 0.0.229 -> 0.0.230 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 8828b0222cc2..ccac1644b690 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.229"; + version = "0.0.230"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-mw+rTMFj41+T6lDe/MOQpmRcjt/gJhOCfaHcBkpjcsg="; + sha256 = "sha256-TI6pBtpUfI1vPsi+tq7FduFaZv9CvkAooqFmHCGslzI="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-NnHnSfm3XYiwgGn56GsthFKiflJvhYhjoxmm8ogm+Uc="; + vendorSha256 = "sha256-6t2aLSr78pEhrYI53OMQpfJqa65wQAxlz6+ksUtxzmI="; doCheck = false; From a375bbc5f06144bafa4972c74add063d212429da Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Wed, 11 Aug 2021 14:01:37 +1000 Subject: [PATCH 342/375] python3Packages.pymunk: add x86_64-darwin support --- pkgs/development/python-modules/pymunk/default.nix | 9 ++++++++- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index 92918efa8ed8..4ee22feed1df 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -1,9 +1,11 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchPypi , python , cffi , pytestCheckHook +, ApplicationServices }: buildPythonPackage rec { @@ -17,6 +19,9 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ cffi ]; + buildInputs = lib.optionals stdenv.isDarwin [ + ApplicationServices + ]; preBuild = '' ${python.interpreter} setup.py build_ext --inplace @@ -26,11 +31,13 @@ buildPythonPackage rec { pytestFlagsArray = [ "pymunk/tests" ]; + pythonImportsCheck = [ "pymunk" ]; meta = with lib; { description = "2d physics library"; homepage = "https://www.pymunk.org"; license = with licenses; [ mit ]; maintainers = with maintainers; [ angustrau ]; + platforms = platforms.linux ++ [ "x86_64-darwin" ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b30dfe4511bf..5c5c71396ec0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6323,7 +6323,9 @@ in { pymumble = callPackage ../development/python-modules/pymumble { }; - pymunk = callPackage ../development/python-modules/pymunk { }; + pymunk = callPackage ../development/python-modules/pymunk { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; + }; pymupdf = callPackage ../development/python-modules/pymupdf { }; From 6b9dc66a14e3e9aaf927d8071388043e98a5aa9e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 2 Aug 2021 01:43:27 +0300 Subject: [PATCH 343/375] =?UTF-8?q?radicle-upstream:=200.2.3=20=E2=86=92?= =?UTF-8?q?=200.2.9,=20enable=20on=20darwin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../radicle-upstream/default.nix | 83 ++++++++++++------- 1 file changed, 53 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index e91192d53de8..8774e69e48c6 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl }: +{ lib, stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl, undmg }: let pname = "radicle-upstream"; - version = "0.2.3"; + version = "0.2.9"; name = "${pname}-${version}"; - src = fetchurl { - url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "sha256-SL6plXZ+o7JchY/t/1702FK57fVjxllHqB8ZOma/43c="; + srcs = { + x86_64-linux = fetchurl { + url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; + sha256 = "sha256-chju3ZEFFLOzE9FakUK2izm/5ejELdL/iWMtM3bRpWY="; + }; + x86_64-darwin = fetchurl { + url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg"; + sha256 = "sha256-OOqe4diRcJWHHOa6jBpljPoA3FQOKlghMhKGQ242GnM="; + }; }; + src = srcs.${stdenv.hostPlatform.system}; - contents = appimageTools.extractType2 { inherit name src; }; + contents = appimageTools.extract { inherit name src; }; git-remote-rad = stdenv.mkDerivation rec { pname = "git-remote-rad"; @@ -25,40 +32,56 @@ let cp ${contents}/resources/git-remote-rad $out/bin/git-remote-rad ''; }; -in -# FIXME: a dependency of the `proxy` component of radicle-upstream (radicle-macros -# v0.1.0) uses unstable rust features, making a from source build impossible at -# this time. See this PR for discussion: https://github.com/NixOS/nixpkgs/pull/105674 -appimageTools.wrapType2 { - inherit name src; + # FIXME: a dependency of the `proxy` component of radicle-upstream (radicle-macros + # v0.1.0) uses unstable rust features, making a from source build impossible at + # this time. See this PR for discussion: https://github.com/NixOS/nixpkgs/pull/105674 + linux = appimageTools.wrapType2 { + inherit name src meta; - profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} - # this automatically adds the git-remote-rad binary to the users `PATH` so - # they don't need to mess around with shell profiles... - ln -s ${git-remote-rad}/bin/git-remote-rad $out/bin/git-remote-rad + # this automatically adds the git-remote-rad binary to the users `PATH` so + # they don't need to mess around with shell profiles... + ln -s ${git-remote-rad}/bin/git-remote-rad $out/bin/git-remote-rad - # desktop item - install -m 444 -D ${contents}/${pname}.desktop $out/share/applications/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + # desktop item + install -m 444 -D ${contents}/${pname}.desktop $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' - # icon - install -m 444 -D ${contents}/${pname}.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png - ''; + # icon + install -m 444 -D ${contents}/${pname}.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; + }; meta = with lib; { description = "A decentralized app for code collaboration"; homepage = "https://radicle.xyz/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ d-xo ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; -} +in +if stdenv.isDarwin +then darwin +else linux From 87e0fb5464d450250bf3dbca396ba430b72f7ddb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 06:55:04 +0200 Subject: [PATCH 344/375] python3Packages.python-gitlab: 2.9.0 -> 2.10.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 9d06569dfdc3..831ae6e39668 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.9.0"; + version = "2.10.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LFGxTN2aaAKDFaKw6IUl03YJZziPmfqlfeiQK0VGW+Y="; + sha256 = "sha256-N2s+mCOBzsc0RxxQKz2ixueFio300DyZNJnmp1k5UOY="; }; propagatedBuildInputs = [ From b42b61c636c2a85d44b2fbc06277e3dfe7ead802 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 07:03:06 +0200 Subject: [PATCH 345/375] python3Packages.pywebpush: 1.13.0 -> 1.14.0 --- pkgs/development/python-modules/pywebpush/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index a89e0b3789cf..c7c60d20f3cd 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "1.13.0"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "97ef000a685cd1f63d9d3553568508508904bfe419485df2b83b025d94e9ae54"; + sha256 = "sha256-bDbhZ5JoIZ5pO6lA2yvyVMJAygJmTeECtyaa/DxUVzE="; }; propagatedBuildInputs = [ @@ -36,6 +36,8 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "pywebpush" ]; + meta = with lib; { description = "Webpush Data encryption library for Python"; homepage = "https://github.com/web-push-libs/pywebpush"; From 74521637c7208d7e494912515386bd3cebe53409 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Wed, 11 Aug 2021 14:35:27 +1000 Subject: [PATCH 346/375] python3Packages.opensimplex: remove unneeded dependencies --- pkgs/development/python-modules/opensimplex/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix index d95aa846965d..6832266b87ad 100644 --- a/pkgs/development/python-modules/opensimplex/default.nix +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -1,10 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, autopep8 , nose -, pycodestyle -, twine }: buildPythonPackage rec { @@ -18,10 +15,11 @@ buildPythonPackage rec { sha256 = "idF5JQGnAye6z3c3YU9rsHaebB3rlHJfA8vSpjDnFeM="; }; - checkInputs = [ autopep8 nose pycodestyle twine ]; + checkInputs = [ nose ]; checkPhase = '' nosetests tests/ ''; + pythonImportsCheck = [ "opensimplex" ]; meta = with lib; { description = "OpenSimplex Noise functions for 2D, 3D and 4D"; From e4a64e4948a74cce034124e71c38c7400995c51b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 07:48:07 +0200 Subject: [PATCH 347/375] python3Packages.plugwise: 0.11.2 -> 0.12.0 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 3b37b236c48d..ec6d9c41a0d8 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = version; - sha256 = "sha256-ywVCa6PfyQ1SiejE2IYkf/IpQM0iDXJPpCm0vDtlrw8="; + sha256 = "sha256-fZ0mhsM7LroJgIyBO4eRzZaz2OQxa4Hhj1rNufHXvHI="; }; propagatedBuildInputs = [ From 30a6f6f2a8711b3c40baf8e6e51a5258bd8e7b4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 07:52:12 +0200 Subject: [PATCH 348/375] python3Packages.pylutron: 0.2.8 -> 0.2.9 --- pkgs/development/python-modules/pylutron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index 4f1180ebee4a..4bf56d5e6edc 100644 --- a/pkgs/development/python-modules/pylutron/default.nix +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pylutron"; - version = "0.2.8"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Jg2waoIxvBvX+hoAgt/yoM87XdShCHQOZXbsHG3b4cw="; + sha256 = "sha256-xy5XPNOrvdPZMCfa2MYA+xtUcFdGSurW5QYL6H7n2VI="; }; # Project has no tests From d02ee5f701e1b1a89104b4c4c60f7f62e864a194 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 07:54:41 +0200 Subject: [PATCH 349/375] python3Packages.pybotvac: 0.0.21 -> 0.0.22 --- pkgs/development/python-modules/pybotvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index f115b2b5c6a7..7bf5296eb362 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.21"; + version = "0.0.22"; src = fetchPypi { inherit pname version; - sha256 = "1hf692w44dmalv7hlcpwzbnr6xhvnmdv5nl1jcy2jhiwp89lkhzv"; + sha256 = "sha256-hl8UmoVUbbHCSpCWdUTxoIlop5di+rUmGUQI9UWq3ik="; }; propagatedBuildInputs = [ From e7836bc5a5a2a2257afd515e3e221c8ff5d67b97 Mon Sep 17 00:00:00 2001 From: Emil Karlson Date: Wed, 11 Aug 2021 09:06:17 +0300 Subject: [PATCH 350/375] sparse: add perl to buildInputs cgcc command has shebang of /usr/bin/perl, which obviously does not work for nixos, adding perl to buildInputs seems to make all the magic happen, as per usual. --- pkgs/development/tools/analysis/sparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 66b457f9902a..efbc46448259 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm }: +{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm, perl }: stdenv.mkDerivation rec { pname = "sparse"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 llvm ]; + buildInputs = [ libxml2 llvm perl ]; doCheck = true; meta = { From 3f2fc2d110a9c113f433fda4099319d6ae165155 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 08:08:23 +0200 Subject: [PATCH 351/375] python3Packages.websocket-client: 1.1.0 -> 1.2.0 --- .../python-modules/websocket-client/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index ee09ceb10504..4822922da3ce 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -3,28 +3,34 @@ , fetchPypi , pythonOlder , pytestCheckHook -, pysocks +, python-socks }: buildPythonPackage rec { pname = "websocket-client"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-to5JWdcEdo+iDjXJ1QjI3Cu8BB/Y0mfA1zRc/+KCRWg="; + sha256 = "sha256-dmW6bGRZibKLYWcIdKt1PmkpF56fyQVlrOasCQ9ZxVk="; }; - checkInputs = [ pytestCheckHook pysocks ]; + propagatedBuildInputs = [ + python-socks + ]; + + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "websocket" ]; meta = with lib; { description = "Websocket client for Python"; homepage = "https://github.com/websocket-client/websocket-client"; + changelog = "https://github.com/websocket-client/websocket-client/blob/v${version}/ChangeLog"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ fab ]; - changelog = "https://github.com/websocket-client/websocket-client/blob/v${version}/ChangeLog"; }; } From 8bd7a7deb5bb6dde33f3c8f2c690b0f730529e59 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Wed, 11 Aug 2021 16:09:34 +1000 Subject: [PATCH 352/375] portmidi: fix libporttime extension regression --- pkgs/development/libraries/portmidi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 0fb9636bc2a1..bdc6a44f00b8 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; postInstall = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' - ln -s libportmidi.${ext} "$out/lib/libporttime.${ext}" + ln -s libportmidi${ext} "$out/lib/libporttime${ext}" ''; nativeBuildInputs = [ unzip cmake ]; From 83bc698fba4d05ef37826fb1fe732647f420c8ab Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 5 Aug 2021 15:45:07 +0900 Subject: [PATCH 353/375] nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index cd1f6062cfba..8f89fd6641d1 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -234,13 +234,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210707_02dd6bb"; + suffix = "pre20210802_47e96bb"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2"; - sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA="; + rev = "47e96bb533f8cacc171bec9b688b134de31a48a9"; + sha256 = "sha256-vwj1fAGn3Pl9Vr/qSL+oDxuwbRzEdI3dsEg6o3xTmWg="; }; boehmgc = boehmgc_nixUnstable; From 247b53f48491cdebded4ead91d0a0863961b92d3 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 11 Aug 2021 00:21:48 +0900 Subject: [PATCH 354/375] hydra-unstable: 2021-05-03 -> 2021-08-11 --- pkgs/development/tools/misc/hydra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index a124b4a5c6e2..ac5600519b49 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -2,12 +2,12 @@ { hydra-unstable = callPackage ./common.nix { - version = "2021-05-03"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468"; - sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0="; + rev = "9bce425c3304173548d8e822029644bb51d35263"; + sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU="; }; nix = nixUnstable; From c93b682775a946cea63c48e2634870997cd4564c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Aug 2021 06:16:34 +0000 Subject: [PATCH 355/375] clair: 4.1.2 -> 4.2.0 --- pkgs/tools/admin/clair/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index b0765d852ca0..836f9082d242 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "4.1.2"; + version = "4.2.0"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eeNJ6oQayPBOHKsFrr2JbdLSv3R7N1xW3lV4LgVpUI4="; + sha256 = "sha256-PVR7QMndjfCNVo9U3lnArpRBxLfmOH8iEdFub7hZyio="; }; - vendorSha256 = "sha256-79+j/+X9DQBpUvZuyQCSaoy1f4UnkERh54zmo4AhGwc="; + vendorSha256 = "sha256-npskCUVxNTgI8egVU1id02xHFfTizOb7kBUNfOLdbOc="; doCheck = false; From 3c77195e816e529c863f482156506fb86d8dab12 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Wed, 11 Aug 2021 08:26:41 +0200 Subject: [PATCH 356/375] pscale: 0.60.0 -> 0.63.0 --- pkgs/development/tools/pscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 483a85db02a1..657b1965012e 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.60.0"; + version = "0.63.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-hrWSieWeVAg28f3Fh9mElr+mDh4v4T5JI1c3+Hrm7c0="; + sha256 = "sha256-LYVR8vcMS6ErYH4sGRi1JT9E4ElYe5mloc3C1TudzSE="; }; - vendorSha256 = "sha256-h4YUQWmFYouEvHup8Pu6OqfHf1EoPszVFzklU9SbJZQ="; + vendorSha256 = "sha256-3LuzdvwLYSL7HaGbKDfrqBz2FV2yr6YUdI5kXXiIvbU="; meta = with lib; { homepage = "https://www.planetscale.com/"; From 5dfe6e1a2a8b8c4ee4ae87663d106f2c3e0fd56d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Aug 2021 06:36:31 +0000 Subject: [PATCH 357/375] conftest: 0.26.0 -> 0.27.0 --- pkgs/development/tools/conftest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 473196f9a96b..1ba8cb0a9d3d 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-AIFZhe0N6FT06IrDVF2OVfSwmQVg62ZglOcnnDL9TK8="; + sha256 = "sha256-Yc/aejGLMbAqpIRTVQQ3lv7/oyr7tVAy41Gx6198Eos="; }; - vendorSha256 = "sha256-7wj1n5ggYYrmMrDuQkbbJ2C1S1LHawkkj91owHDIwr0="; + vendorSha256 = "sha256-jI5bX6S2C0ckiiieVlaRNEsLS/5gGkC3o/xauDtCOjA="; doCheck = false; From cf427857a50390b17c382c75a0aa147ec297f48a Mon Sep 17 00:00:00 2001 From: Amanda Cameron Date: Wed, 16 Oct 2019 17:09:38 -0400 Subject: [PATCH 358/375] vscode: Fix vscode-with-extensions with #70486 --- pkgs/applications/editors/vscode/generic.nix | 2 +- .../editors/vscode/with-extensions.nix | 26 +++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index a7f9fb328ffe..7279d6bf60b5 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -22,7 +22,7 @@ let inherit pname version src sourceRoot; passthru = { - inherit executableName tests updateScript; + inherit executableName longName tests updateScript; fhs = fhs {}; fhsWithPackages = f: fhs { additionalPkgs = f; }; }; diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index d2c91f155d53..8f4e7f004245 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, buildEnv, vscode, makeWrapper +{ lib, stdenv, runCommand, buildEnv, vscode, makeWrapper , vscodeExtensions ? [] }: /* @@ -42,8 +42,7 @@ */ let - - inherit (vscode) executableName; + inherit (vscode) executableName longName; wrappedPkgVersion = lib.getVersion vscode; wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name; @@ -52,6 +51,9 @@ let paths = vscodeExtensions; }; + extensionsFlag = lib.optionalString (vscodeExtensions != []) '' + --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions" + ''; in # When no extensions are requested, we simply redirect to the original @@ -62,7 +64,17 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { dontPatchELF = true; dontStrip = true; meta = vscode.meta; -} '' +} (if stdenv.isDarwin then '' + mkdir -p $out/bin/ + mkdir -p "$out/Applications/${longName}.app/Contents/MacOS" + + for path in PkgInfo Frameworks Resources _CodeSignature Info.plist; do + ln -s "${vscode}/Applications/${longName}.app/Contents/$path" "$out/Applications/${longName}.app/Contents/" + done + + makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${extensionsFlag} + makeWrapper "${vscode}/Applications/${longName}.app/Contents/MacOS/Electron" "$out/Applications/${longName}.app/Contents/MacOS/Electron" ${extensionsFlag} +'' else '' mkdir -p "$out/bin" mkdir -p "$out/share/applications" mkdir -p "$out/share/pixmaps" @@ -70,7 +82,5 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png" ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" - makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) '' - --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions" - ''} -'' + makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${extensionsFlag} +'') From 0cf5fbfd95021cb26e0ee2a022c64e52fb9c91fc Mon Sep 17 00:00:00 2001 From: Samuel Noordhuis Date: Wed, 11 Aug 2021 17:01:13 +1000 Subject: [PATCH 359/375] terraform-docs: 0.14.1 -> 0.15.0 --- .../networking/cluster/terraform-docs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index bc04d283507b..44ceb3f16227 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-docs"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jm0ySxn4GFW4iAH3tOIvclcDGJMKzH7m7fhWnAf4+gs="; + sha256 = "sha256-PzGlEEhootf2SCOy7+11aST7NMTNhNMQWeZO40mrMYQ="; }; - vendorSha256 = "sha256-IzmAlthE6SVvGHj72wrY1/KLehOv8Ck9VaTv5jMpt48="; + vendorSha256 = "sha256-T/jgFPBUQMATX7DoWsDR/VFjka7Vxk7F4taE25cdnTk="; subPackages = [ "." ]; From 793509b6253520c027f79a6c4f26e2ca71339d85 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Aug 2021 07:18:11 +0000 Subject: [PATCH 360/375] dnsx: 1.0.5 -> 1.0.6 --- pkgs/tools/security/dnsx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 75c85deb1cce..7872e4a8eace 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "v${version}"; - sha256 = "sha256-w+FQp5pvySM36UHFxBH5WRZvnGi43NZeI2tLr6HAF3Q="; + sha256 = "sha256-rAicKytDtdnPwWdxJvBd5UnMGTAI4NHcPUjISlT7kCw="; }; - vendorSha256 = "sha256-gsoeAau3klOFTu+ZEYEMdIuXw/5IVsfFJ2maxPaZKjA="; + vendorSha256 = "sha256-8YoYfn2BFUnVwH9FcAgb1p5CV3dJVrWjEMPfivOGvQE="; meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; From 82358d47b0dde2d838832c5f176c5b3584a10506 Mon Sep 17 00:00:00 2001 From: Roberto Di Remigio Date: Wed, 11 Aug 2021 09:23:40 +0200 Subject: [PATCH 361/375] betterlockscreen: 4.0.0 -> 4.0.1 --- pkgs/misc/screensavers/betterlockscreen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index b7f8ce99b533..e449de9ca255 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "betterlockscreen"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "pavanjadhaw"; repo = "betterlockscreen"; rev = "v${version}"; - sha256 = "1ha1yddrcmbsdljdg3gn7i42csbw8h3zgf4i3mcsmbz8nsvc2wdc"; + sha256 = "sha256-eteuNEGc1BOlYgV7/hwe7z4zqqs/6EJzB88126U1jiU="; }; nativeBuildInputs = [ makeWrapper ]; From b4c85a2e682d02048e43b7f4e968bdceb6081ae9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Aug 2021 09:27:24 +0200 Subject: [PATCH 362/375] httpx: 1.1.0 -> 1.1.1 --- pkgs/tools/security/httpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 7c3e58634275..5905632294f2 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-selmBW6GlfzKbVHz7EgmUB8n567NS08gwkRB9Y+Px8s="; + sha256 = "sha256-uuHvU/KUHliY3FUwknp7ninKTY9qs+gI7WljgIvJEF4="; }; - vendorSha256 = "sha256-q0cTFYepq7odZSACNuUoz6kjT7sE38Pv6B113w2gpIQ="; + vendorSha256 = "sha256-/xip2lwmpaSvnQoGj3de8Tgeog+HPrI8mF6catC1O4s="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; From a5a771c88142242ecd1b6a9019e3130da6bf3a15 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Aug 2021 07:49:51 +0000 Subject: [PATCH 363/375] exoscale-cli: 1.39.0 -> 1.40.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 7ad304519693..902521743442 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-tCvncpD89OYTWW83pScSZqpoxoactARAZDRfEoPaqsc="; + sha256 = "sha256-zhVG9mtkW0avMTtSnJ36qkxuy4SiiAENrKZqE5mXvaA="; }; goPackagePath = "github.com/exoscale/cli"; From 4f78c88e819e5e6566096d8e3350a9d27b0e8562 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 17 May 2021 13:47:15 +0200 Subject: [PATCH 364/375] uhub: 0.5.0 -> unstable-2019-12-13 --- pkgs/servers/uhub/default.nix | 43 ++++++++---------------------- pkgs/servers/uhub/plugin-dir.patch | 19 ------------- 2 files changed, 11 insertions(+), 51 deletions(-) delete mode 100644 pkgs/servers/uhub/plugin-dir.patch diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 4569ee675d92..df76789f9086 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -1,52 +1,31 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkg-config, systemd -, tlsSupport ? false }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkg-config +, systemd, tlsSupport ? false }: assert tlsSupport -> openssl != null; stdenv.mkDerivation rec { pname = "uhub"; - version = "0.5.0"; + version = "unstable-2019-12-13"; src = fetchFromGitHub { owner = "janvidar"; repo = "uhub"; - rev = version; - sha256 = "0zdbxfvw7apmfhqgsfkfp4pn9iflzwdn0zwvzymm5inswfc00pxg"; + rev = "35d8088b447527f56609b85b444bd0b10cd67b5c"; + hash = "sha256-CdTTf82opnpjd7I9TTY+JDEZSfdGFPE0bq/xsafwm/w="; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ sqlite systemd ] ++ lib.optional tlsSupport openssl; - outputs = [ "out" - "mod_example" - "mod_welcome" - "mod_logging" - "mod_auth_simple" - "mod_auth_sqlite" - "mod_chat_history" - "mod_chat_only" - "mod_topic" - "mod_no_guest_downloads" - ]; - - patches = [ - ./plugin-dir.patch - # fix aarch64 build: https://github.com/janvidar/uhub/issues/46 - (fetchpatch { - url = "https://github.com/janvidar/uhub/pull/47.patch"; - sha256 = "07yik6za89ar5bxm7m2183i7f6hfbawbxvd4vs02n1zr2fgfxmiq"; - }) - - # Fixed compilation on systemd > 210 - (fetchpatch { - url = "https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.diff"; - sha256 = "1jp8fvw6f9jh0sdjml9mahkk6p6b96p6rzg2y601mnnbcdj8y8xp"; - }) - ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/lib/uhub/" "$out/plugins" \ + --replace "/etc/uhub" "$TMPDIR" + ''; cmakeFlags = [ "-DSYSTEMD_SUPPORT=ON" - (if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF") + "-DSSL_SUPPORT=${if tlsSupport then "ON" else "OFF"}" ]; meta = with lib; { diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch deleted file mode 100644 index d29d600425ff..000000000000 --- a/pkgs/servers/uhub/plugin-dir.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -241,8 +241,14 @@ - - if (UNIX) - install( TARGETS uhub uhub-passwd RUNTIME DESTINATION bin ) -- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_history_sqlite mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL ) -- install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL ) -+ -+ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads ) -+ -+ foreach( PLUGIN ${PLUGINS} ) -+ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL ) -+ endforeach( PLUGIN ) -+ -+ install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION doc/ OPTIONAL ) - endif() - - From 0ac49d7c7b5625a2554f393ddfba72128c8f0f5d Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 17 May 2021 13:47:24 +0200 Subject: [PATCH 365/375] nixos: rewrite uhub module * Support for hosting multiple hubs * Using "settings" style configuration * Remove "uhub" user, use DynamicUser * Configuration reloading --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/misc/uhub.nix | 234 ++++++++++----------------- 2 files changed, 84 insertions(+), 152 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c2e588bf00dd..c7ab3f313a6e 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -178,7 +178,7 @@ in radvd = 139; zookeeper = 140; dnsmasq = 141; - uhub = 142; + #uhub = 142; # unused yandexdisk = 143; mxisd = 144; # was once collectd consul = 145; diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix index d1b388310280..da2613e6db17 100644 --- a/nixos/modules/services/misc/uhub.nix +++ b/nixos/modules/services/misc/uhub.nix @@ -3,178 +3,110 @@ with lib; let - - cfg = config.services.uhub; - - uhubPkg = pkgs.uhub.override { tlsSupport = cfg.enableTLS; }; - - pluginConfig = "" - + optionalString cfg.plugins.authSqlite.enable '' - plugin ${uhubPkg.mod_auth_sqlite}/mod_auth_sqlite.so "file=${cfg.plugins.authSqlite.file}" - '' - + optionalString cfg.plugins.logging.enable '' - plugin ${uhubPkg.mod_logging}/mod_logging.so ${if cfg.plugins.logging.syslog then "syslog=true" else "file=${cfg.plugins.logging.file}"} - '' - + optionalString cfg.plugins.welcome.enable '' - plugin ${uhubPkg.mod_welcome}/mod_welcome.so "motd=${pkgs.writeText "motd.txt" cfg.plugins.welcome.motd} rules=${pkgs.writeText "rules.txt" cfg.plugins.welcome.rules}" - '' - + optionalString cfg.plugins.history.enable '' - plugin ${uhubPkg.mod_chat_history}/mod_chat_history.so "history_max=${toString cfg.plugins.history.max} history_default=${toString cfg.plugins.history.default} history_connect=${toString cfg.plugins.history.connect}" - ''; - - uhubConfigFile = pkgs.writeText "uhub.conf" '' - file_acl=${pkgs.writeText "users.conf" cfg.aclConfig} - file_plugins=${pkgs.writeText "plugins.conf" pluginConfig} - server_bind_addr=${cfg.address} - server_port=${toString cfg.port} - ${lib.optionalString cfg.enableTLS "tls_enable=yes"} - ${cfg.hubConfig} - ''; - -in - -{ + settingsFormat = { + type = with lib.types; attrsOf (oneOf [ bool int str ]); + generate = name: attrs: + pkgs.writeText name (lib.strings.concatStringsSep "\n" + (lib.attrsets.mapAttrsToList + (key: value: "${key}=${builtins.toJSON value}") attrs)); + }; +in { options = { - services.uhub = { + services.uhub = mkOption { + default = { }; + description = "Uhub ADC hub instances"; + type = types.attrsOf (types.submodule { + options = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the uhub ADC hub."; - }; + enable = mkEnableOption "hub instance" // { default = true; }; - port = mkOption { - type = types.int; - default = 1511; - description = "TCP port to bind the hub to."; - }; - - address = mkOption { - type = types.str; - default = "any"; - description = "Address to bind the hub to."; - }; - - enableTLS = mkOption { - type = types.bool; - default = false; - description = "Whether to enable TLS support."; - }; - - hubConfig = mkOption { - type = types.lines; - default = ""; - description = "Contents of uhub configuration file."; - }; - - aclConfig = mkOption { - type = types.lines; - default = ""; - description = "Contents of user ACL configuration file."; - }; - - plugins = { - - authSqlite = { - enable = mkOption { + enableTLS = mkOption { type = types.bool; default = false; - description = "Whether to enable the Sqlite authentication database plugin"; + description = "Whether to enable TLS support."; }; - file = mkOption { - type = types.path; - example = "/var/db/uhub-users"; - description = "Path to user database. Use the uhub-passwd utility to create the database and add/remove users."; - }; - }; - logging = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the logging plugin."; - }; - file = mkOption { - type = types.str; - default = ""; - description = "Path of log file."; - }; - syslog = mkOption { - type = types.bool; - default = false; - description = "If true then the system log is used instead of writing to file."; - }; - }; - - welcome = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the welcome plugin."; - }; - motd = mkOption { - default = ""; - type = types.lines; + settings = mkOption { + inherit (settingsFormat) type; description = '' - Welcome message displayed to clients after connecting - and with the !motd command. + Configuration of uhub. + See https://www.uhub.org/doc/config.php for a list of options. ''; + default = { }; + example = { + server_bind_addr = "any"; + server_port = 1511; + hub_name = "My Public Hub"; + hub_description = "Yet another ADC hub"; + max_users = 150; + }; }; - rules = mkOption { - default = ""; - type = types.lines; - description = '' - Rules message, displayed to clients with the !rules command. - ''; - }; - }; - history = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the history plugin."; + plugins = mkOption { + description = "Uhub plugin configuration."; + type = with types; + listOf (submodule { + options = { + plugin = mkOption { + type = path; + example = literalExample + "$${pkgs.uhub}/plugins/mod_auth_sqlite.so"; + description = "Path to plugin file."; + }; + settings = mkOption { + description = "Settings specific to this plugin."; + type = with types; attrsOf str; + example = { file = "/etc/uhub/users.db"; }; + }; + }; + }); + default = [ ]; }; - max = mkOption { - type = types.int; - default = 200; - description = "The maximum number of messages to keep in history"; - }; - default = mkOption { - type = types.int; - default = 10; - description = "When !history is provided without arguments, then this default number of messages are returned."; - }; - connect = mkOption { - type = types.int; - default = 5; - description = "The number of chat history messages to send when users connect (0 = do not send any history)."; - }; - }; - }; + }; + }); }; }; - config = mkIf cfg.enable { + config = let + hubs = lib.attrsets.filterAttrs (_: cfg: cfg.enable) config.services.uhub; + in { - users = { - users.uhub.uid = config.ids.uids.uhub; - groups.uhub.gid = config.ids.gids.uhub; - }; + environment.etc = lib.attrsets.mapAttrs' (name: cfg: + let + settings' = cfg.settings // { + tls_enable = cfg.enableTLS; + file_plugins = pkgs.writeText "uhub-plugins.conf" + (lib.strings.concatStringsSep "\n" (map ({ plugin, settings }: + "plugin ${plugin} ${ + toString + (lib.attrsets.mapAttrsToList (key: value: ''"${key}=${value}"'') + settings) + }") cfg.plugins)); + }; + in { + name = "uhub/${name}.conf"; + value.source = settingsFormat.generate "uhub-${name}.conf" settings'; + }) hubs; - systemd.services.uhub = { - description = "high performance peer-to-peer hub for the ADC network"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "notify"; - ExecStart = "${uhubPkg}/bin/uhub -c ${uhubConfigFile} -u uhub -g uhub -L"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + systemd.services = lib.attrsets.mapAttrs' (name: cfg: { + name = "uhub-${name}"; + value = let pkg = pkgs.uhub.override { tlsSupport = cfg.enableTLS; }; + in { + description = "high performance peer-to-peer hub for the ADC network"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + reloadIfChanged = true; + serviceConfig = { + Type = "notify"; + ExecStart = "${pkg}/bin/uhub -c /etc/uhub/${name}.conf -L"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + DynamicUser = true; + }; }; - }; + }) hubs; }; } From e5fd43a1559ddecfdedf99aea5437dce64bcfe37 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 11 Aug 2021 14:55:36 +0700 Subject: [PATCH 366/375] archivebox: init at 0.6.2 --- pkgs/applications/misc/archivebox/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/misc/archivebox/default.nix diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix new file mode 100644 index 000000000000..c36db657c07a --- /dev/null +++ b/pkgs/applications/misc/archivebox/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonApplication +, fetchPypi +, requests +, mypy-extensions +, django_3 +, django_extensions +, dateparser +, youtube-dl +, python-crontab +, croniter +, w3lib +, ipython +}: + +buildPythonApplication rec { + pname = "archivebox"; + version = "0.6.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY="; + }; + + # Relax some dependencies + postPatch = '' + substituteInPlace setup.py --replace '"django>=3.1.3,<3.2"' '"django>=3.1.3"' + ''; + + propagatedBuildInputs = [ + requests + mypy-extensions + django_3 + django_extensions + dateparser + youtube-dl + python-crontab + croniter + w3lib + ipython + ]; + + meta = with lib; { + description = "Open source self-hosted web archiving"; + homepage = "https://archivebox.io"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ac1624d7977..858848ee3b60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1124,6 +1124,8 @@ with pkgs; ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { }; + archivebox = python3Packages.callPackage ../applications/misc/archivebox { }; + archivemount = callPackage ../tools/filesystems/archivemount { }; archivy = python3Packages.callPackage ../applications/misc/archivy { }; From 9a7fb1407009e157590a04156e7d36627ced4cec Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Wed, 11 Aug 2021 09:13:38 +0100 Subject: [PATCH 367/375] telepresence2: 2.3.6 -> 2.4.0 --- pkgs/tools/networking/telepresence2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 54de621763c5..2cbe5fd91849 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.3.6"; + version = "2.4.0"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "1bs4h450109vhy18kpyy6y4p5l9kvz4w09m56fxh5z547m5ax6k3"; + sha256 = "1v2jkhdlyq37akqyhb8mwsh7rjdv2fjw8kyzys3dv04k3dy5sl0f"; }; - vendorSha256 = "0xmw9mc0iy64kb12lsii4nn63ynh6gab9ls8z6mrizjjqz845sa5"; + vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q"; buildFlagsArray = '' -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} From f0feb77b4f3ae6a76fd95d328a182b6396c0bd74 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 9 Aug 2021 20:51:27 +0300 Subject: [PATCH 368/375] nix-simple-deploy: 0.2.1 -> 0.2.2 --- pkgs/tools/package-management/nix-simple-deploy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix index bd16ecc6f3fc..0077c6c01895 100644 --- a/pkgs/tools/package-management/nix-simple-deploy/default.nix +++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-simple-deploy"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "misuzu"; repo = pname; rev = version; - sha256 = "0vkgs3ffb5vdzhrqdnd54vbi36vrgd3408zvjn0rmqlnwi3wwhnk"; + sha256 = "1qq4fbsd2mvxblsggwbnh88mj18f3vrfzv1kgc7a92pfiwxznq8r"; }; - cargoSha256 = "0z4d4cazl6qvigyqzdayxqfjc1ki1rhrpm76agc8lkrxrvhyay2h"; + cargoSha256 = "1r6dl7qipbyyvjcd3l9ynawjln1g1qzvw5za6nyjcf41dzv48m8x"; nativeBuildInputs = [ makeWrapper ]; From 1560fde9892893d022b9d70557d433c683bb92a2 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 11 Aug 2021 10:29:52 +0100 Subject: [PATCH 369/375] buf: 0.46.0 -> 0.49.0 Dropped leaveDotGit to avoid non-determinism issues Skip test that requried .git Slight cleanup Add myself as a maintainer --- pkgs/development/tools/buf/default.nix | 31 +++++++++++++------ .../buf/skip_test_requiring_dotgit.patch | 14 +++++++++ 2 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/tools/buf/skip_test_requiring_dotgit.patch diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index fb515841c7f2..230f5b09b99f 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -7,29 +7,32 @@ buildGoModule rec { pname = "buf"; - version = "0.46.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5mjk31HuPNO/RhmMhIm3dAZAED/Kk33ObjC8KbPKRxk="; - leaveDotGit = true; # Required by TestWorkspaceGit + sha256 = "sha256-xP2UbcHwimN09IXrGp3zhBLL74l/8YKotqBNRTITF18="; }; - vendorSha256 = "sha256-K8UZDEhAvD292RCEDKfY9PdZGS389vLF3oukcBndUF4="; + vendorSha256 = "sha256-WgQSLe99CbOwJC8ewDcSq6PcBJdmiPRmvAonq8drQ1w="; patches = [ # Skip a test that requires networking to be available to work. ./skip_test_requiring_network.patch + # Skip TestWorkspaceGit which requires .git and commits. + ./skip_test_requiring_dotgit.patch ]; nativeBuildInputs = [ protobuf ]; + # Required for TestGitCloner checkInputs = [ git ]; ldflags = [ "-s" "-w" ]; preCheck = '' - export PATH=$PATH:$GOPATH/bin + # The tests need access to some of the built utilities + export PATH="$PATH:$GOPATH/bin" # To skip TestCloneBranchAndRefToBucket export CI=true ''; @@ -38,24 +41,32 @@ buildGoModule rec { runHook preInstall mkdir -p "$out/bin" - dir="$GOPATH/bin" # Only install required binaries, don't install testing binaries - for file in \ + for FILE in \ "buf" \ "protoc-gen-buf-breaking" \ "protoc-gen-buf-lint" \ "protoc-gen-buf-check-breaking" \ "protoc-gen-buf-check-lint"; do - cp "$dir/$file" "$out/bin/" + cp "$GOPATH/bin/$FILE" "$out/bin/" done runHook postInstall ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/buf --help + $out/bin/buf --version 2>&1 | grep "${version}" + runHook postInstallCheck + ''; + meta = with lib; { - description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; homepage = "https://buf.build"; + changelog = "https://github.com/bufbuild/buf/releases/tag/v${version}"; + description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; license = licenses.asl20; - maintainers = with maintainers; [ raboof ]; + maintainers = with maintainers; [ raboof jk ]; }; } diff --git a/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch b/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch new file mode 100644 index 000000000000..c4a7803661ad --- /dev/null +++ b/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch @@ -0,0 +1,14 @@ +diff --git a/internal/buf/cmd/buf/workspace_test.go b/internal/buf/cmd/buf/workspace_test.go +index e051690..8887837 100644 +--- a/internal/buf/cmd/buf/workspace_test.go ++++ b/internal/buf/cmd/buf/workspace_test.go +@@ -335,6 +335,9 @@ func TestWorkspaceNestedArchive(t *testing.T) { + } + + func TestWorkspaceGit(t *testing.T) { ++ // Requires .git directory which we do not retain due to ++ // `leaveDotGit` non-determinism ++ t.Skip() + // Directory paths specified as a git reference within a workspace. + t.Parallel() + testRunStdout( From 92d9a2a0ddc37d6731a991e3073c301b1bf56f9e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 11 Aug 2021 16:49:16 +0700 Subject: [PATCH 370/375] archivebox: fix runtime --- pkgs/applications/misc/archivebox/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix index c36db657c07a..bd1a98ef9cce 100644 --- a/pkgs/applications/misc/archivebox/default.nix +++ b/pkgs/applications/misc/archivebox/default.nix @@ -13,6 +13,17 @@ , ipython }: +let + django_3' = django_3.overridePythonAttrs (old: rec { + pname = "Django"; + version = "3.1.7"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Ms55Lum2oMu+w0ASPiKayfdl3/jCpK6SR6FLK6OjZac="; + }; + }); +in + buildPythonApplication rec { pname = "archivebox"; version = "0.6.2"; @@ -22,15 +33,10 @@ buildPythonApplication rec { sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY="; }; - # Relax some dependencies - postPatch = '' - substituteInPlace setup.py --replace '"django>=3.1.3,<3.2"' '"django>=3.1.3"' - ''; - propagatedBuildInputs = [ requests mypy-extensions - django_3 + django_3' django_extensions dateparser youtube-dl From d0cd76a4f86bd00a2289e72ce6f32a80d22866e5 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 11 Aug 2021 07:32:10 +0200 Subject: [PATCH 371/375] maintainers: add michaeladler --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0096d15941d6..0eb9d06baccc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6977,6 +6977,12 @@ fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92"; }]; }; + michaeladler = { + email = "therisen06@gmail.com"; + github = "michaeladler"; + githubId = 1575834; + name = "Michael Adler"; + }; michaelpj = { email = "michaelpj@gmail.com"; github = "michaelpj"; From 737c4db9e3565b201e5fc2c39becc2c41180b86e Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 11 Aug 2021 07:32:24 +0200 Subject: [PATCH 372/375] opensc: change maintainer --- pkgs/tools/security/opensc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index c48d19fbe87d..15231c945316 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/OpenSC/OpenSC/wiki"; license = licenses.lgpl21Plus; platforms = platforms.all; - maintainers = [ maintainers.erictapen ]; + maintainers = [ maintainers.michaeladler ]; }; } From 3f4692120b6b6285f147c6adb431ea39b9020dad Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 11 Aug 2021 08:43:00 -0400 Subject: [PATCH 373/375] apacheHttpdPackages.mod_auth_mellon: 0.17.0 -> 0.18.0 --- .../mod_auth_mellon/default.nix | 10 ++---- .../mod_auth_mellon/fixdeps.patch | 34 ------------------- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index c8cb13022e26..8763591d05e3 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -3,19 +3,15 @@ stdenv.mkDerivation rec { pname = "mod_auth_mellon"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "latchset"; repo = "mod_auth_mellon"; rev = "v${version}"; - sha256 = "03bkvqkmqq72ff1a8cpvpcxngnlz1p6433y2fkkynpjfr19cna2s"; + sha256 = "0alfa8hz09jdg29bi1mvhwyr2nl0nvss2a2kybrcjvdw1fx6vijn"; }; - patches = [ - ./fixdeps.patch - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; @@ -29,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/UNINETT/mod_auth_mellon"; + homepage = "https://github.com/latchset/mod_auth_mellon"; description = "An Apache module with a simple SAML 2.0 service provider"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch b/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch deleted file mode 100644 index 4f814ad60368..000000000000 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 1388c91..ab28982 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -42,7 +42,7 @@ DISTFILES=$(SRC) \ - all: mod_auth_mellon.la - - mod_auth_mellon.la: $(SRC) auth_mellon.h auth_mellon_compat.h -- @APXS2@ -Wc,"-std=c99 @MELLON_CFLAGS@ @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC) -+ @APXS2@ -Wc,"-std=c99 @MELLON_CFLAGS@ @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@ @LIBXML2_CFLAGS@ @XMLSEC_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@ @LIBXML2_LIBS@ @XMLSEC_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC) - - - # Building configure (for distribution) -diff --git a/configure.ac b/configure.ac -index 421b952..e62768e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -91,6 +91,16 @@ AC_SUBST(GLIB_LIBS) - - AC_SUBST(MELLON_CFLAGS) - -+#include -+PKG_CHECK_MODULES(LIBXML2, libxml-2.0) -+AC_SUBST(LIBXML2_CFLAGS) -+AC_SUBST(LIBXML2_LIBS) -+ -+#include -+PKG_CHECK_MODULES(XMLSEC, xmlsec1-openssl) -+AC_SUBST(XMLSEC_CFLAGS) -+AC_SUBST(XMLSEC_LIBS) -+ - # Test to see if we can include lasso/utils.h - # AC_CHECK_HEADER won't work correctly unless we specifiy the include directories - # found in the LASSO_CFLAGS. Save and restore CFLAGS and CPPFLAGS. From 27f21204507da2e2f3680eca82edf2415ad59f4c Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Wed, 11 Aug 2021 15:58:40 +0300 Subject: [PATCH 374/375] teleport: 6.2.8 -> 7.0.0 --- pkgs/servers/teleport/default.nix | 33 +++++++++++-------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 57866388b465..fc5910a1ae53 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -4,26 +4,26 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - rev = "c63397375632f1a4323918dde78334472f3ffbb9"; - sha256 = "sha256-6YKk0G3s+35PRsUBkKgu/tNoSSwjJ5bTn8DACF4gYr4="; + rev = "2891baa0de7283f61c08ff2fa4494e53f9d4afc1"; + sha256 = "sha256-AvhCOLa+mgty9METlOCARlUOEDMAW6Kk1esSmBbVcok="; }; in - buildGoModule rec { pname = "teleport"; - version = "6.2.8"; + version = "7.0.0"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-TVjdz97CUXBKCQh9bYrvtcH4StblBMsXiQ9Gix/NIm4="; + sha256 = "sha256-2GQ3IP5jfT6vSni5hfDex09wXrnUmTpcvH2S6zc399I="; }; vendorSha256 = null; subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; + tags = [ "webassets_embed" ]; nativeBuildInputs = [ zip makeWrapper ]; @@ -34,26 +34,15 @@ buildGoModule rec { ./test.patch ]; - postBuild = '' - pushd . - mkdir -p build - echo "making webassets" - cp -r ${webassets}/* webassets/ - make build/webassets.zip - cat build/webassets.zip >> $NIX_BUILD_TOP/go/bin/teleport - rm -fr build/webassets.zip - cd $NIX_BUILD_TOP/go/bin - zip -q -A teleport - popd - ''; - - # Do not strip the embedded web assets - dontStrip = true; - # Reduce closure size for client machines outputs = [ "out" "client" ]; - buildTargets = [ "full" ]; + preBuild = '' + mkdir -p build + echo "making webassets" + cp -r ${webassets}/* webassets/ + make lib/web/build/webassets.zip + ''; preCheck = '' export HOME=$(mktemp -d) From a5ad9365a1e65b065666f58e11c8c589e5a5ffe4 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 12 Aug 2021 04:49:41 +0800 Subject: [PATCH 375/375] linux_xanmod: enable futex/futex2 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 587266ec999a..c2f94a8a03b2 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -44,6 +44,12 @@ buildLinux (args // rec { ANDROID_BINDER_IPC = module; ANDROID_BINDERFS = module; ANDROID_BINDER_DEVICES = freeform "binder,hwbinder,vndbinder"; + + # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. + # Futex2 interface compatible w/ latest Wine / Proton Fsync. + FUTEX = yes; + FUTEX2 = yes; + FUTEX_PI = yes; }; extraMeta = {