From e7996ab6cef26b3885ee0d337bcbd7de75c2988f Mon Sep 17 00:00:00 2001 From: rebecca skinner Date: Wed, 8 Sep 2021 23:28:22 -0500 Subject: [PATCH 001/359] nixos/modules/hardware/video/nvidia: Fix incorrect reference to 'nvidiaSettings' This patch fixes a bug caused by an incorrect reference to 'nvidiaSettings' rather than 'cfg.nvidiaSettings'. The bug caused the system to not build when using the nvidia drivers. Tested on my local machine. --- nixos/modules/hardware/video/nvidia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index cf87ca5377dd..936bac50e4bb 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -290,7 +290,7 @@ in hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32; environment.systemPackages = [ nvidia_x11.bin ] - ++ optionals nvidiaSettings [ nvidia_x11.settings ] + ++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ] ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; systemd.packages = optional cfg.powerManagement.enable nvidia_x11.out; From fda25f88d238899ecdc2b195e00855db24b761b7 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Fri, 17 Sep 2021 22:15:44 -0700 Subject: [PATCH 002/359] vimpager: supply runtimeShell to Makefile Cross-compiles will otherwise detect an incorrect shell. --- pkgs/tools/misc/vimpager/build.nix | 1 + pkgs/tools/misc/vimpager/latest.nix | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix index a610a461656c..c77f623c5dcd 100644 --- a/pkgs/tools/misc/vimpager/build.nix +++ b/pkgs/tools/misc/vimpager/build.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , coreutils , sharutils +, runtimeShell , version , sha256 }: diff --git a/pkgs/tools/misc/vimpager/latest.nix b/pkgs/tools/misc/vimpager/latest.nix index c98b9a000147..4ea8d5be57fd 100644 --- a/pkgs/tools/misc/vimpager/latest.nix +++ b/pkgs/tools/misc/vimpager/latest.nix @@ -1,7 +1,10 @@ -{ callPackage }: +{ callPackage, runtimeShell }: -callPackage ./build.nix { +(callPackage ./build.nix { version = "a4da4dfac44d1bbc6986c5c76fea45a60ebdd8e5"; sha256 = "0gcjpw2q263hh8w2sjvq3f3k2d28qpkkv0jnl8hw1l7v604i8zxg"; -} - +}).overrideAttrs (old: { + postPatch = old.postPatch or "" + '' + echo 'echo ${runtimeShell}' > scripts/find_shell + ''; +}) From e3ae16550b1a49fba50fea1a225637217f8b5a35 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 23 Sep 2021 20:49:20 +0000 Subject: [PATCH 003/359] python3Packages.hdfs: init at 2.5.8 --- .../python-modules/hdfs/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/hdfs/default.nix diff --git a/pkgs/development/python-modules/hdfs/default.nix b/pkgs/development/python-modules/hdfs/default.nix new file mode 100644 index 000000000000..05faf08bc5e4 --- /dev/null +++ b/pkgs/development/python-modules/hdfs/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, docopt +, fastavro +, fetchFromGitHub +, lib +, nose +, pytestCheckHook +, requests +, six +}: + +buildPythonPackage rec { + pname = "hdfs"; + # See https://github.com/mtth/hdfs/issues/176. + version = "2.5.8"; + + src = fetchFromGitHub { + owner = "mtth"; + repo = pname; + rev = version; + hash = "sha256-94Q3IUoX1Cb+uRqvsfpVZJ1koJSx5cQ3/XpYJ0gkQNU="; + }; + + propagatedBuildInputs = [ docopt requests six ]; + + checkInputs = [ fastavro nose pytestCheckHook ]; + + pythonImportsCheck = [ "hdfs" ]; + + meta = with lib; { + description = "Python API and command line interface for HDFS"; + homepage = "https://github.com/mtth/hdfs"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 83f610de4bf7..233c80f44d89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3336,6 +3336,8 @@ in { hdbscan = callPackage ../development/python-modules/hdbscan { }; + hdfs = callPackage ../development/python-modules/hdfs { }; + hdlparse = callPackage ../development/python-modules/hdlparse { }; hdmedians = callPackage ../development/python-modules/hdmedians { }; From ef9b3aea0836de44f26f8ece966d13a006fda1f0 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Fri, 17 Sep 2021 21:12:20 -0400 Subject: [PATCH 004/359] plex: add support for custom scanners --- nixos/modules/services/misc/plex.nix | 24 ++++++++++++++++ pkgs/servers/plex/default.nix | 43 +++++++++++++++++++++++----- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 7efadf1b9bb1..d57f7d20926f 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -65,6 +65,29 @@ in ''; }; + extraScanners = mkOption { + type = types.listOf types.path; + default = []; + description = '' + A list of paths to extra scanners to install in Plex's scanners + directory. + + Every time the systemd unit for Plex starts up, all of the symlinks + in Plex's scanners directory will be cleared and this module will + symlink all of the paths specified here to that directory. + ''; + example = literalExample '' + [ + (fetchFromGitHub { + owner = "ZeroQI"; + repo = "Absolute-Series-Scanner"; + rev = "773a39f502a1204b0b0255903cee4ed02c46fde0"; + sha256 = "4l+vpiDdC8L/EeJowUgYyB3JPNTZ1sauN8liFAcK+PY="; + }) + ] + ''; + }; + package = mkOption { type = types.package; default = pkgs.plex; @@ -113,6 +136,7 @@ in # Configuration for our FHS userenv script PLEX_DATADIR=cfg.dataDir; PLEX_PLUGINS=concatMapStringsSep ":" builtins.toString cfg.extraPlugins; + PLEX_SCANNERS=concatMapStringsSep ":" builtins.toString cfg.extraScanners; # The following variables should be set by the FHS userenv script: # PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 3d69d2197803..fd580d52d8a0 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -63,13 +63,9 @@ buildFHSUserEnv { test -d "$pluginDir" || mkdir -p "$pluginDir" # First, remove all of the symlinks in the plugins directory. - echo "Removing old symlinks" - for f in $(ls "$pluginDir/"); do - if [[ -L "$pluginDir/$f" ]]; then - echo "Removing plugin symlink: $pluginDir/$f" - rm "$pluginDir/$f" - fi - done + while IFS= read -r -d $'\0' f; do + echo "Removing plugin symlink: $f" + done < <(find "$pluginDir" -type l -print0) echo "Symlinking plugins" IFS=':' read -ra pluginsArray <<< "$PLEX_PLUGINS" @@ -87,6 +83,39 @@ buildFHSUserEnv { done fi + if [[ -n "''${PLEX_SCANNERS:-}" ]]; then + for scannerType in Common Movies Music Series; do + echo "Preparing $scannerType scanners directory" + + scannerDir="$PLEX_DATADIR/Plex Media Server/Scanners/$scannerType" + test -d "$scannerDir" || mkdir -p "$scannerDir" + + # First, remove all of the symlinks in the scanners directory. + echo "Removing old symlinks" + while IFS= read -r -d $'\0' f; do + echo "Removing scanner symlink: $f" + done < <(find "$scannerDir" -type l -print0) + + echo "Symlinking scanners" + IFS=':' read -ra scannersArray <<< "$PLEX_SCANNERS" + for path in "''${scannersArray[@]}"; do + # The provided source should contain a 'Scanners' directory; symlink + # from inside that. + subpath="$path/Scanners/$scannerType" + while IFS= read -r -d $'\0' file; do + dest="$scannerDir/$(basename "$file")" + + if [[ -f "$dest" || -L "$dest" ]]; then + echo "Error symlinking scanner from $file to $dest: file or directory already exists" + else + echo "Symlinking scanner at: $file" + ln -s "$file" "$dest" + fi + done < <(find "$subpath" -type f -print0) + done + done + fi + # Tell Plex to use the data directory as the "Application Support" # directory, otherwise it tries to write things into the user's home # directory. From 4227daf9f04df6e740a9f9f6d81197ec3ca9fd74 Mon Sep 17 00:00:00 2001 From: creator54 Date: Sun, 26 Sep 2021 20:22:04 +0530 Subject: [PATCH 005/359] python3Packages.pydeck: init at 0.7.0 added changes as suggested --- maintainers/maintainer-list.nix | 6 ++++ .../python-modules/pydeck/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pydeck/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9da7544cf944..686cc7ffc2f3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2247,6 +2247,12 @@ githubId = 12202789; name = "CrazedProgrammer"; }; + creator54 = { + email = "hi.creator54@gmail.com"; + github = "creator54"; + githubId = 34543609; + name = "creator54"; + }; cript0nauta = { email = "shareman1204@gmail.com"; github = "cript0nauta"; diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix new file mode 100644 index 000000000000..7e95c60be828 --- /dev/null +++ b/pkgs/development/python-modules/pydeck/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, ipykernel, ipywidgets, pythonOlder, pytestCheckHook, pandas }: + +buildPythonPackage rec { + pname = "pydeck"; + version = "0.7.0"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zi0gqzd0byj16ja74m2dm99a1hmrlhk26y0x7am07vb1d8lvvsy"; + }; + + pythonImportsCheck = [ "pydeck" ]; + + checkInputs = [ pytestCheckHook pandas ]; + # tries to start a jupyter server + disabledTests = [ "test_nbconvert" ]; + + propagatedBuildInputs = [ + ipykernel + ipywidgets + ]; + + meta = with lib; { + homepage = "https://github.com/visgl/deck.gl/tree/master/bindings/pydeck"; + description = "Large-scale interactive data visualization in Python"; + maintainers = with maintainers; [ creator54 ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50803af17df7..fb481b24dde7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6092,6 +6092,8 @@ in { pydbus = callPackage ../development/python-modules/pydbus { }; + pydeck = callPackage ../development/python-modules/pydeck { }; + pydeconz = callPackage ../development/python-modules/pydeconz { }; pydelijn = callPackage ../development/python-modules/pydelijn { }; From 4de6574fb8d6289dc4960272e1e03482267995e0 Mon Sep 17 00:00:00 2001 From: "Narazaki, Shuji" Date: Sun, 29 Aug 2021 19:36:35 +0900 Subject: [PATCH 006/359] kissat: init at 2.0.1 --- .../science/logic/kissat/default.nix | 54 +++++++++++++++++++ .../logic/kissat/writable-passwd-is-ok.patch | 13 +++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 69 insertions(+) create mode 100644 pkgs/applications/science/logic/kissat/default.nix create mode 100644 pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/applications/science/logic/kissat/default.nix new file mode 100644 index 000000000000..08be0740117a --- /dev/null +++ b/pkgs/applications/science/logic/kissat/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub +, drat-trim, p7zip +}: + +stdenv.mkDerivation rec { + pname = "kissat"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "arminbiere"; + repo = "kissat"; + # https://github.com/arminbiere/kissat/issues/18 + rev = "abfa45fb782fa3b7c6e2eb6b939febe74d7270b7"; + sha256 = "06pbmkjxgf2idhsrd1yzvbxr2wf8l06pjb38bzbygm6n9ami89b8"; + }; + + outputs = [ "out" "dev" "lib" ]; + + checkInputs = [ drat-trim p7zip ]; + doCheck = true; + + # 'make test' assumes that /etc/passwd is not writable. + patches = [ ./writable-passwd-is-ok.patch ]; + + # the configure script is not generated by autotools and does not accept the + # arguments that the default configurePhase passes like --prefix and --libdir + dontAddPrefix = true; + setOutputFlags = false; + + installPhase = '' + runHook preInstall + + install -Dm0755 build/kissat "$out/bin/kissat" + install -Dm0644 src/kissat.h "$dev/include/kissat.h" + install -Dm0644 build/libkissat.a "$lib/lib/libkissat.a" + mkdir -p "$out/share/doc/kissat/" + install -Dm0644 {LICEN?E,README*,VERSION} "$out/share/doc/kissat/" + + runHook postInstall + ''; + + meta = with lib; { + description = "A 'keep it simple and clean bare metal SAT solver' written in C"; + longDescription = '' + Kissat is a "keep it simple and clean bare metal SAT solver" written in C. + It is a port of CaDiCaL back to C with improved data structures, + better scheduling of inprocessing and optimized algorithms and implementation. + ''; + maintainers = with maintainers; [ shnarazk ]; + platforms = platforms.unix; + license = licenses.mit; + homepage = "http://fmv.jku.at/kissat"; + }; +} diff --git a/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch b/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch new file mode 100644 index 000000000000..f2cca54e1d36 --- /dev/null +++ b/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch @@ -0,0 +1,13 @@ +diff --git a/test/testfile.c b/test/testfile.c +index cb311d5..0726244 100644 +--- a/test/testfile.c ++++ b/test/testfile.c +@@ -92,8 +92,6 @@ do { \ + WRITABLE (true, "../test/file/non-existing"); + WRITABLE (false, "/kissat-test-file-writable"); + WRITABLE (false, "non-existing-directory/file-in-non-existing-directory"); +- if (kissat_file_exists ("/etc/passwd")) +- WRITABLE (false, "/etc/passwd"); + #undef WRITABLE + } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f65c917d975b..9595e843eca6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30907,6 +30907,8 @@ with pkgs; honeytrap = callPackage ../tools/security/honeytrap { }; + kissat = callPackage ../applications/science/logic/kissat {}; + tini = callPackage ../applications/virtualization/tini {}; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; From b649af00fb983698c999c49236f81b25093eee64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 4 Oct 2021 11:10:32 -0300 Subject: [PATCH 007/359] cmark: 0.30.1 -> 0.30.2 --- pkgs/development/libraries/cmark/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index d78db53ea4b5..ad4804febbc1 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,29 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark"; - version = "0.30.1"; + version = "0.30.2"; src = fetchFromGitHub { owner = "jgm"; repo = pname; rev = version; - sha256 = "sha256-UjDM2N6gCwO94F1nW3qCP9JX42MYAicAuGTKAXMy1Gg="; + sha256 = "sha256-IkNybUe/XYwAvPowym3aqfVyvNdw2t/brRjhOrjVRpA="; }; - patches = [ - # Fix libcmark.pc paths (should be incorporated next release) - (fetchpatch { - url = "https://github.com/commonmark/cmark/commit/15762d7d391483859c241cdf82b1615c6b6a5a19.patch"; - sha256 = "sha256-wdyK1tQolgfiwYMAaWMQZdCSbMDCijug5ykpoDl/HwI="; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ - # https://github.com/commonmark/cmark/releases/tag/0.30.1 - # recommends distributions dynamically link + # Link the executable with the shared library "-DCMARK_STATIC=OFF" ]; From c6b024706771461bbb168b6c0e575ff07764fb63 Mon Sep 17 00:00:00 2001 From: ash Date: Fri, 8 Oct 2021 01:36:13 +0100 Subject: [PATCH 008/359] copyDesktopItems: fix handling of plain paths --- pkgs/build-support/setup-hooks/copy-desktop-items.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/copy-desktop-items.sh b/pkgs/build-support/setup-hooks/copy-desktop-items.sh index f96a10f33d5c..b5c5ed81eb97 100644 --- a/pkgs/build-support/setup-hooks/copy-desktop-items.sh +++ b/pkgs/build-support/setup-hooks/copy-desktop-items.sh @@ -30,8 +30,8 @@ copyDesktopItems() { for desktopItem in $desktopItems; do if [[ -f "$desktopItem" ]]; then - echo "Copying '$f' into '$out/share/applications'" - install -D -m 444 -t "$out"/share/applications "$f" + echo "Copying '$desktopItem' into '$out/share/applications'" + install -D -m 444 -t "$out"/share/applications "$desktopItem" else for f in "$desktopItem"/share/applications/*.desktop; do echo "Copying '$f' into '$out/share/applications'" From 01a85ce48b156973cb0aa9f5a898a6975d20b1cf Mon Sep 17 00:00:00 2001 From: Souvik Sen Date: Wed, 6 Oct 2021 23:14:34 -0400 Subject: [PATCH 009/359] kcat(previously kafkacat): 1.6.0 -> 1.7.0 Fixed the 1.7.0 build and renamed the package per upstream. (https://github.com/edenhill/kcat/commit/3fc21aa1e9facc5fa546b9c922fc26a41666a0c1) --- .../tools/{kafkacat => kcat}/default.nix | 14 +++++++------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) rename pkgs/development/tools/{kafkacat => kcat}/default.nix (67%) diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kcat/default.nix similarity index 67% rename from pkgs/development/tools/kafkacat/default.nix rename to pkgs/development/tools/kcat/default.nix index 5493bf24428d..d4cc4a37ea1a 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kcat/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes, which }: stdenv.mkDerivation rec { - pname = "kafkacat"; + pname = "kcat"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "edenhill"; - repo = "kafkacat"; + repo = "kcat"; rev = version; - sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs"; + sha256 = "sha256-koDhj/RQc9fhfqjrJylhURw6tppPELhLlBGbNVJsii8="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ zlib rdkafka yajl avro-c libserdes ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A generic non-JVM producer and consumer for Apache Kafka"; - homepage = "https://github.com/edenhill/kafkacat"; + homepage = "https://github.com/edenhill/kcat"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nyarly ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index de1f397d89bd..710d08ce2293 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -373,6 +373,7 @@ mapAliases ({ jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 + kafkacat = kcat; # added 2021-10-07 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 kodiGBM = kodi-gbm; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c9fb71ab805..7b09e6bb7543 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14434,10 +14434,10 @@ with pkgs; k2tf = callPackage ../development/tools/misc/k2tf { }; - kafkacat = callPackage ../development/tools/kafkacat { }; - kati = callPackage ../development/tools/build-managers/kati { }; + kcat = callPackage ../development/tools/kcat { }; + kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { From a2c053689474ee80198f07b5b4f29106dd44a408 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 9 Oct 2021 01:14:28 +0100 Subject: [PATCH 010/359] apacheHttpd: add proxy and php nixos tests to passthru.tests --- pkgs/servers/http/apache-httpd/2.4.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 6e6eca69da3c..c10ab02e73ec 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -81,6 +81,8 @@ stdenv.mkDerivation rec { inherit apr aprutil sslSupport proxySupport ldapSupport luaSupport lua5; tests = { acme-integration = nixosTests.acme; + proxy = nixosTests.proxy; + php = nixosTests.php.httpd; }; }; From fff9b8271d428eea91570272b24d4f9a3d12afc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Oct 2021 12:43:01 +0200 Subject: [PATCH 011/359] libwebsockets: 4.2.1 -> 4.3.0 --- .../libraries/libwebsockets/default.nix | 14 +++++++++++++- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 777beb9bc14b..15bf77d2fc68 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -1,4 +1,11 @@ -{ fetchFromGitHub, lib, stdenv, cmake, openssl, zlib, libuv }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, zlib +, libuv +}: let generic = { version, sha256 }: stdenv.mkDerivation rec { @@ -64,4 +71,9 @@ in { version = "4.2.1"; sha256 = "sha256-C+WGfNF4tAgbp/7aRraBgjNOe4I5ihm+8CGelXzfxbU="; }; + + libwebsockets_4_3 = generic { + version = "4.3.0"; + sha256 = "13lxb487mqlzbsbv6fbj50r1717mfwdy87ps592lgfy3307yqpr4"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18c5484a9b18..230d7e6222b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7129,8 +7129,9 @@ with pkgs; inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets_4_2; - libwebsockets = libwebsockets_4_2; + libwebsockets_4_2 + libwebsockets_4_3; + libwebsockets = libwebsockets_4_3; licensee = callPackage ../tools/package-management/licensee { }; From 5d9bd0452fa643f6d1879eb9f231d46f350fbbd4 Mon Sep 17 00:00:00 2001 From: Elias Probst Date: Wed, 6 Oct 2021 00:21:24 +0200 Subject: [PATCH 012/359] init: libbde at 20210605 Add an early alpha of libbde, which is a library to deal with the BitLocker Drive Encryption (BDE) format. Co-authored-by: Sandro --- pkgs/development/libraries/libbde/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/libbde/default.nix diff --git a/pkgs/development/libraries/libbde/default.nix b/pkgs/development/libraries/libbde/default.nix new file mode 100644 index 000000000000..ba44a200e83b --- /dev/null +++ b/pkgs/development/libraries/libbde/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchurl +, fuse +, ncurses +, python3 +}: + +stdenv.mkDerivation rec { + pname = "libbde"; + version = "20210605"; + + src = fetchurl { + url = "https://github.com/libyal/libbde/releases/download/${version}/${pname}-alpha-${version}.tar.gz"; + sha256 = "0dk5h7gvp2fgg21n7k600mnayg4g4pc0lm7317k43j1q0p4hkfng"; + }; + + buildInputs = [ fuse ncurses python3 ]; + + configureFlags = [ "--enable-python" ]; + + meta = with lib; { + description = "Library to access the BitLocker Drive Encryption (BDE) format"; + homepage = "https://github.com/libyal/libbde/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ eliasp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b19c0e62ca19..65baa72abdbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16975,6 +16975,8 @@ with pkgs; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; + libbde = callPackage ../development/libraries/libbde { }; + libbencodetools = callPackage ../development/libraries/libbencodetools { }; libbluedevil = callPackage ../development/libraries/libbluedevil { }; From ac117c51694b41972226572be41bdee7c27882cf Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 13 Oct 2021 22:44:04 +0800 Subject: [PATCH 013/359] awslimitchecker: init at 12.0.0 --- pkgs/tools/admin/awslimitchecker/default.nix | 58 +++++++++++++++++++ .../tools/admin/awslimitchecker/version.patch | 35 +++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 95 insertions(+) create mode 100644 pkgs/tools/admin/awslimitchecker/default.nix create mode 100644 pkgs/tools/admin/awslimitchecker/version.patch diff --git a/pkgs/tools/admin/awslimitchecker/default.nix b/pkgs/tools/admin/awslimitchecker/default.nix new file mode 100644 index 000000000000..54cf59942233 --- /dev/null +++ b/pkgs/tools/admin/awslimitchecker/default.nix @@ -0,0 +1,58 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "awslimitchecker"; + version = "12.0.0"; + + src = fetchFromGitHub { + owner = "jantman"; + repo = "awslimitchecker"; + rev = version; + sha256 = "1p6n4kziyl6sfq7vgga9v88ddwh3sgnfb1m1cx6q25n0wyl7phgv"; + }; + + propagatedBuildInputs = with python3Packages; [ + boto3 + botocore + pytz + termcolor + versionfinder + ]; + + checkInputs = with python3Packages; [ + freezegun + onetimepass + pytestCheckHook + pyotp + testfixtures + ]; + + patches = [ + # Fix the version lookup to use only the hardcoded version in the source package + ./version.patch + ]; + + pytestFlagsArray = [ + "awslimitchecker/tests" + ]; + + disabledTestPaths = [ + # AWS tests that use the network + "awslimitchecker/tests/services" + "awslimitchecker/tests/test_checker.py" + "awslimitchecker/tests/test_runner.py" + + # the version lookup tests as patched above + "awslimitchecker/tests/test_version.py" + ]; + + pythonImportsCheck = [ "awslimitchecker.checker" ]; + + meta = with lib; { + homepage = "http://awslimitchecker.readthedocs.org"; + changelog = "https://github.com/jantman/awslimitchecker/blob/${version}/CHANGES.rst"; + description = "A script and python package to check your AWS service limits and usage via boto3"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/pkgs/tools/admin/awslimitchecker/version.patch b/pkgs/tools/admin/awslimitchecker/version.patch new file mode 100644 index 000000000000..6556fb39a5f2 --- /dev/null +++ b/pkgs/tools/admin/awslimitchecker/version.patch @@ -0,0 +1,35 @@ +--- a/awslimitchecker/version.py ++++ b/awslimitchecker/version.py +@@ -111,32 +106,5 @@ def _get_version_info(): + :returns: awslimitchecker version + :rtype: str + """ +- if os.environ.get('VERSIONCHECK_DEBUG', '') != 'true': +- for lname in ['versionfinder', 'pip', 'git']: +- l = logging.getLogger(lname) +- l.setLevel(logging.CRITICAL) +- l.propagate = True +- try: +- vinfo = find_version('awslimitchecker') +- dirty = '' +- if vinfo.git_is_dirty: +- dirty = '*' +- tag = vinfo.git_tag +- if tag is not None: +- tag += dirty +- commit = vinfo.git_commit +- if commit is not None: +- if len(commit) > 7: +- commit = commit[:8] +- commit += dirty +- return AWSLimitCheckerVersion( +- vinfo.version, +- vinfo.url, +- tag=tag, +- commit=commit +- ) +- except Exception: +- logger.exception("Error checking installed version; this installation " +- "may not be in compliance with the AGPLv3 license:") + # fall back to returning just the hard-coded release information + return AWSLimitCheckerVersion(_VERSION, _PROJECT_URL) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2f6f1763e06..61f76936c0b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1312,6 +1312,8 @@ with pkgs; awsebcli = callPackage ../tools/virtualization/awsebcli {}; + awslimitchecker = callPackage ../tools/admin/awslimitchecker { }; + awslogs = callPackage ../tools/admin/awslogs { }; aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; From a28064c96ca867c36e8710293362937ce8a9832f Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 17 Oct 2021 21:32:06 +0530 Subject: [PATCH 014/359] fossil: 2.16 -> 2.17 Add option to prefer internal/bundled sqlite3 which is what fossil seems to prefer --- .../version-management/fossil/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index ed2cf00291e2..0e6302534ad9 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -6,6 +6,7 @@ , zlib , openssl , readline +, withInternalSqlite ? true , sqlite , ed , which @@ -15,23 +16,25 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"; - sha256 = "1z5ji25f2rqaxd1nj4fj84afl1v0m3mnbskgfwsjr3fr0h5p9aqy"; + sha256 = "0539rsfvwv49qyrf36z5m0k74kvnn6y5xasm9vvi6lbphx8yxmi1"; }; nativeBuildInputs = [ installShellFiles tcl tcllib ]; - buildInputs = [ zlib openssl readline sqlite which ed ] - ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ zlib openssl readline which ed ] + ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optional (!withInternalSqlite) sqlite; enableParallelBuilding = true; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - configureFlags = [ "--disable-internal-sqlite" ] + configureFlags = + lib.optional (!withInternalSqlite) "--disable-internal-sqlite" ++ lib.optional withJson "--json"; preBuild = '' From 205158124a6227cbe2dcc72065e31370af0bfaf9 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 17 Oct 2021 20:06:08 +0200 Subject: [PATCH 015/359] python3Packages.hidapi: 0.10.1 -> 0.11.0.post2 --- pkgs/development/python-modules/hidapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 2b9165dee24e..cf54198b18b3 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "hidapi"; - version = "0.10.1"; + version = "0.11.0.post2"; src = fetchPypi { inherit pname version; - sha256 = "a1170b18050bc57fae3840a51084e8252fd319c0fc6043d68c8501deb0e25846"; + sha256 = "da815e0d1d4b2ef1ebbcc85034572105dca29627eb61881337aa39010f2ef8cb"; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; From 096c956ef7325a2f86207bae9ddf0d190fecbcf5 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Tue, 19 Oct 2021 01:51:46 +0000 Subject: [PATCH 016/359] q4wine: init at 1.3.13 Qt GUI application for Wine for managing prefixes and applications. Signed-off-by: Rafael Kitover --- pkgs/applications/misc/q4wine/default.nix | 37 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/misc/q4wine/default.nix diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix new file mode 100644 index 000000000000..cb4014684fd2 --- /dev/null +++ b/pkgs/applications/misc/q4wine/default.nix @@ -0,0 +1,37 @@ +{ lib, fetchFromGitHub, mkDerivation, cmake, sqlite +, qtbase, qtsvg, qttools, wrapQtAppsHook +, icoutils # build and runtime deps. +, wget, fuseiso, wine, sudo, which # runtime deps. +}: + +mkDerivation rec { + pname = "q4wine"; + version = "1.3.13"; + + src = fetchFromGitHub { + owner = "brezerk"; + repo = "q4wine"; + rev = "v${version}"; + sha256 = "04gw5y3dxdpivm2xqacqq85fdzx7xkl0c3h3hdazljb0c3cxxs6h"; + }; + + buildInputs = [ + sqlite icoutils qtbase qtsvg qttools + ]; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + # Add runtime deps. + postInstall = '' + wrapProgram $out/bin/q4wine \ + --prefix PATH : ${lib.makeBinPath [ icoutils wget fuseiso wine which ]} + ''; + + meta = with lib; { + homepage = "https://q4wine.brezblock.org.ua/"; + description = "A Qt GUI for Wine to manage prefixes and applications"; + license = licenses.gpl3; + maintainers = with maintainers; [ rkitover ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9752efd364ae..98b83125ab52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25168,6 +25168,8 @@ with pkgs; gtkpod = callPackage ../applications/audio/gtkpod { }; + q4wine = libsForQt5.callPackage ../applications/misc/q4wine { }; + qrcodegen = callPackage ../development/libraries/qrcodegen { }; qrencode = callPackage ../development/libraries/qrencode { }; From 05f41aedbbd9586c54587b5b67c5b5660f370944 Mon Sep 17 00:00:00 2001 From: Jared Beller Date: Tue, 19 Oct 2021 10:11:59 -0400 Subject: [PATCH 017/359] pounce: 2.5 -> 3.0 --- pkgs/servers/pounce/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index 68b2779c7fa4..0d01f9cb7c49 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "2.5"; + version = "3.0"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "0swbncsm888r95dwk13v1vii5sr3gah817dfah5v7zs8lsv1kgv5"; + sha256 = "17vmbfr7ika6kmq9jqa3rpd4cr71arapav7hlmggnj7a9yw5b9mg"; }; buildInputs = [ libressl ]; From 83fa3d7c121a31168be07652b32a633380fd0ef6 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Tue, 19 Oct 2021 00:38:19 +0300 Subject: [PATCH 018/359] openseachest: init at 21.06.21 --- pkgs/tools/system/openseachest/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/system/openseachest/default.nix diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/tools/system/openseachest/default.nix new file mode 100644 index 000000000000..7b7909fbe002 --- /dev/null +++ b/pkgs/tools/system/openseachest/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "openseachest"; + version = "21.06.21"; + + src = fetchFromGitHub { + owner = "Seagate"; + repo = "openSeaChest"; + rev = "v${version}"; + sha256 = "09xay3frk0yh48ww650dsjp0rx0w1m3ab3rpz5k1jizppv4kk9fi"; + fetchSubmodules = true; + }; + + makeFlags = [ "-C Make/gcc" ]; + buildFlags = [ "release" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share} + cp -r Make/gcc/openseachest_exes/. $out/bin + cp -r docs/man $out/share + + runHook postInstall + ''; + + meta = with lib; { + description = "A collection of command line diagnostic tools for storage devices"; + homepage = "https://github.com/Seagate/openSeaChest"; + license = licenses.mpl20; + maintainers = with maintainers; [ justinas ]; + platforms = with platforms; freebsd ++ linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4783e8e403a1..ff59f7554cb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8061,6 +8061,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; + openseachest = callPackage ../tools/system/openseachest { }; + opensm = callPackage ../tools/networking/opensm { }; opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {}); From d07cff5e38e29d7618cab0272f972e341e1f1e73 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 20 Oct 2021 14:25:51 -0400 Subject: [PATCH 019/359] python3Packages.threadpoolctl: 2.2.0 -> 3.0.0 --- pkgs/development/python-modules/threadpoolctl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index 7ba82aaec296..432c7b3df1c6 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchFromGitHub , flit , pytestCheckHook @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "threadpoolctl"; - version = "2.2.0"; + version = "3.0.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; format = "flit"; src = fetchFromGitHub { owner = "joblib"; repo = pname; rev = version; - sha256 = "7UUjbX1IpXtUAgN48Db43Zr1u360UETSUnIHD6rQRLs="; + sha256 = "02zccsiq4gvawy7q2fh3m3hvr40hl2ylmwwny6dv0lqsr2iwgnmn"; }; checkInputs = [ pytestCheckHook numpy scipy ]; From b2aa19efe7ffacd5ba9642354ee51f2eb6a10d07 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 24 Oct 2021 01:01:07 +0200 Subject: [PATCH 020/359] rust: find nested packages in git repositories this mimics the heuristic cargo uses for finding crates in their git repositories ([cargo-issue-1462]). [cargo-issue-1462]: https://github.com/rust-lang/cargo/issues/1462 --- pkgs/build-support/rust/import-cargo-lock.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index fe070e9638d4..fd3608741ea3 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -125,20 +125,31 @@ let }; in runCommand "${pkg.name}-${pkg.version}" {} '' tree=${tree} - if grep --quiet '\[workspace\]' "$tree/Cargo.toml"; then - # If the target package is in a workspace, find the crate path - # using `cargo metadata`. - crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \ - ${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path') + # If the target package is in a workspace, or if it's the top-level + # crate, we should find the crate path using `cargo metadata`. + crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \ + ${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path') + + # If the repository is not a workspace the package might be in a subdirectory. + if [[ -z $crateCargoTOML ]]; then + for manifest in $(find $tree -name "Cargo.toml"); do + echo Looking at $manifest + crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path "$manifest" | ${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path' || :) if [[ ! -z $crateCargoTOML ]]; then - tree=$(dirname $crateCargoTOML) - else - >&2 echo "Cannot find path for crate '${pkg.name}-${pkg.version}' in the Cargo workspace in: $tree" - exit 1 + break fi + done + + if [[ -z $crateCargoTOML ]]; then + >&2 echo "Cannot find path for crate '${pkg.name}-${pkg.version}' in the tree in: $tree" + exit 1 + fi fi + echo Found crate ${pkg.name} at $crateCargoTOML + tree=$(dirname $crateCargoTOML) + cp -prvd "$tree/" $out chmod u+w $out From f9a340a91604959f484a7918b00f3ede59814f7c Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 24 Oct 2021 16:43:50 +0200 Subject: [PATCH 021/359] rust/import-cargo-lock: add test git-dependency-rev-non-workspace-nested-crate --- .../rust/test/import-cargo-lock/default.nix | 1 + .../Cargo.lock | 638 ++++++++++++++++++ .../Cargo.toml | 8 + .../default.nix | 29 + .../src/main.rs | 3 + 5 files changed, 679 insertions(+) create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/default.nix index 24e07099c058..c5c7b2f1c931 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/default.nix @@ -7,6 +7,7 @@ basicDynamic = callPackage ./basic-dynamic { }; gitDependency = callPackage ./git-dependency { }; gitDependencyRev = callPackage ./git-dependency-rev { }; + gitDependencyRevNonWorkspaceNestedCrate = callPackage ./git-dependency-rev-non-workspace-nested-crate { }; gitDependencyTag = callPackage ./git-dependency-tag { }; gitDependencyBranch = callPackage ./git-dependency-branch { }; maturin = callPackage ./maturin { }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock new file mode 100644 index 000000000000..63ff1b3c113c --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock @@ -0,0 +1,638 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "anyhow" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cargo-test-macro" +version = "0.1.0" +source = "git+https://github.com/rust-lang/cargo?branch=rust-1.53.0#4369396ce7d270972955d876eaa4954bea56bcd9" + +[[package]] +name = "cargo-test-support" +version = "0.1.0" +source = "git+https://github.com/rust-lang/cargo?branch=rust-1.53.0#4369396ce7d270972955d876eaa4954bea56bcd9" +dependencies = [ + "anyhow", + "cargo-test-macro", + "cargo-util", + "filetime", + "flate2", + "git2", + "glob", + "lazy_static", + "remove_dir_all", + "serde_json", + "tar", + "toml", + "url", +] + +[[package]] +name = "cargo-util" +version = "0.1.0" +source = "git+https://github.com/rust-lang/cargo?branch=rust-1.53.0#4369396ce7d270972955d876eaa4954bea56bcd9" +dependencies = [ + "anyhow", + "core-foundation", + "crypto-hash", + "filetime", + "hex 0.4.3", + "jobserver", + "libc", + "log", + "miow", + "same-file", + "shell-escape", + "tempfile", + "walkdir", + "winapi", +] + +[[package]] +name = "cc" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "commoncrypto" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" +dependencies = [ + "commoncrypto-sys", +] + +[[package]] +name = "commoncrypto-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" +dependencies = [ + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "crc32fast" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-hash" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca" +dependencies = [ + "commoncrypto", + "hex 0.3.2", + "openssl", + "winapi", +] + +[[package]] +name = "filetime" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "winapi", +] + +[[package]] +name = "flate2" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +dependencies = [ + "cfg-if", + "crc32fast", + "libc", + "libz-sys", + "miniz_oxide", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "getrandom" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "git-dependency-rev-non-workspace-nested-crate" +version = "0.1.0" +dependencies = [ + "cargo-test-support", +] + +[[package]] +name = "git2" +version = "0.13.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a8057932925d3a9d9e4434ea016570d37420ddb1ceed45a174d577f24ed6700" +dependencies = [ + "bitflags", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "hex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "jobserver" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +dependencies = [ + "libc", +] + +[[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.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" + +[[package]] +name = "libgit2-sys" +version = "0.12.24+1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddbd6021eef06fb289a8f54b3c2acfdd85ff2a585dfbb24b8576325373d2152c" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "libssh2-sys" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi", +] + +[[package]] +name = "once_cell" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "openssl" +version = "0.10.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-sys", +] + +[[package]] +name = "openssl-probe" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" + +[[package]] +name = "openssl-sys" +version = "0.9.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pkg-config" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10e2fcbb64ecbe64c8e040a386c3104d384583af58b956d870aaaf229df6e66d" + +[[package]] +name = "ppv-lite86" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" + +[[package]] +name = "rand" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +dependencies = [ + "rand_core", +] + +[[package]] +name = "redox_syscall" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +dependencies = [ + "bitflags", +] + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.130" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" + +[[package]] +name = "serde_json" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "shell-escape" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" + +[[package]] +name = "tar" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c" +dependencies = [ + "filetime", + "libc", +] + +[[package]] +name = "tempfile" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +dependencies = [ + "cfg-if", + "libc", + "rand", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "tinyvec" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" + +[[package]] +name = "unicode-normalization" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna", + "matches", + "percent-encoding", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[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-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml new file mode 100644 index 000000000000..61f1a08dbe4f --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "git-dependency-rev-non-workspace-nested-crate" +version = "0.1.0" +authors = ["Stefan Junker "] +edition = "2018" + +[dependencies] +cargo-test-support = { git = "https://github.com/rust-lang/cargo", branch = "rust-1.53.0" } diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix new file mode 100644 index 000000000000..6893b8e1f8fd --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix @@ -0,0 +1,29 @@ +{ rustPlatform, pkg-config, openssl }: + +rustPlatform.buildRustPackage { + pname = "git-dependency-rev-non-workspace-nested-crate"; + version = "0.1.0"; + + src = ./.; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "cargo-test-macro-0.1.0" = "1yy1y1d523xdzwg1gc77pigbcwsbawmy4b7vw8v21m7q957sk0c4"; + }; + }; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/git-dependency-rev-non-workspace-nested-crate + ''; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs new file mode 100644 index 000000000000..cb4bfb5d928b --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("{}", cargo_test_support::t!(Result::<&str, &str>::Ok("msg"))); +} From 445510ed6997194dac161434b1a22e9eec65c2c4 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 24 Oct 2021 16:43:50 +0200 Subject: [PATCH 022/359] rust/import-cargo-lock: hopefully make nested crate test work on macos --- .../git-dependency-rev-non-workspace-nested-crate/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix index 6893b8e1f8fd..dcf1e601c31c 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, pkg-config, openssl }: +{ rustPlatform, pkg-config, openssl, lib, darwin, stdenv }: rustPlatform.buildRustPackage { pname = "git-dependency-rev-non-workspace-nested-crate"; @@ -12,6 +12,8 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security ]; cargoLock = { From 9a0e977ddf7b24b1276d0a5393c5d09cff5bf93e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 06:31:30 +0000 Subject: [PATCH 023/359] python38Packages.pycm: 3.2 -> 3.3 --- pkgs/development/python-modules/pycm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index c8cc7c964243..9e3b711718c3 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycm"; - version = "3.2"; + version = "3.3"; disabled = !isPy3k; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "v${version}"; - sha256 = "1p2scgb4aghjlxak4zvm3s9ydkpg42mdxy6vjxlnqw0wpnsskfni"; + sha256 = "0i3qpb20mnc22qny1ar3yvxb1dac7njwi8bvi5sy5kywz10c5dkw"; }; # remove a trivial dependency on the author's `art` Python ASCII art library From 4543d922bca21fbc5f999c3e1a7c538f98e01ee6 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Sat, 30 Oct 2021 11:33:26 +0800 Subject: [PATCH 024/359] mariadb-corporation: 3.1.4 -> 3.1.14 --- pkgs/development/libraries/unixODBCDrivers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index b766b933a656..272ac0f36057 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -29,13 +29,13 @@ mariadb = stdenv.mkDerivation rec { pname = "mariadb-connector-odbc"; - version = "3.1.4"; + version = "3.1.14"; src = fetchFromGitHub { - owner = "MariaDB"; + owner = "mariadb-corporation"; repo = "mariadb-connector-odbc"; rev = version; - sha256 = "1kbz5mng9vx89cw2sx7gsvhbv4h86zwp31fr0hxqing3cwxhkfgw"; + sha256 = "0wvy6m9qfvjii3kanf2d1rhfaww32kg0d7m57643f79qb05gd6vg"; # this driver only seems to build correctly when built against the mariadb-connect-c subrepo # (see https://github.com/NixOS/nixpkgs/issues/73258) fetchSubmodules = true; From 5eb14c27a6cb58d5985d0ec97ccde0e1588b7406 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Oct 2021 11:49:56 +0000 Subject: [PATCH 025/359] python38Packages.PyICU: 2.7.4 -> 2.8 --- pkgs/development/python-modules/pyicu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 45a24851150e..c9555f7bb65f 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "PyICU"; - version = "2.7.4"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "c0655302e2aea16f9acefe04152f74e5d7d70542e9e15c89ee8d763c8e097f56"; + sha256 = "3d80de47045a8163db5aebc947c42b4d429eeea4f0c32af4f40b33981fa872b9"; }; nativeBuildInputs = [ icu68 ]; # for icu-config, but should be replaced with pkg-config From a49ccd5da64e21c9e6a6cc65345dc369619a3c4c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 30 Oct 2021 11:50:00 +0000 Subject: [PATCH 026/359] python38Packages.PyICU: unpin icu icu68 was pinned in de8dbb21fbf740927ad2888bac59215a92a64ee0 for 21.05 ZHF, but it's no longer necessary. --- pkgs/development/python-modules/pyicu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index c9555f7bb65f..c24a4a08c3cf 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestCheckHook , six -, icu68 +, icu }: buildPythonPackage rec { @@ -15,8 +15,8 @@ buildPythonPackage rec { sha256 = "3d80de47045a8163db5aebc947c42b4d429eeea4f0c32af4f40b33981fa872b9"; }; - nativeBuildInputs = [ icu68 ]; # for icu-config, but should be replaced with pkg-config - buildInputs = [ icu68 ]; + nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config + buildInputs = [ icu ]; checkInputs = [ pytestCheckHook six ]; meta = with lib; { From 985f9deff25f1706371c8088af98842699266661 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 30 Oct 2021 11:50:00 +0000 Subject: [PATCH 027/359] python38Packages.PyICU: update meta --- pkgs/development/python-modules/pyicu/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index c24a4a08c3cf..3281a7ceb873 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -19,11 +19,12 @@ buildPythonPackage rec { buildInputs = [ icu ]; checkInputs = [ pytestCheckHook six ]; - meta = with lib; { - homepage = "https://github.com/ovalhub/pyicu/"; - description = "Python extension wrapping the ICU C++ API"; - license = licenses.mit; - platforms = platforms.unix; - }; + pythonImportsCheck = [ "icu" ]; + meta = with lib; { + homepage = "https://gitlab.pyicu.org/main/pyicu"; + description = "Python extension wrapping the ICU C++ API"; + changelog = "https://gitlab.pyicu.org/main/pyicu/-/raw/v${version}/CHANGES"; + license = licenses.mit; + }; } From a21e52fe8be150e43b5e720ed90937a9a8a9311c Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 2 Nov 2021 14:52:43 -0400 Subject: [PATCH 028/359] c3d: unstable-2020-10-05 -> unstable-2021-09-14 --- pkgs/applications/graphics/c3d/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 0a4ed515511c..e38ca908fe07 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,20 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, itk4, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: stdenv.mkDerivation rec { pname = "c3d"; - version = "unstable-2020-10-05"; + version = "unstable-2021-09-14"; src = fetchFromGitHub { owner = "pyushkevich"; repo = pname; - rev = "0a87e3972ea403babbe2d05ec6d50855e7c06465"; - sha256 = "0wsmkifqrcfy13fnwvinmnq1m0lkqmpyg7bgbwnb37mbrlbq06wf"; + rev = "cc06e6e2f04acd3d6faa3d8c9a66b499f02d4388"; + sha256 = "sha256:1ql1y6694njsmdapywhppb54viyw8wdpaxxr1b3hm2rqhvwmhn52"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk4 ] + buildInputs = [ itk ] ++ lib.optional stdenv.isDarwin Cocoa; + cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; + meta = with lib; { homepage = "https://github.com/pyushkevich/c3d"; description = "Medical imaging processing tool"; @@ -22,6 +24,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl3; broken = stdenv.isAarch64; - # /build/git-3453f61/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:311:10: fatal error: xmmintrin.h: No such file or directory + # /build/source/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:312:10: fatal error: xmmintrin.h: No such file or directory }; } From 1595f3bcd41f9c8ec92719a7ed0f742e9cf7b8cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 05:17:49 +0000 Subject: [PATCH 029/359] interactsh: 0.0.4 -> 0.0.6 --- pkgs/tools/misc/interactsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index b623faea39fb..7da2a7fe729e 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "0.0.4"; + version = "0.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9tmEeYuMRZVkcUupBzJv3rCuy7Il46yh5i0UEUNCNtc="; + sha256 = "sha256-9h2RdP0rVmStl+obMbBHcbfiOBiJ/2sbk2XvH3YaHRo="; }; - vendorSha256 = "sha256-YTzo8YjnJUNXZrYKYTCHOgZAUrMlYzbEEP3yXYfNZqo="; + vendorSha256 = "sha256-9ehliyOCrWSDHVtmuUFBdw4BY6ygOvr2JxxJ3TvmSFU="; modRoot = "."; subPackages = [ From 7fef1255d194bebbfc6d0b9adf2f62c30eea2c8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 08:59:34 +0000 Subject: [PATCH 030/359] libcouchbase: 3.2.1 -> 3.2.3 --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index face30c1e0cc..6edb264d2e2c 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-6TMWWXAgt4e+De1ebmqQhaqcia1ZXT8IXn9fTGsr3qY="; + sha256 = "sha256-pCqSsmddgNtQJnOVIHz5ft0gJN5T7T3ehHtjuexhBxI="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; From ab721efe762fbef98bff2071b288983cf73b5f2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 11:45:50 +0000 Subject: [PATCH 031/359] libupnp: 1.14.10 -> 1.14.12 --- pkgs/development/libraries/pupnp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 2c5c6c263484..86606df5e41b 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.10"; + version = "1.14.12"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pupnp"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "sha256-QlV5V1+VPj/C0M3XgwVIJbxzVXfSvP6yMcJz9al6a+U="; + sha256 = "sha256-ZJ74x5+4dDb5sJ1cPtlin6iunGyu8boNSpfLFB1mCME="; }; nativeBuildInputs = [ From b3e79d17887dfb82b04d7965d69556a115c470c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Nov 2021 19:12:49 +0100 Subject: [PATCH 032/359] python3Packages.pyvolumio: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/pyvolumio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvolumio/default.nix b/pkgs/development/python-modules/pyvolumio/default.nix index f4164b884c74..05dcbce167e8 100644 --- a/pkgs/development/python-modules/pyvolumio/default.nix +++ b/pkgs/development/python-modules/pyvolumio/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyvolumio"; - version = "0.1.4"; + version = "0.1.5"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "PyVolumio"; rev = "v${version}"; - sha256 = "0c6kcz9x0n9w67h2gncyhq0dw3q17nmzipcgx59pwqnn33jan5nf"; + sha256 = "1nyvflap39cwq1cm9wwl9idvfmz1ixsl80f1dnskx22fk0lmvj4h"; }; propagatedBuildInputs = [ aiohttp ]; From a1f5a396838fde89782d900306e6d8e1f27689c3 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 3 Nov 2021 15:16:40 -0400 Subject: [PATCH 033/359] itk: vtk_7 -> vtk --- pkgs/development/libraries/itk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 967910e2a117..08971c4c81c1 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper -, pkg-config, libX11, libuuid, xz, vtk_7, Cocoa }: +, pkg-config, libX11, libuuid, xz, vtk, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake xz makeWrapper ]; - buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; postInstall = '' wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" From efe4c017498c6ccd00bf551f9eae5323cdebecba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Nov 2021 18:04:14 +0100 Subject: [PATCH 034/359] python3Packages.pyefergy: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/pyefergy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix index bee03f253a06..f506fbd3ab4d 100644 --- a/pkgs/development/python-modules/pyefergy/default.nix +++ b/pkgs/development/python-modules/pyefergy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyefergy"; - version = "0.1.3"; + version = "0.1.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - sha256 = "sha256-TGvS/ntIRbkcMsD5y0QdqyLE2dcPUbX3d79jHc3ddd0="; + sha256 = "sha256-X/dWEBg3WG6SmMore5otLL4iIueGUS5KgjCPYoMSNd0="; }; propagatedBuildInputs = [ From 4079374c60921b4b903675ad990eedc132934634 Mon Sep 17 00:00:00 2001 From: Jos van Bakel Date: Sat, 6 Nov 2021 11:28:12 +0100 Subject: [PATCH 035/359] hpe-ltfs: fix build --- pkgs/tools/backup/hpe-ltfs/default.nix | 9 +++++++-- pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix index ec8e6392e9cf..5ce6b287e932 100644 --- a/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/pkgs/tools/backup/hpe-ltfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fuse, icu, pkg-config, libxml2, libuuid }: +{ lib, stdenv, fetchFromGitHub, fuse, icu66, pkg-config, libxml2, libuuid }: stdenv.mkDerivation rec { version = "3.4.2_Z7550-02501"; @@ -13,10 +13,15 @@ stdenv.mkDerivation rec { sourceRoot = "source/ltfs"; + # include sys/sysctl.h is deprecated in glibc. The sysctl calls are only used + # for Apple to determine the kernel version. Because this build only targets + # Linux is it safe to remove. + patches = [ ./remove-sysctl.patch ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - fuse icu libxml2 libuuid + fuse icu66 libxml2 libuuid ]; meta = with lib; { diff --git a/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch b/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch new file mode 100644 index 000000000000..35b56522a5bb --- /dev/null +++ b/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch @@ -0,0 +1,14 @@ +diff --git a/src/libltfs/arch/arch_info.c b/src/libltfs/arch/arch_info.c +index 179428f..114acf0 100644 +--- a/src/libltfs/arch/arch_info.c ++++ b/src/libltfs/arch/arch_info.c +@@ -47,9 +47,6 @@ + */ + + #include "libltfs/ltfs.h" +-#ifndef mingw_PLATFORM +-#include +-#endif + #include + #include + #include From 2bcc4707e86f791167f78784e5ecba218a99218d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 21 Oct 2021 12:58:15 +0200 Subject: [PATCH 036/359] dotnet: introduce print-hashes script --- .../compilers/dotnet/print-hashes.sh | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100755 pkgs/development/compilers/dotnet/print-hashes.sh diff --git a/pkgs/development/compilers/dotnet/print-hashes.sh b/pkgs/development/compilers/dotnet/print-hashes.sh new file mode 100755 index 000000000000..5c97c3132338 --- /dev/null +++ b/pkgs/development/compilers/dotnet/print-hashes.sh @@ -0,0 +1,69 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl + +set -eu + +if [[ $# -lt 1 ]]; then + echo \"usage: $0 version\" >&2 + exit 1 +fi + +VERSION=$1 +HASHFILE=$(mktemp /tmp/dotnet.hashes.XXXXXXXX) +trap "rm -f $HASHFILE" EXIT + +curl -L https://dotnetcli.blob.core.windows.net/dotnet/checksums/$VERSION-sha.txt -o $HASHFILE + +ASPNETCORE_VERSION=$(grep aspnetcore-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n -1 | sed -e 's:.*aspnetcore-runtime-::' -e 's:-linux-x64.tar.gz.*$::' ) +ASPNETCORE_HASH_LINUX_X64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | cut -d ' ' -f 1) +ASPNETCORE_HASH_LINUX_ARM64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -linux-arm64.tar.gz | cut -d ' ' -f 1) +ASPNETCORE_HASH_OSX_X64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -osx-x64.tar.gz | cut -d ' ' -f 1) +ASPNETCORE_HASH_OSX_ARM64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -osx-arm64.tar.gz | cut -d ' ' -f 1) + +RUNTIME_VERSION=$(grep dotnet-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n -1 | sed -e 's:.*dotnet-runtime-::' -e 's:-linux-x64.tar.gz.*$::' ) +RUNTIME_HASH_LINUX_X64=$(grep dotnet-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | cut -d ' ' -f 1) +RUNTIME_HASH_LINUX_ARM64=$(grep dotnet-runtime- $HASHFILE | grep -- -linux-arm64.tar.gz | cut -d ' ' -f 1) +RUNTIME_HASH_OSX_X64=$(grep dotnet-runtime- $HASHFILE | grep -- -osx-x64.tar.gz | cut -d ' ' -f 1) +RUNTIME_HASH_OSX_ARM64=$(grep dotnet-runtime- $HASHFILE | grep -- -osx-arm64.tar.gz | cut -d ' ' -f 1) + +# dotnet-sdk has multiple entries in file, but the latest is the newest +SDK_VERSION=$(grep dotnet-sdk- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n -1 | sed -e 's:.*dotnet-sdk-::' -e 's:-linux-x64.tar.gz.*$::' ) +SDK_HASH_LINUX_X64=$(grep dotnet-sdk- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n 1 | cut -d ' ' -f 1) +SDK_HASH_LINUX_ARM64=$(grep dotnet-sdk- $HASHFILE | grep -- -linux-arm64.tar.gz | tail -n 1 | cut -d ' ' -f 1) +SDK_HASH_OSX_X64=$(grep dotnet-sdk- $HASHFILE | grep -- -osx-x64.tar.gz | tail -n 1 | cut -d ' ' -f 1) +SDK_HASH_OSX_ARM64=$(grep dotnet-sdk- $HASHFILE | grep -- -osx-arm64.tar.gz | tail -n 1 | cut -d ' ' -f 1) + +V=${VERSION/./_} +MAJOR_MINOR_VERSION=${V%%.*} + +echo """ + aspnetcore_${MAJOR_MINOR_VERSION} = buildAspNetCore { + version = \"${ASPNETCORE_VERSION}\"; + sha512 = { + x86_64-linux = \"${ASPNETCORE_HASH_LINUX_X64}\"; + aarch64-linux = \"${ASPNETCORE_HASH_LINUX_ARM64}\"; + x86_64-darwin = \"${ASPNETCORE_HASH_OSX_X64}\"; + aarch64-darwin = \"${ASPNETCORE_HASH_OSX_ARM64}\"; + }; + }; + + runtime_${MAJOR_MINOR_VERSION} = buildNetRuntime { + version = \"${RUNTIME_VERSION}\"; + sha512 = { + x86_64-linux = \"${RUNTIME_HASH_LINUX_X64}\"; + aarch64-linux = \"${RUNTIME_HASH_LINUX_ARM64}\"; + x86_64-darwin = \"${RUNTIME_HASH_OSX_X64}\"; + aarch64-darwin = \"${RUNTIME_HASH_OSX_ARM64}\"; + }; + }; + + sdk_${MAJOR_MINOR_VERSION} = buildNetSdk { + version = \"${SDK_VERSION}\"; + sha512 = { + x86_64-linux = \"${SDK_HASH_LINUX_X64}\"; + aarch64-linux = \"${SDK_HASH_LINUX_ARM64}\"; + x86_64-darwin = \"${SDK_HASH_OSX_X64}\"; + aarch64-darwin = \"${SDK_HASH_OSX_ARM64}\"; + }; + }; +""" From 15db090295ab8f7fa147eddd955ef1172fc4c694 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 9 Nov 2021 10:52:16 +0100 Subject: [PATCH 037/359] dotnet: make SDK 6.0 default should not cause any trouble since all packages should use pinned versions via either of these: - `dotnet-sdk = dotnetCorePackages.sdk_5_0` - `dotnet-sdk_5` --- pkgs/development/compilers/dotnet/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 62a08b145bfb..7070243945c5 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -17,9 +17,9 @@ rec { # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; - sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; # v3.1 (LTS) @@ -79,7 +79,7 @@ rec { }; }; - # v6.0 + # v6.0 (LTS) aspnetcore_6_0 = buildAspNetCore { version = "6.0.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92672fef81a4..ce710a3c8860 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -422,9 +422,9 @@ with pkgs; dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; dotnet-sdk_6 = dotnetCorePackages.sdk_6_0; - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-runtime = dotnetCorePackages.runtime_5_0; - dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0; dumb-init = callPackage ../applications/virtualization/dumb-init {}; From e6548105b7ffbcb20d0a091be358165a21b510e2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 9 Nov 2021 11:35:41 -0800 Subject: [PATCH 038/359] rnix-lsp: use nix (2.4) Follow-up to #144197 since nixUnstable is no longer needed for flake support. --- pkgs/development/tools/rnix-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index d5a6f962c013..327a93637fc2 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, nixUnstable }: +{ lib, fetchFromGitHub, rustPlatform, nix }: rustPlatform.buildRustPackage rec { pname = "rnix-lsp"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Tw05eOIMJj+zX0fqtn6wJwolKNkYqfVuo/WO/WvYu2k="; - checkInputs = [ nixUnstable ]; + checkInputs = [ nix ]; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; From 1070be5fe43fdda1b185c55f51457a7710bd7337 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 23:42:44 +0100 Subject: [PATCH 039/359] python3Packages.multiprocess: 0.10.9 -> 0.70.12.2 --- .../python-modules/multiprocess/default.nix | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index df304efb9199..491aa131bb59 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -1,22 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, dill }: +{ lib +, buildPythonPackage +, dill +, fetchFromGitHub +}: buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.9"; + version = "0.70.12.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9fd5bd990132da77e73dec6e9613408602a4612e1d73caf2e2b813d2b61508e5"; + src = fetchFromGitHub { + owner = "uqfoundation"; + repo = pname; + rev = "multiprocess-${version}"; + sha256 = "1npikdgj0qriqj384vg22qgq2xqylypk67sx1qfmdzvk6c4iyg0w"; }; - propagatedBuildInputs = [ dill ]; + propagatedBuildInputs = [ + dill + ]; # Python-version dependent tests doCheck = false; + pythonImportsCheck = [ + "multiprocess" + ]; + meta = with lib; { - description = "Better multiprocessing and multithreading in python"; + description = "Multiprocessing and multithreading in Python"; homepage = "https://github.com/uqfoundation/multiprocess"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 1802e1888ba7b12a0d7554775bcc7d5fecb50742 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 23:58:09 +0100 Subject: [PATCH 040/359] python3Packages.unicorn: add pythonImportsCheck --- .../python-modules/unicorn/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 484f422adf3e..c9043afa85d9 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -1,10 +1,17 @@ -{ lib, stdenv, buildPythonPackage, setuptools, unicorn-emu }: +{ lib +, stdenv +, buildPythonPackage +, setuptools +, unicorn-emu +}: buildPythonPackage rec { pname = "unicorn"; version = lib.getVersion unicorn-emu; + format = "setuptools"; src = unicorn-emu.src; + sourceRoot = "source/bindings/python"; prePatch = '' @@ -12,12 +19,21 @@ buildPythonPackage rec { ln -s ${unicorn-emu}/lib/libunicorn.a prebuilt/ ''; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + setuptools + ]; + + # No tests present + doCheck = false; + + pythonImportsCheck = [ + "unicorn" + ]; meta = with lib; { description = "Python bindings for Unicorn CPU emulator engine"; homepage = "https://www.unicorn-engine.org/"; - license = [ licenses.gpl2 ]; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ris ]; }; } From a402f9c9ea1f9c57bc6a8f2177a450b2fb767bf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 00:05:47 +0100 Subject: [PATCH 041/359] unicorn: 1.0.3 -> 2.0.0-rc4 --- 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 0a760c07a97e..57983537ad14 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.3"; + version = "2.0.0-rc4"; src = fetchFromGitHub { owner = "unicorn-engine"; repo = pname; rev = version; - sha256 = "079azb1df4nwsnsck36b200rnf03aqilw30h3fiaqi1ixash957k"; + sha256 = "sha256-dNBebXp8HVmmY1RVRYuRFoJ3PStCf4taNTeYKi2lhQM="; }; nativeBuildInputs = [ pkg-config cmake ]; From cb737c9edb4082bab9606c360e90835f205184d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 00:06:20 +0100 Subject: [PATCH 042/359] python3Packages.qiling: 1.3.0 -> 1.4.0 --- .../python-modules/qiling/default.nix | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 61787548f846..3576f5b73660 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -1,33 +1,43 @@ { lib , buildPythonPackage -, fetchPypi , capstone -, unicorn -, pefile -, python-registry -, keystone-engine -, pyelftools +, fetchFromGitHub +, fetchPypi , gevent +, keystone-engine +, multiprocess +, pefile +, pyelftools +, python-registry +, unicorn }: + buildPythonPackage rec { pname = "qiling"; - version = "1.3.0"; + version = "1.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "084ad706f6803d7de2391eab928ecf4cb3e8d892fd2988666d4791a422d6ab9a"; + sha256 = "sha256-xUoNHMyGN0G2itVcKLsk+7QKxZdguzyh6OZCqCHNB4Y="; }; propagatedBuildInputs = [ capstone - unicorn - pefile - python-registry - keystone-engine - pyelftools gevent + keystone-engine + multiprocess + pefile + pyelftools + python-registry + unicorn ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pefile==2021.5.24" "pefile>=2021.5.24" + ''; + # Tests are broken (attempt to import a file that tells you not to import it, # amongst other things) doCheck = false; From 14c30c8521a8c39a751a84e6df7075537dedfbb0 Mon Sep 17 00:00:00 2001 From: Junji Hashimoto Date: Wed, 10 Nov 2021 00:24:51 +0000 Subject: [PATCH 043/359] libtorch-bin: 1.9.0 -> 1.10.0 --- .../libraries/science/math/libtorch/bin.nix | 68 +++++++------------ .../science/math/libtorch/binary-hashes.nix | 29 ++++---- .../science/math/libtorch/prefetch.sh | 38 +++++++++++ 3 files changed, 79 insertions(+), 56 deletions(-) create mode 100755 pkgs/development/libraries/science/math/libtorch/prefetch.sh diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 712713c82be4..b00de428c8d4 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -2,14 +2,13 @@ , stdenv , fetchzip , lib +, libcxx , addOpenGLRunpath , patchelf , fixDarwinDylibNames , cudaSupport -, cudatoolkit_11_1 -, cudnn_cudatoolkit_11_1 }: let @@ -18,10 +17,11 @@ let # this derivation. However, we should ensure on version bumps # that the CUDA toolkit for `passthru.tests` is still # up-to-date. - version = "1.9.0"; + version = "1.10.0"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; + libcxx-for-libtorch = if stdenv.hostPlatform.system == "x86_64-darwin" then libcxx else stdenv.cc.cc.lib; in stdenv.mkDerivation { inherit version; pname = "libtorch"; @@ -67,57 +67,37 @@ in stdenv.mkDerivation { ''} done '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libtorch_python.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_python.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_cpu.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_cpu.dylib - install_name_tool -change @rpath/libtensorpipe.dylib $out/lib/libtensorpipe.dylib $out/lib/libtorch_cpu.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_observers.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_module_test_dynamic.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_detectron_ops.dylib - - install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libshm.dylib - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libshm.dylib - install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libshm.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libshm.dylib - - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_global_deps.dylib - install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_global_deps.dylib + for f in $out/lib/*.dylib; do + otool -L $f + done + for f in $out/lib/*.dylib; do + install_name_tool -id $out/lib/$(basename $f) $f || true + for rpath in $(otool -L $f | grep rpath | awk '{print $1}');do + install_name_tool -change $rpath $out/lib/$(basename $rpath) $f + done + if otool -L $f | grep /usr/lib/libc++ >& /dev/null; then + install_name_tool -change /usr/lib/libc++.1.dylib ${libcxx-for-libtorch.outPath}/lib/libc++.1.0.dylib $f + fi + done + for f in $out/lib/*.dylib; do + otool -L $f + done ''; outputs = [ "out" "dev" ]; passthru.tests.cmake = callPackage ./test { inherit cudaSupport; - cudatoolkit = cudatoolkit_11_1; - cudnn = cudnn_cudatoolkit_11_1; }; meta = with lib; { description = "C++ API of the PyTorch machine learning framework"; homepage = "https://pytorch.org/"; - license = licenses.unfree; # Includes CUDA and Intel MKL. - maintainers = with maintainers; [ ]; - platforms = with platforms; linux ++ darwin; + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html + license = licenses.bsd3; + maintainers = with maintainers; [ junjihashimoto ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 6ded62fb87c3..156515f6eb51 100644 --- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,14 +1,19 @@ -version: { - x86_64-darwin-cpu = { - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip"; - hash = "sha256-TOJ+iQpqazta46y4IzIbfEGMjz/fz+pRDV8fKqriB6Q="; - }; - x86_64-linux-cpu = { - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip"; - hash = "sha256-gZMNLCzW3j+eplBqWo6lVvuHS5iRqtMD8NL3MoszsVg="; - }; - x86_64-linux-cuda = { - url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip"; - hash = "sha256-dRu4F8k2SAbtghwrPJNyX0u3tsODCbXfi9EqUdf4xYc="; +version : builtins.getAttr version { + "1.10.0" = { + x86_64-darwin-cpu = { + name = "libtorch-macos-1.10.0.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.10.0.zip"; + hash = "sha256-HSisxHs466c6XwvZEbkV/1kVNBzJOy3uVw9Bh497Vk8="; + }; + x86_64-linux-cpu = { + name = "libtorch-cxx11-abi-shared-with-deps-1.10.0-cpu.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.10.0%2Bcpu.zip"; + hash = "sha256-wAtA+AZx3HjaFbsrbyfkSXjYM0BP8H5HwCgyHbgJXJ0="; + }; + x86_64-linux-cuda = { + name = "libtorch-cxx11-abi-shared-with-deps-1.10.0-cu113.zip"; + url = "https://download.pytorch.org/libtorch/cu113/libtorch-cxx11-abi-shared-with-deps-1.10.0%2Bcu113.zip"; + hash = "sha256-jPylK4j0V8SEQ8cZU+O22P7kQ28wanIB0GkBzRGyTj8="; + }; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/pkgs/development/libraries/science/math/libtorch/prefetch.sh new file mode 100755 index 000000000000..26b24198e235 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/prefetch.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts + +set -eou pipefail + +version=$1 + +bucket="https://download.pytorch.org/libtorch" +CUDA_VERSION=cu113 + +url_and_key_list=( + "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-${version}.zip libtorch-macos-${version}.zip" + "x86_64-linux-cpu $bucket/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip libtorch-cxx11-abi-shared-with-deps-${version}-cpu.zip" + "x86_64-linux-cuda $bucket/${CUDA_VERSION}/libtorch-cxx11-abi-shared-with-deps-${version}%2B${CUDA_VERSION}.zip libtorch-cxx11-abi-shared-with-deps-${version}-${CUDA_VERSION}.zip" +) + +hashfile="binary-hashes-$version.nix" +echo " \"$version\" = {" >> $hashfile + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) + + echo "prefetching ${url}..." + hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "$url" --name "$name")) + + echo " $key = {" >> $hashfile + echo " name = \"$name\";" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " hash = \"$hash\";" >> $hashfile + echo " };" >> $hashfile + + echo +done + +echo " };" >> $hashfile +echo "done." From 207b16af90cda99f640a75f64a6e16b755a44062 Mon Sep 17 00:00:00 2001 From: Junji Hashimoto Date: Wed, 10 Nov 2021 00:25:41 +0000 Subject: [PATCH 044/359] python3Packages.pytorch-bin: 1.9.1 -> 1.10.0 --- .../python-modules/pytorch/bin.nix | 10 ++++++++-- .../python-modules/pytorch/binary-hashes.nix | 20 +++++++++---------- .../python-modules/pytorch/prefetch.sh | 13 ++++++------ 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index e9bc58321df5..f570a0a5c95a 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -18,7 +18,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.9.1"; + version = "1.10.0"; in buildPythonPackage { inherit version; @@ -59,13 +59,19 @@ in buildPythonPackage { done ''; + # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. + dontStrip = true; + pythonImportsCheck = [ "torch" ]; meta = with lib; { description = "Open source, prototype-to-production deep learning platform"; homepage = "https://pytorch.org/"; changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}"; - license = licenses.unfree; # Includes CUDA and Intel MKL. + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html + license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ junjihashimoto ]; }; diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix index 0fbf9ae91287..dd3e5dc1ae3e 100644 --- a/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -6,21 +6,21 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "1.9.1" = { + "1.10.0" = { x86_64-linux-37 = { - name = "torch-1.9.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-qzXbbpLX+ZlRv41oAyQRk3guU0n/6vuNzWw+nOieL6s="; + name = "torch-1.10.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-KpDbklee2HXSqgrWr1U1nj8EJqUjBWp7SbACw8xtKtg="; }; x86_64-linux-38 = { - name = "torch-1.9.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-JUbcqugax08/iN1LKfXq0ohSpejmbKhbT0by7qMGAzw="; + name = "torch-1.10.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-zM3cMriUG9A+3in/ChzOLytRETpe4ju4uXkxasIRQYM="; }; x86_64-linux-39 = { - name = "torch-1.9.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-wNLLtR9ZxKkVOTzwbAikM5H83pXyH+aPHVFyfrO4c1M="; + name = "torch-1.10.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg="; }; }; } diff --git a/pkgs/development/python-modules/pytorch/prefetch.sh b/pkgs/development/python-modules/pytorch/prefetch.sh index 65007f11bf7b..debf26bfa20a 100755 --- a/pkgs/development/python-modules/pytorch/prefetch.sh +++ b/pkgs/development/python-modules/pytorch/prefetch.sh @@ -1,18 +1,19 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts +set -eou pipefail + version=$1 -bucket="https://download.pytorch.org/whl/cu111" +bucket="https://download.pytorch.org/whl/cu113" url_and_key_list=( -"x86_64-linux-37 $bucket/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" -"x86_64-linux-38 $bucket/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" -"x86_64-linux-39 $bucket/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" ) -hashfile=binary-hashes-"$version".nix -rm -f $hashfile +hashfile="binary-hashes-$version.nix" echo " \"$version\" = {" >> $hashfile for url_and_key in "${url_and_key_list[@]}"; do From d03e760ce9d58ffe90645aef3860e643689afe30 Mon Sep 17 00:00:00 2001 From: Junji Hashimoto Date: Wed, 10 Nov 2021 00:26:10 +0000 Subject: [PATCH 045/359] python3Packages.torchvision-bin: 0.10.1 -> 0.11.1 --- .../python-modules/torchvision/bin.nix | 8 +++++++- .../torchvision/binary-hashes.nix | 20 +++++++++---------- .../python-modules/torchvision/prefetch.sh | 13 ++++++------ 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index a69531f2d062..f7041dbb519d 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -15,7 +15,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.10.1"; + version = "0.11.1"; in buildPythonPackage { inherit version; @@ -36,6 +36,9 @@ in buildPythonPackage { pytorch-bin ]; + # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. + dontStrip = true; + pythonImportsCheck = [ "torchvision" ]; postFixup = let @@ -52,6 +55,9 @@ in buildPythonPackage { description = "PyTorch vision library"; homepage = "https://pytorch.org/"; changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ junjihashimoto ]; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 239db8bdb864..b608bab24409 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,21 +6,21 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.10.1" = { + "0.11.1" = { x86_64-linux-37 = { - name = "torchvision-0.10.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-1MdsCrOLGkYpfbtv011/b6QG+yKaE+O0jUKeUVj2BJY="; + name = "torchvision-0.11.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-2xKWqWNKqmOMyVJnPfbtF+B9PQ7z4S66J1T3P8EvM0I="; }; x86_64-linux-38 = { - name = "torchvision-0.10.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-LtmsnNSa9g3tCdjW1jhu7AZlGgfyYIVh5/2R+WwcxSo="; + name = "torchvision-0.11.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-bFxvJaNEomytXXANHng+oU8YSLGkuO/TSzkoDskkaIE="; }; x86_64-linux-39 = { - name = "torchvision-0.10.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-ZOC/angyiLeOhe+7dAs0W6XlQRKK00T/iI+aBgFNpA0="; + name = "torchvision-0.11.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-ysN3LmSKR+FVKYGnCGQJqa8lVApVT5rPMO+NHmmazAc="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index f57ac96bdb63..686d1b3e6200 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -1,18 +1,19 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts +set -eou pipefail + version=$1 -bucket="https://download.pytorch.org/whl/cu111" +bucket="https://download.pytorch.org/whl/cu113" url_and_key_list=( -"x86_64-linux-37 $bucket/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" -"x86_64-linux-38 $bucket/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" -"x86_64-linux-39 $bucket/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" ) -hashfile=binary-hashes-"$version".nix -rm -f $hashfile +hashfile="binary-hashes-$version.nix" echo " \"$version\" = {" >> $hashfile for url_and_key in "${url_and_key_list[@]}"; do From 6599cb61aaa00e4b97c2ffcae0898821995f6460 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 02:22:17 +0100 Subject: [PATCH 046/359] python3Packages.manticore: 0.3.5 -> 0.3.6 --- .../python-modules/manticore/default.nix | 52 +++++++++++++------ 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix index 9e0938fb1486..0c36f2cc6cc6 100644 --- a/pkgs/development/python-modules/manticore/default.nix +++ b/pkgs/development/python-modules/manticore/default.nix @@ -1,38 +1,46 @@ { lib , buildPythonPackage -, fetchFromGitHub , capstone , crytic-compile +, fetchFromGitHub +, intervaltree , ply , prettytable +, protobuf , pyelftools , pyevmasm , pysha3 +, pytestCheckHook +, pythonOlder , pyyaml , rlp , stdenv , unicorn , wasm , yices -, pytestCheckHook , z3 }: buildPythonPackage rec { pname = "manticore"; - version = "0.3.5"; + version = "0.3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "trailofbits"; repo = "manticore"; rev = version; - sha256 = "0z2nhfcraa5dx6srbrw8s11awh2la0x7d88yw9in8g548nv6qa69"; + sha256 = "sha256-L112YwrBcdcLBeBsPLWt3C57u2WDvGLq50EzW9ojdyg="; }; propagatedBuildInputs = [ crytic-compile + intervaltree ply prettytable + protobuf pyevmasm pysha3 pyyaml @@ -49,22 +57,29 @@ buildPythonPackage rec { sed -ie s/z3-solver// setup.py ''; - checkInputs = [ pytestCheckHook ]; - preCheck = "export PATH=${yices}/bin:${z3}/bin:$PATH"; - pytestFlagsArray = [ - "--ignore=tests/ethereum" # TODO: enable when solc works again - "--ignore=tests/ethereum_bench" - ] ++ lib.optionals (!stdenv.isLinux) [ - "--ignore=tests/native" - "--ignore=tests/other/test_locking.py" - "--ignore=tests/other/test_state_introspection.py" + checkInputs = [ + pytestCheckHook ]; + + preCheck = '' + export PATH=${yices}/bin:${z3}/bin:$PATH + ''; + + disabledTestPaths = [ + "tests/ethereum" # Enable when solc works again + "tests/ethereum_bench" + ] ++ lib.optionals (!stdenv.isLinux) [ + "tests/native" + "tests/other/test_locking.py" + "tests/other/test_state_introspection.py" + ]; + disabledTests = [ - # failing tests + # Failing tests "test_chmod" "test_timeout" "test_wasm_main" - # slow tests + # Slow tests "testmprotectFailSymbReading" "test_ConstraintsForking" "test_resume" @@ -97,6 +112,13 @@ buildPythonPackage rec { "test_implicit_call" "test_trace" "test_plugin" + # Tests are failing with latest unicorn + "Aarch64UnicornInstructions" + "test_integration_resume" + ]; + + pythonImportsCheck = [ + "manticore" ]; meta = with lib; { From 90197ce7ada61136032b5e85933e583c2b0d2c73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 12:24:35 +0100 Subject: [PATCH 047/359] python3Packages.pyflunearyou: 2.0.2 -> 2021.10.0 --- .../python-modules/pyflunearyou/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix index 953f381ff498..99506de1026a 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyflunearyou/default.nix @@ -15,15 +15,16 @@ buildPythonPackage rec { pname = "pyflunearyou"; - version = "2.0.2"; + version = "2021.10.0"; format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "07n2dvnfpfglpdlnwzj4dy41x2zc07ia2krvxdarnv8wzap30y23"; + sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU="; }; nativeBuildInputs = [ @@ -44,11 +45,14 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore the examples directory as the files are prefixed with test_. - # disabledTestFiles doesn't seem to work here - disabledTestPaths = [ "examples/" ]; + disabledTestPaths = [ + # Ignore the examples directory as the files are prefixed with test_. + "examples/" + ]; - pythonImportsCheck = [ "pyflunearyou" ]; + pythonImportsCheck = [ + "pyflunearyou" + ]; meta = with lib; { description = "Python library for retrieving UV-related information from Flu Near You"; From d2fc99d70bb85e1f55e262eb4aece7549fd1587b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 10 Nov 2021 18:19:23 +0000 Subject: [PATCH 048/359] python3Packages.typer: disable failing tests on darwin these all seem to stem from the shellingham package being unable to detect the shell (even if we provide `ps` to it), likely related to a known issue --- pkgs/development/python-modules/typer/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index bc55e3ab8ff7..17008eafc1ba 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , click @@ -42,6 +43,11 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d); ''; + disabledTests = lib.optionals stdenv.isDarwin [ + # likely related to https://github.com/sarugaku/shellingham/issues/35 + "test_show_completion" + "test_install_completion" + ]; pythonImportsCheck = [ "typer" ]; From 8165ee70ca98ed062f40de8590f32264a15ebaf2 Mon Sep 17 00:00:00 2001 From: Dylan Arbour Date: Wed, 3 Nov 2021 14:25:13 -0400 Subject: [PATCH 049/359] cloud-sql-proxy: 1.26.0 -> 1.27.0 --- pkgs/tools/misc/cloud-sql-proxy/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 512381d67f29..7228fb84cb72 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -2,23 +2,27 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloudsql-proxy"; rev = "v${version}"; - sha256 = "sha256-Xgz8ku6szzbgL3cyiggHJYaj4aUhaqgIOUnwKUE1AeY="; + sha256 = "sha256-x44nG5M2ycBaf/Fbw5crmAV//yv/WtIYbTjJ7/6TnoI="; }; subPackages = [ "cmd/cloud_sql_proxy" ]; - vendorSha256 = "sha256-7KiLJoQ0xH35ae4NGODF4t1S9h86L0TJbCqFVm+bBmk="; + vendorSha256 = "sha256-Uw8YJ1qzLYlTkx6wR/FKeDRHGSwZm2za/c0f/OKHiE0="; + + # Disables tests that require running fuse with a hardcoded path + doCheck = false; meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; homepage = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; license = licenses.asl20; maintainers = with maintainers; [ nicknovitski ]; + mainProgram = "cloud_sql_proxy"; }; } From 597e2ce5232f57bf3305e70a826e8485b7633fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 17:28:35 +0100 Subject: [PATCH 050/359] fetchgithub: fix eval when passing forceFetchGit --- pkgs/build-support/fetchgithub/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index ea95bbb47931..d40a0478baba 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -8,7 +8,7 @@ }@args: let baseUrl = "https://${githubBase}/${owner}/${repo}"; - passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ]; + passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ]; varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit; # We prefer fetchzip in cases we don't need submodules as the hash From 06ddf344d8b2a8f3b2ddd356028115f84bd4987a Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 11 Nov 2021 21:00:52 +0100 Subject: [PATCH 051/359] lnd: 0.13.3-beta -> 0.13.4-beta --- pkgs/applications/blockchains/lnd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 62dcac327f78..ffd2d926b63c 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "lnd"; - version = "0.13.3-beta"; + version = "0.13.4-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "05ai8nyrc8likq5n7i9klfi9550ki8sqklv8axjvi6ql8v9bzk61"; + sha256 = "1ykvhbl5i0kqlh0fpzpjass55clys8bpa28brg7d9fs72zv2ks6x"; }; - vendorSha256 = "0xf8395g6hifbqwbgapllx38y0759xp374sja7j1wk8sdj5ngql5"; + vendorSha256 = "13cjb188bzgd3m3p73szxffkab6l7n6wmbvqvicvi9k3mixn5qql"; - subPackages = ["cmd/lncli" "cmd/lnd"]; + subPackages = [ "cmd/lncli" "cmd/lnd" ]; preBuild = let buildVars = { From 7754c0417cb9f343a98036ebee91e013c9220fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Nov 2021 13:18:40 -0800 Subject: [PATCH 052/359] libxlsxwriter: 1.1.3 -> 1.1.4 https://github.com/jmcnamara/libxlsxwriter/releases/tag/RELEASE_1.1.4 --- .../development/libraries/libxlsxwriter/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index f1d4bd298ded..a2f506de0133 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , minizip , python3 , zlib @@ -8,15 +9,23 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "sha256-j+tplk8Fdx92YKj7PnchMZWctVmBmNirUmDw5ADmJy0="; + sha256 = "sha256-Ef1CipwUEJW/VYx/q98lN0PSxj8c3DbIuql8qU6mTRs="; }; + patches = [ + # https://github.com/jmcnamara/libxlsxwriter/pull/357 + (fetchpatch { + url = "https://github.com/jmcnamara/libxlsxwriter/commit/723629976ede5e6ec9b03ef970381fed06ef95f0.patch"; + sha256 = "14aw698b5svvbhvadc2vr71isck3k02zdv8xjsa7c33n8331h20g"; + }) + ]; + nativeBuildInputs = [ python3.pkgs.pytest ]; From f386637083cc4e5cc3e87bc208fbc8447378ea27 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 12 Nov 2021 00:27:26 +0100 Subject: [PATCH 053/359] mautrix-whatsapp: 0.1.10 -> 0.2.1 ChangeLog: https://github.com/mautrix/whatsapp/releases/tag/v0.2.1 --- pkgs/servers/mautrix-whatsapp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 134ff5219925..5a84b8790012 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub, olm }: +{ lib, buildGo117Module, fetchFromGitHub, olm }: -buildGoModule rec { +buildGo117Module rec { pname = "mautrix-whatsapp"; - version = "0.1.10"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-4eqgmJ5CC1Glc8jG+4cQs6FbrY8Az29rCrZvFU3PAoM="; + sha256 = "sha256-gCbZGlZDwHw+OAlTx3rHlbd4Ntw+RaCEDTiP/1q0oJs="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-Y9mUl7fWZiXBEEDX3w2HXMlQKJntv16WeQC1bQQ7hHs="; + vendorSha256 = "sha256-4KDLL9FY3DrkGBDlu6G8Fp7XJfXjwLTELspyW+FBGfo="; doCheck = false; From ca985cc40fbca1dde70ead4f292f1362b75696a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Nov 2021 21:58:17 -0800 Subject: [PATCH 054/359] igraph: 0.9.4 -> 0.9.5 https://github.com/igraph/igraph/releases/tag/0.9.5 --- pkgs/development/libraries/igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 03573716fa35..159943d8db4b 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "sha256-tF+cnJRv125bSpZIpABTIHAfJO4TNfSBHjnzpNTbFgk="; + sha256 = "sha256-R5v1nbfYyIOzdw7LmkGQE4yVxpTVs6YF62jkfFrA1z8="; }; # Normally, igraph wants us to call bootstrap.sh, which will call From f1d204a88011a1f8f182d38d229ff5a19c59a001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Nov 2021 21:59:07 -0800 Subject: [PATCH 055/359] python3Packages.python-igraph: 0.9.6 -> 0.9.8 --- pkgs/development/python-modules/python-igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index ce5073ed087e..91e676602360 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-igraph"; - version = "0.9.6"; + version = "0.9.8"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = version; - sha256 = "sha256-x/BUlMmSgjY2v6bVKPxmz86OCz6xgRUcfSqI3vV9MPs="; + sha256 = "sha256-RtvT5/LZ/xP68yBB7DDKJGeNCiX4HyPTCuk+Ijd2nFs="; }; nativeBuildInputs = [ From 63acfd5685519046dd9e4828121f11ad9b4816ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Nov 2021 22:03:39 -0800 Subject: [PATCH 056/359] python3Packages.python-igraph: rename to igraph https://igraph.org/2021/10/29/igraph-0.9.8-python.html --- pkgs/development/python-modules/cozy/default.nix | 4 ++-- .../development/python-modules/explorerscript/default.nix | 4 ++-- .../python-modules/{python-igraph => igraph}/default.nix | 0 pkgs/development/python-modules/kmapper/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 8 ++++---- 6 files changed, 11 insertions(+), 10 deletions(-) rename pkgs/development/python-modules/{python-igraph => igraph}/default.nix (100%) diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix index fcd002f762d7..8787ca368f1a 100644 --- a/pkgs/development/python-modules/cozy/default.nix +++ b/pkgs/development/python-modules/cozy/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, isPy3k, fetchFromGitHub, lib, - z3, ply, python-igraph, oset, ordered-set, dictionaries, setuptools }: + z3, ply, igraph, oset, ordered-set, dictionaries, setuptools }: buildPythonPackage { pname = "cozy"; @@ -7,7 +7,7 @@ buildPythonPackage { disabled = !isPy3k; propagatedBuildInputs = [ - setuptools z3 ply python-igraph oset ordered-set dictionaries + setuptools z3 ply igraph oset ordered-set dictionaries ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index b0f1a16fe421..fe23b7182346 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, antlr4-python3-runtime, pygments, python-igraph }: +{ lib, buildPythonPackage, fetchFromGitHub, antlr4-python3-runtime, pygments, igraph }: buildPythonPackage rec { pname = "explorerscript"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1"; }; - propagatedBuildInputs = [ antlr4-python3-runtime python-igraph ]; + propagatedBuildInputs = [ antlr4-python3-runtime igraph ]; checkInputs = [ pygments ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix similarity index 100% rename from pkgs/development/python-modules/python-igraph/default.nix rename to pkgs/development/python-modules/igraph/default.nix diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index 630c025e0936..c3418b2c5c94 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -8,7 +8,7 @@ , pytestCheckHook , networkx , matplotlib -, python-igraph +, igraph , plotly , ipywidgets }: @@ -35,7 +35,7 @@ buildPythonPackage rec { pytestCheckHook networkx matplotlib - python-igraph + igraph plotly ipywidgets ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3b7be354942f..d34bb7d260d7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -75,6 +75,7 @@ mapAliases ({ pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 + python-igraph = igraph; # added 2021-11-11 python-lz4 = lz4; # added 2018-06-01 python_mimeparse = python-mimeparse; # added 2021-10-31 python-subunit = subunit; # added 2021-09-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68039eac66fd..140c8ccfefc7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3692,6 +3692,10 @@ in { ignite = callPackage ../development/python-modules/ignite { }; + igraph = callPackage ../development/python-modules/igraph { + inherit (pkgs) igraph; + }; + ihatemoney = callPackage ../development/python-modules/ihatemoney { }; ijson = callPackage ../development/python-modules/ijson { }; @@ -7495,10 +7499,6 @@ in { python-http-client = callPackage ../development/python-modules/python-http-client { }; - python-igraph = callPackage ../development/python-modules/python-igraph { - inherit (pkgs) igraph; - }; - pythonix = callPackage ../development/python-modules/pythonix { nix = pkgs.nix_2_3; meson = pkgs.meson.override { python3 = self.python; }; From c28ad410499b1a6f3c1d4267103f470c875cdd91 Mon Sep 17 00:00:00 2001 From: dunklecat Date: Fri, 12 Nov 2021 17:53:35 +0100 Subject: [PATCH 057/359] godot: 3.3.3 -> 3.3.4 --- pkgs/development/tools/godot/default.nix | 55 ++++++++++++++---------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index c781cb815f76..71465758dcc6 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,9 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11 -, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio -, libXi, libXext, libXfixes, freetype, openssl -, alsa-lib, libGLU, zlib, yasm -, withUdev ? true -}: +{ stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11, libXcursor +, libXinerama, libXrandr, libXrender, libpulseaudio, libXi, libXext, libXfixes +, freetype, openssl, alsa-lib, libGLU, zlib, yasm, withUdev ? true }: let options = { @@ -13,32 +10,46 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { - owner = "godotengine"; - repo = "godot"; - rev = "${version}-stable"; - sha256 = "0bkng0iwsfawxk8bxlq01ib4n6kaxjkbwcif1bhpvw5ra19430rg"; + owner = "godotengine"; + repo = "godot"; + rev = "${version}-stable"; + sha256 = "0pq87f9nsj9fs89aj7za3fcff1sky67imlsriy7jz84yb819kv8g"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - scons udev libX11 libXcursor libXinerama libXrandr libXrender - libXi libXext libXfixes freetype openssl alsa-lib libpulseaudio - libGLU zlib yasm + scons + udev + libX11 + libXcursor + libXinerama + libXrandr + libXrender + libXi + libXext + libXfixes + freetype + openssl + alsa-lib + libpulseaudio + libGLU + zlib + yasm ]; - patches = [ - ./pkg_config_additions.patch - ./dont_clobber_environment.patch - ]; + patches = [ ./pkg_config_additions.patch ./dont_clobber_environment.patch ]; enableParallelBuilding = true; sconsFlags = "target=release_debug platform=x11"; preConfigure = '' - sconsFlags+=" ${lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}" + sconsFlags+=" ${ + lib.concatStringsSep " " + (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options) + }" ''; outputs = [ "out" "dev" "man" ]; @@ -62,10 +73,10 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://godotengine.org"; + homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; - license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ twey ]; }; } From bd084e9b2a40e654c5303740ff7735405349f5be Mon Sep 17 00:00:00 2001 From: dunklecat Date: Fri, 12 Nov 2021 18:36:50 +0100 Subject: [PATCH 058/359] godot: 3.3.4 -> 3.4 --- pkgs/development/tools/godot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 71465758dcc6..a9b8cc3ef439 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.3.4"; + version = "3.4"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "0pq87f9nsj9fs89aj7za3fcff1sky67imlsriy7jz84yb819kv8g"; + sha256 = "0y542zla6msgxf31rd0349d9j3ya7f3njnwmmrh8lmzfgxx86qbx"; }; nativeBuildInputs = [ pkg-config ]; From c513f1ed91dc29edf0bb0b2b8c9ac7de9f3f5eaf Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 6 Nov 2021 19:55:25 -0500 Subject: [PATCH 059/359] coqPackages.smpl: init --- pkgs/development/coq-modules/smpl/default.nix | 28 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/coq-modules/smpl/default.nix diff --git a/pkgs/development/coq-modules/smpl/default.nix b/pkgs/development/coq-modules/smpl/default.nix new file mode 100644 index 000000000000..63bed38ead9c --- /dev/null +++ b/pkgs/development/coq-modules/smpl/default.nix @@ -0,0 +1,28 @@ +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; + +mkCoqDerivation { + pname = "smpl"; + owner = "uds-psl"; + + release."8.10.2".sha256 = "sha256-TUfTZKBgrSOT6piXRViHSGPE9NSj3bGx2XBIw6YCcEs="; + release."8.12".sha256 = "sha256-UQbDHLVBKYk++o+Y2B6ARYRYGglytsnXhguwMatjOHg="; + release."8.13".sha256 = "sha256-HxQBaIE2CjyfG4GoIXprfehqjsr/Z74YdodxMmrbzSg="; + releaseRev = v: "v${v}"; + + inherit version; + defaultVersion = with versions; switch coq.version [ + { case = "8.13.2"; out = "8.13"; } + { case = "8.12.2"; out = "8.12"; } + { case = "8.10.2"; out = "8.10.2"; } + ] null; + + mlPlugin = true; + + meta = { + description = "A Coq plugin providing an extensible tactic similar to first"; + maintainers = with maintainers; [ siraben ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 5e73426afbcb..bf5b65f93885 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -88,6 +88,7 @@ let semantics = callPackage ../development/coq-modules/semantics {}; serapi = callPackage ../development/coq-modules/serapi {}; simple-io = callPackage ../development/coq-modules/simple-io { }; + smpl = callPackage ../development/coq-modules/smpl { }; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; tlc = callPackage ../development/coq-modules/tlc {}; From 8f5073b59e731e8fbb2fa363f674669b714e222f Mon Sep 17 00:00:00 2001 From: dunklecat Date: Sat, 13 Nov 2021 08:11:10 +0100 Subject: [PATCH 060/359] update formatting https://nix-community.github.io/nixpkgs-fmt/ --- pkgs/development/tools/godot/default.nix | 29 ++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index a9b8cc3ef439..e72ea1138428 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,6 +1,26 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11, libXcursor -, libXinerama, libXrandr, libXrender, libpulseaudio, libXi, libXext, libXfixes -, freetype, openssl, alsa-lib, libGLU, zlib, yasm, withUdev ? true }: +{ stdenv +, lib +, fetchFromGitHub +, scons +, pkg-config +, udev +, libX11 +, libXcursor +, libXinerama +, libXrandr +, libXrender +, libpulseaudio +, libXi +, libXext +, libXfixes +, freetype +, openssl +, alsa-lib +, libGLU +, zlib +, yasm +, withUdev ? true +}: let options = { @@ -8,7 +28,8 @@ let pulseaudio = false; udev = withUdev; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "godot"; version = "3.4"; From 86e057aa5b6b44aa20b65ed194ec359e897bd89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 11 Nov 2021 11:26:39 +0100 Subject: [PATCH 061/359] zfs: unlock for 5.15 --- pkgs/os-specific/linux/zfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8e2345ec3a4e..818452ba2013 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -215,8 +215,8 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; - latestCompatibleLinuxPackages = linuxPackages_5_14; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to the latest release. version = "2.1.1"; @@ -226,8 +226,8 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; - latestCompatibleLinuxPackages = linuxPackages_5_14; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the From ba6411ddcb1749e83053f320eec34f714dbbd41e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 Nov 2021 18:55:57 +0000 Subject: [PATCH 062/359] apr: fix cross --- pkgs/development/libraries/apr/default.nix | 16 +++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 19adfb08cfa0..728ec87a1ce6 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages, autoreconfHook }: stdenv.mkDerivation rec { pname = "apr"; @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { # convince fetchpatch to restore missing `a/`, `b/` to paths extraPrefix = ""; }) + + # Fix cross. + (fetchpatch { + url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch"; + sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm"; + }) ] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; # This test needs the net @@ -35,8 +41,8 @@ stdenv.mkDerivation rec { configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_file__dev_zero=yes" "ac_cv_func_setpgrp_void=0" - "apr_cv_process_shared_works=1" "apr_cv_tcp_nodelay_with_cork=1" + "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc" ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [ # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 @@ -45,9 +51,9 @@ stdenv.mkDerivation rec { CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; - nativeBuildInputs = - # Update libtool for macOS 11 support - lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ autoreconfHook ]; + # - Update libtool for macOS 11 support + # - Regenerate for cross fix patch + nativeBuildInputs = [ autoreconfHook ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de9cffab1173..6b45f107734e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15534,7 +15534,9 @@ with pkgs; appstream-glib = callPackage ../development/libraries/appstream-glib { }; - apr = callPackage ../development/libraries/apr { }; + apr = callPackage ../development/libraries/apr { + autoreconfHook = buildPackages.autoreconfHook269; + }; aprutil = callPackage ../development/libraries/apr-util { db = if stdenv.isFreeBSD then db4 else db; From 4099c1aecd683bf7e7ba99aba964f2f8e80b2755 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 Nov 2021 19:43:34 +0000 Subject: [PATCH 063/359] apr: backport patch so we can drop iovec hack --- pkgs/development/libraries/apr/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 728ec87a1ce6..2d51706e9f77 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { }) # Fix cross. + (fetchpatch { + url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch"; + sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y"; + }) (fetchpatch { url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch"; sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm"; @@ -49,8 +53,6 @@ stdenv.mkDerivation rec { "ac_cv_header_windows_h=no" ]; - CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; - # - Update libtool for macOS 11 support # - Regenerate for cross fix patch nativeBuildInputs = [ autoreconfHook ]; From aa32ae2e596ca2841a25d13562b6cb5c78c99bc2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 Nov 2021 19:44:11 +0000 Subject: [PATCH 064/359] apr: run tests --- pkgs/development/libraries/apr/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 2d51706e9f77..0292fb223e7c 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { # - Regenerate for cross fix patch nativeBuildInputs = [ autoreconfHook ]; + doCheck = true; + enableParallelBuilding = true; meta = with lib; { From 51e95616d729f46221728c8a8bce250d08968884 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 Nov 2021 11:28:15 +0000 Subject: [PATCH 065/359] selinux-python: fix cross; strict deps --- pkgs/os-specific/linux/selinux-python/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 32ed5bc2e7d6..b6394b3e1f6c 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -4,7 +4,6 @@ # this is python3 only because setools only supports python3 with lib; -with python3.pkgs; stdenv.mkDerivation rec { pname = "selinux-python"; @@ -17,9 +16,11 @@ stdenv.mkDerivation rec { sha256 = "1pjzsyay5535cxcjag7y7k193ajry0s0xc3dqv5905qd7cwval1n"; }; - nativeBuildInputs = [ wrapPython ]; - buildInputs = [ libsepol python3 ]; - propagatedBuildInputs = [ libselinux libsemanage setools ipy ]; + strictDeps = true; + + nativeBuildInputs = [ python3 python3.pkgs.wrapPython ]; + buildInputs = [ libsepol ]; + propagatedBuildInputs = [ libselinux libsemanage setools python3.pkgs.ipy ]; postPatch = '' substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix" @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { "LOCALEDIR=$(out)/share/locale" "BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions" "PYTHON=python" - "PYTHONLIBDIR=$(out)/${python.sitePackages}" + "PYTHONLIBDIR=$(out)/${python3.sitePackages}" "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; From d2972cac853a7f8367f2840a8c291cc1e7f8240e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 13 Nov 2021 15:32:53 +0300 Subject: [PATCH 066/359] slstatus: fix cross-compilation --- pkgs/applications/misc/slstatus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 613d2f8e78bf..5badb7f1b35a 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; + makeFlags = [ "CC:=$(CC)" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = { From 72dbc9005ec54e47d05860122ff52c4d69b4d754 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 13 Nov 2021 15:33:17 +0300 Subject: [PATCH 067/359] wmname: fix cross-compilation --- pkgs/applications/misc/wmname/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 438bd5c5d56a..45e7cf3d8f1b 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -9,9 +9,15 @@ stdenv.mkDerivation rec { sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5"; }; + postPatch = '' + substituteInPlace Makefile --replace "@strip" "#@strip" + ''; + buildInputs = [ libX11 ]; - preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; + makeFlags = [ "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; meta = { description = "Prints or set the window manager name property of the root window"; From 396b3fc00b1b5b60c695fda01456a950a8c4d02a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 13 Nov 2021 15:33:31 +0300 Subject: [PATCH 068/359] ii: fix cross-compilation --- pkgs/applications/networking/irc/ii/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 93056ef399fb..18a9a8882fac 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; }; - installPhase = '' - make install PREFIX=$out - ''; + makeFlags = [ "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; meta = { homepage = "https://tools.suckless.org/ii/"; From 8d88d5144ac9425fe884cd114f956cbe4f2c1452 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 13 Nov 2021 15:33:45 +0300 Subject: [PATCH 069/359] sic: fix cross-compilation --- pkgs/applications/networking/irc/sic/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 129b72d847d4..705fc12510db 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -4,12 +4,15 @@ stdenv.mkDerivation rec { pname = "sic"; version = "1.2"; - makeFlags = [ "PREFIX=$(out)" ]; src = fetchurl { url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; }; + makeFlags = [ "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; + meta = { description = "Simple IRC client"; homepage = "https://tools.suckless.org/sic/"; From b1c58be1ac6ed732c4b0ef7d4781ab52d7a6a09b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 13 Nov 2021 15:34:03 +0300 Subject: [PATCH 070/359] farbfeld: fix cross-compilation --- pkgs/development/libraries/farbfeld/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index 07957674bb31..3e1045ab852b 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libjpeg ]; nativeBuildInputs = [ makeWrapper ]; + makeFlags = [ "CC:=$(CC)" ]; + installFlags = [ "PREFIX=$(out)" ]; postInstall = '' wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" From 24c9cd84c2e5d244b88b805b85b20512af37325d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 13 Nov 2021 15:34:17 +0300 Subject: [PATCH 071/359] slock: fix cross-compilation --- pkgs/misc/screensavers/slock/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 63ca76e391f4..9f364ba520cd 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorgproto libX11 libXext libXrandr ]; - installFlags = [ "DESTDIR=\${out}" "PREFIX=" ]; + installFlags = [ "PREFIX=$(out)" ]; postPatch = "sed -i '/chmod u+s/d' Makefile"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { cp ${writeText "config.def.h" conf} config.def.h ''; + makeFlags = [ "CC:=$(CC)" ]; + meta = { homepage = "https://tools.suckless.org/slock"; description = "Simple X display locker"; From 17c61e97723ef2b10b60fd497b0e4eebe3b8655c Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 13 Nov 2021 17:04:42 +0200 Subject: [PATCH 072/359] nixos/swap: remove fallocate and use dd as the main swap creation method https://github.com/NixOS/nixpkgs/issues/144572 https://github.com/NixOS/nixpkgs/issues/91986 nixos/swap: remove expansion if else because the file is already recreated if file size is not the same as the configured size nixos/swap: remove old fixme --- nixos/modules/config/swap.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index 9b005021086b..2b94b954cb80 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -203,7 +203,6 @@ in ]; # Create missing swapfiles. - # FIXME: support changing the size of existing swapfiles. systemd.services = let @@ -223,11 +222,7 @@ in ${optionalString (sw.size != null) '' currentSize=$(( $(stat -c "%s" "${sw.device}" 2>/dev/null || echo 0) / 1024 / 1024 )) if [ "${toString sw.size}" != "$currentSize" ]; then - fallocate -l ${toString sw.size}M "${sw.device}" || - dd if=/dev/zero of="${sw.device}" bs=1M count=${toString sw.size} - if [ "${toString sw.size}" -lt "$currentSize" ]; then - truncate --size "${toString sw.size}M" "${sw.device}" - fi + dd if=/dev/zero of="${sw.device}" bs=1M count=${toString sw.size} chmod 0600 ${sw.device} ${optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"} fi From 2b77566cb6eb29bbdc6c37fc8072b8457b2148e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 13 Nov 2021 10:03:42 -0600 Subject: [PATCH 073/359] =?UTF-8?q?crystal:=201.2.1=20=E2=86=92=201.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/crystal/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 18f6da39b254..330cf851ab1b 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -25,11 +25,6 @@ , zlib }: -# We need multiple binaries as a given binary isn't always able to build -# (even slightly) older or newer versions. -# - 0.26.1 can build 0.25.x and 0.26.x but not 0.27.x -# - 0.27.2 can build 0.27.x but not 0.25.x, 0.26.x and 0.29.x -# # We need to keep around at least the latest version released with a stable # NixOS let @@ -241,8 +236,8 @@ rec { }; crystal_1_2 = generic { - version = "1.2.1"; - sha256 = "sha256-jyNmY3n+u8WoVqHY8B5H9Vr9Ix3RogCtm8irkXZ3aek="; + version = "1.2.2"; + sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; binary = crystal_1_1; }; From 214b39133eef93734c984ea3a06caa4affcfb9cb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 13 Nov 2021 18:21:51 +0100 Subject: [PATCH 074/359] rocksdb: reintroduce rocksdb 6.23.3 as rocksdb_6_23 --- pkgs/top-level/all-packages.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 717e2c5d05e5..1c13cf958007 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19300,6 +19300,17 @@ with pkgs; rocksdb_lite = rocksdb.override { enableLite = true; }; + rocksdb_6_23 = rocksdb.overrideAttrs (old: rec { + pname = "rocksdb"; + version = "6.23.3"; + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk="; + }; + }); + rotate-backups = callPackage ../tools/backup/rotate-backups { }; rote = callPackage ../development/libraries/rote { }; From 434676aa05044fc157156f1e503d5ef1b1316068 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 16 Jun 2021 16:50:41 +0200 Subject: [PATCH 075/359] blockbook: 0.3.4 -> 0.3.6 --- pkgs/servers/blockbook/default.nix | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index b10f8919af7a..f628c2f1f368 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub -, packr , pkg-config , bzip2 , lz4 @@ -14,22 +14,19 @@ buildGoModule rec { pname = "blockbook"; - version = "0.3.4"; - commit = "eb4e10a"; + version = "0.3.6"; + commit = "5f8cf45"; src = fetchFromGitHub { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - sha256 = "0da1kav5x2xcmwvdgfk1q70l1k0sqqj3njgx2xx885d40m6qbnrs"; + sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv"; }; - runVend = true; - vendorSha256 = "0p7vyw61nwvmaz7gz2bdh9fi6wp62i2vnzw6iz2r8cims4sbz53b"; + vendorSha256 = "0d17qaqn33wi7lzw4hlym56d9v4qnmvs6plpm5jiby2g5yckq0mz"; - doCheck = false; - - nativeBuildInputs = [ packr pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ]; @@ -39,11 +36,14 @@ buildGoModule rec { "-X github.com/trezor/blockbook/common.buildDate=unknown" ]; + tags = [ "rocksdb_6_16" ]; + preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' export CGO_LDFLAGS="-L${stdenv.cc.cc.lib}/lib -lrocksdb -lz -lbz2 -lsnappy -llz4 -lm -lstdc++" - packr clean && packr + buildFlagsArray+=("-tags=${lib.concatStringsSep " " tags}") + buildFlagsArray+=("-ldflags=${lib.concatStringsSep " " ldflags}") ''; subPackages = [ "." ]; @@ -64,8 +64,5 @@ buildGoModule rec { license = licenses.agpl3; maintainers = with maintainers; [ mmahut _1000101 ]; platforms = platforms.unix; - # go dependency tecbot/gorocksdb requires rocksdb 5.x but nixpkgs has only rocksdb 6.x - # issue in upstream can be tracked here: https://github.com/trezor/blockbook/issues/617 - broken = true; }; } From 31cf0a39137fdb06c19bdb0102cbe0239d730948 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 14 Nov 2021 00:22:26 +0100 Subject: [PATCH 076/359] blockbook: use rocksdb_6_23 --- pkgs/servers/blockbook/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index f628c2f1f368..475541231b16 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -5,13 +5,16 @@ , pkg-config , bzip2 , lz4 -, rocksdb +, rocksdb_6_23 , snappy , zeromq , zlib , nixosTests }: +let + rocksdb = rocksdb_6_23; +in buildGoModule rec { pname = "blockbook"; version = "0.3.6"; From 06651404a6cce0227f2d7a0489ceadc64781fdaf Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 14 Nov 2021 00:36:05 +0100 Subject: [PATCH 077/359] electrs: bring back rocksdb dynamic linking --- pkgs/applications/blockchains/electrs/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 84b2a2f736a1..4981b28fc149 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -24,12 +24,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3 - # https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331 - # # link rocksdb dynamically - # ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; - # ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From af9b2fc0ae447acc539fa6d9261023384c327bfc Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 14 Nov 2021 00:36:30 +0100 Subject: [PATCH 078/359] electrs: use rocksdb_6_23 --- pkgs/applications/blockchains/electrs/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 4981b28fc149..13d0994799ab 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -3,10 +3,13 @@ , rustPlatform , fetchFromGitHub , llvmPackages -, rocksdb +, rocksdb_6_23 , Security }: +let + rocksdb = rocksdb_6_23; +in rustPlatform.buildRustPackage rec { pname = "electrs"; version = "0.9.2"; From 2110942bca27ab12d264980f713e3c45c0f53e2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 00:04:21 +0000 Subject: [PATCH 079/359] bluetooth_battery: 1.2.0 -> 1.3.1 --- pkgs/applications/misc/bluetooth_battery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bluetooth_battery/default.nix b/pkgs/applications/misc/bluetooth_battery/default.nix index 19c2f3b99a4d..d9c3f5bc2a43 100644 --- a/pkgs/applications/misc/bluetooth_battery/default.nix +++ b/pkgs/applications/misc/bluetooth_battery/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "bluetooth_battery"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "TheWeirdDev"; repo = "Bluetooth_Headset_Battery_Level"; rev = "v${version}"; - sha256 = "121pkaq9z8p2i35cqs32aygjvf82r961w0axirpmsrbmrwq2hh6g"; + sha256 = "067qfxh228cy1x95bnjp88dx4k00ajj7ay7fz5vr1gkj2yfa203s"; }; propagatedBuildInputs = [ pybluez ]; From 4d8d026e15e2aec296bc4e16b853116dbad78301 Mon Sep 17 00:00:00 2001 From: Junji Hashimoto Date: Wed, 10 Nov 2021 00:26:44 +0000 Subject: [PATCH 080/359] python3Packages.torchaudio-bin: init at 0.10.0 --- .../python-modules/torchaudio/bin.nix | 52 +++++++++++++++++++ .../torchaudio/binary-hashes.nix | 26 ++++++++++ .../python-modules/torchaudio/prefetch.sh | 37 +++++++++++++ pkgs/top-level/python-packages.nix | 2 + 4 files changed, 117 insertions(+) create mode 100644 pkgs/development/python-modules/torchaudio/bin.nix create mode 100644 pkgs/development/python-modules/torchaudio/binary-hashes.nix create mode 100755 pkgs/development/python-modules/torchaudio/prefetch.sh diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix new file mode 100644 index 000000000000..1f6ae80b0329 --- /dev/null +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchurl +, python +, pytorch-bin +, pythonOlder +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "torchaudio"; + version = "0.10.0"; + format = "wheel"; + + src = + let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion; + unsupported = throw "Unsupported system"; + srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; + in fetchurl srcs; + + disabled = ! (pythonAtLeast "3.7" && pythonOlder "3.10"); + + propagatedBuildInputs = [ + pytorch-bin + ]; + + # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. + dontStrip = true; + + pythonImportsCheck = [ "torchaudio" ]; + + postFixup = '' + # Note: after patchelf'ing, libcudart can still not be found. However, this should + # not be an issue, because PyTorch is loaded before torchvision and brings + # in the necessary symbols. + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:${pytorch-bin}/${python.sitePackages}/torch/lib:" \ + "$out/${python.sitePackages}/torchaudio/_torchaudio.so" + ''; + + meta = with lib; { + description = "PyTorch audio library"; + homepage = "https://pytorch.org/"; + changelog = "https://github.com/pytorch/audio/releases/tag/v${version}"; + # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. + # https://docs.nvidia.com/cuda/eula/index.html + # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ junjihashimoto ]; + }; +} diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix new file mode 100644 index 000000000000..764b9db426b9 --- /dev/null +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -0,0 +1,26 @@ +# Warning: Need to update at the same time as pytorch-bin +# +# Precompiled wheels can be found at: +# https://download.pytorch.org/whl/torch_stable.html + +# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. + +version : builtins.getAttr version { + "0.10.0" = { + x86_64-linux-37 = { + name = "torchaudio-0.10.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-FspXTTODdkO0nPUJcJm8+vLIvckUa8gRfBPBT9LcKPw="; + }; + x86_64-linux-38 = { + name = "torchaudio-0.10.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-Mf7QdXBSIIWRfT7ACthEwFA1V2ieid8legbMnRQnzqI="; + }; + x86_64-linux-39 = { + name = "torchaudio-0.10.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-LMSGNdmku1iHRy1jCRTTOYcQlRL+Oc9jjZC1nx++skA="; + }; + }; +} diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh new file mode 100755 index 000000000000..4e62ab4ed359 --- /dev/null +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts + +set -eou pipefail + +version=$1 + +bucket="https://download.pytorch.org/whl/cu113" + +url_and_key_list=( + "x86_64-linux-37 $bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" +) + +hashfile=binary-hashes-"$version".nix +echo " \"$version\" = {" >> $hashfile + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) + + echo "prefetching ${url}..." + hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + + echo " $key = {" >> $hashfile + echo " name = \"$name\";" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " hash = \"$hash\";" >> $hashfile + echo " };" >> $hashfile + + echo +done + +echo " };" >> $hashfile +echo "done." diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf39935714aa..1a1759463623 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9068,6 +9068,8 @@ in { toposort = callPackage ../development/python-modules/toposort { }; + torchaudio-bin = callPackage ../development/python-modules/torchaudio/bin.nix { }; + torchgpipe = callPackage ../development/python-modules/torchgpipe { }; torchvision = callPackage ../development/python-modules/torchvision { }; From 574a1d605a315579b7afa83c36ad2e4f1b5aa12e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 14 Nov 2021 04:20:00 +0000 Subject: [PATCH 081/359] postgresqlPackages.pg_auto_failover: 1.6.2 -> 1.6.3 https://github.com/citusdata/pg_auto_failover/releases/tag/v1.6.3 --- pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index cb0aac6147fe..34654a3d0430 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "158rr0q2y34mjikripz7n61gc3ivj29brxxz4yq72qbz5bd859yj"; + sha256 = "sha256-hGpcHV4ai9mxaJ/u/o9LNFWPGsW22W7ak2pbvAUgmwU="; }; buildInputs = [ postgresql openssl zlib readline libkrb5 ]; From 5c8408f4ae4254c668fc3b4426603f6df6882258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Nov 2021 20:35:11 -0800 Subject: [PATCH 082/359] python3Packages.colorlog: 6.5.0 -> 6.6.0 https://github.com/borntyping/python-colorlog/releases/tag/v6.6.0 --- pkgs/development/python-modules/colorlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index d8a800f70ce0..690a54813f41 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "6.5.0"; + version = "6.6.0"; src = fetchPypi { inherit pname version; - sha256 = "cf62a8e389d5660d0d22be17937b25b9abef9497ddc940197d1773aa1f604339"; + sha256 = "sha256-NE9zIEAJ5Mg8W2vrALPEXccPza48gNuRngpBcdAG/eg="; }; checkInputs = [ pytestCheckHook ]; From 881d3fae720f51142cc0f0f5f9bc533b6e83af23 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 14 Nov 2021 13:54:00 +0900 Subject: [PATCH 083/359] wrapFirefox: fix icon linking for Thunderbird Firefox has its icons in `/lib/firefox-bin-*/browser/chrome/icons/default` while Thunderbird has `/lib/thunderbird/chrome/icons/default`. Fixes https://github.com/NixOS/nixpkgs/pull/143942#issuecomment-963418080. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index aa6f7da503fb..462c24a62319 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -290,7 +290,7 @@ let else for res in 16 32 48 64 128; do mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" - icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" ) + icon=$( find "${browser}/lib/" -name "default''${res}.png" ) if [ -e "$icon" ]; then ln -s "$icon" \ "$out/share/icons/hicolor/''${res}x''${res}/apps/${applicationName}.png" fi From 6a6cd8cb50723d17a9d710923443f03dd8932468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20=C5=BDlender?= Date: Sun, 29 Aug 2021 18:37:35 +0200 Subject: [PATCH 084/359] zncModules.clientbuffer: 2020-04-24 -> 2021-05-30 --- pkgs/applications/networking/znc/modules.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index ddd94bff522a..1620c2878eea 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -43,14 +43,14 @@ in clientbuffer = zncDerivation rec { pname = "znc-clientbuffer"; - version = "unstable-2020-04-24"; + version = "unstable-2021-05-30"; module_name = "clientbuffer"; src = fetchFromGitHub { owner = "CyberShadow"; repo = "znc-clientbuffer"; - rev = "2e32d508aa975c0a307d09575a0198f8c56c11fa"; - sha256 = "1jaspnrbv3pzsnbysqygc8s8g3q07zx5nlrdpgwv9j8aryg0pcnh"; + rev = "9a7465b413b53408f5d7af86e84b1d08efb6bec0"; + sha256 = "0a3f4j6s5j7p53y42zrgpqyl2zm0jxb69lp24j6mni3licigh254"; }; meta = with lib; { From a00663e737e861bcc719127adcf4c28a7edb3027 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 09:25:38 +0000 Subject: [PATCH 085/359] python38Packages.asyncssh: 2.8.0 -> 2.8.1 --- pkgs/development/python-modules/asyncssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index f028fc33310c..7cdfbb66b26b 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VWXLBpShTp1MvJ9zhP58P9ZplVMetPUucq2II+2iG6M="; + sha256 = "0648eba58d72653755f28e26c9bd83147d9652c1f2f5e87fbf5a87d7f8fbf83a"; }; propagatedBuildInputs = [ From 936b6280180ca7b3499008fbcffaf2b968bc6e35 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 14 Nov 2021 11:09:50 +0100 Subject: [PATCH 086/359] libmysofa: 1.2.0 -> 1.2.1 Fixes CVE-2021-3756. https://huntr.dev/bounties/7ca8d9ea-e2a6-4294-af28-70260bb53bc1/ --- pkgs/development/libraries/audio/libmysofa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 821a9ea9226a..5626c5fa8f8d 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "sha256-f+1CIVSxyScyNF92cPIiZwfnnCVrWfCZlbrIXtduIdY="; + sha256 = "sha256-SCyeicZ+JkJU1x2X3efOvxUXT2qF2IiUsj+anLg5Lsg="; }; nativeBuildInputs = [ cmake ]; From 0977a6042f5b4c9dcaec2783d958fb71a184e979 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Nov 2021 12:46:18 +0100 Subject: [PATCH 087/359] python3Packages.xknx: 0.18.12 -> 0.18.13 --- pkgs/development/python-modules/xknx/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index f28a5c6a72a6..d7cf63f003d0 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.12"; - disabled = pythonOlder "3.7"; + version = "0.18.13"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-Wk6+IRIGMaOPOEVEyzalBKyK88Y2yfKKo6T0fKxeOOE="; + sha256 = "sha256-GZ5FRPQn69+/Fnx10VKWSIAaVXCcVyfvQVH1JaMGRC0="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "xknx" ]; + pythonImportsCheck = [ + "xknx" + ]; meta = with lib; { description = "KNX Library Written in Python"; From 2ff3291e0d74e5d2e640fe07c304fe67ca756580 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 14 Nov 2021 12:00:00 +0000 Subject: [PATCH 088/359] pdfarranger: 1.7.1 -> 1.8.0 --- pkgs/applications/misc/pdfarranger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 5657c7f7e1a5..dd7d3f4768ef 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1c2mafnz8pv32wzkc2wx4q8y2x7xffpn6ag12dj7ga5n772fb6s3"; + sha256 = "0xfxcwb24rp0kni2b4wdk6fvhqnhd6fh559ag6wdr4sspzkqwdjf"; }; nativeBuildInputs = [ From a2a7a3eba7d4390650c99594577e208c8faef995 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Nov 2021 13:01:25 +0100 Subject: [PATCH 089/359] python3Packages.vehicle: init at 0.2.0 --- .../python-modules/vehicle/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/vehicle/default.nix diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix new file mode 100644 index 000000000000..b7b7fbc32738 --- /dev/null +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "vehicle"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-vehicle"; + rev = "v${version}"; + sha256 = "0yiavz5sw8fjrh6m3mr8gyds7h6vaja3xy1516ajgz0qvijhqylg"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pydantic + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + pythonImportsCheck = [ + "vehicle" + ]; + + meta = with lib; { + description = "Python client providing RDW vehicle information"; + homepage = "https://github.com/frenck/python-wled"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c63a35749259..207fdded2989 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9693,6 +9693,8 @@ in { vdirsyncer = callPackage ../development/python-modules/vdirsyncer { }; + vehicle = callPackage ../development/python-modules/vehicle { }; + vega = callPackage ../development/python-modules/vega { }; vega_datasets = callPackage ../development/python-modules/vega_datasets { }; From c7703c49fe7d8214715403d8a530f6d7a8ddfc8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 12:13:03 +0000 Subject: [PATCH 090/359] python38Packages.braintree: 4.12.0 -> 4.13.0 --- pkgs/development/python-modules/braintree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 17681f053337..95e24e98d51c 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.12.0"; + version = "4.13.0"; src = fetchPypi { inherit pname version; - sha256 = "946abd50fe2843eec586ac3cec285d27dfae0cc5a43a64b505e8a2800b8a74a6"; + sha256 = "de8270c24c4557bcb76d2079bb4cabf380ce467d17c65f10ee5159da7ff8496a"; }; propagatedBuildInputs = [ requests ]; From ba4915683fb33cb2bc247cfdc6dc1c2a0264fb9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 12:42:34 +0000 Subject: [PATCH 091/359] python38Packages.certbot: 1.20.0 -> 1.21.0 --- pkgs/development/python-modules/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 6fe2bc2be08d..31cb3fd5ffe4 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SO8vy9x2jwK5AOHety7RuxRK+OEIHpMXqetW3bqfzZI="; + sha256 = "0sbhg8gdcszi4q5091s1by0hz6qxpkdfazs5lbfrlw33fkck2d3i"; }; sourceRoot = "source/${pname}"; From e8a7e2bebfe3960854405bbb9b9004709a811885 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 13:25:39 +0000 Subject: [PATCH 092/359] python38Packages.clize: 4.2.0 -> 4.2.1 --- pkgs/development/python-modules/clize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index faeb54f794bb..4f9a562543b9 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "clize"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "06p47i6hri006v7xbx7myj02as1a6f34rv88wfa9rb067p13nmyz"; + sha256 = "3177a028e4169d8865c79af82bdd441b24311d4bd9c0ae8803641882d340a51d"; }; checkInputs = [ From 4b0e5832671a7a27a5c969810022fc293291e7a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 13:33:55 +0000 Subject: [PATCH 093/359] python38Packages.clustershell: 1.8.3 -> 1.8.4 --- pkgs/development/python-modules/clustershell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index d247cecdfa63..ecbd8d02120d 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ClusterShell"; - version = "1.8.3"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "0ebc1925c1aed94f99d74cbc0230215127ade80a25240133204094faa74bc41b"; + sha256 = "ff6fba688a06e5e577315d899f0dab3f4fe479cef99d444a4e651af577b7d081"; }; propagatedBuildInputs = [ pyyaml ]; From c870679a00963a48daf27821c96753f642284ff8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 13:45:36 +0000 Subject: [PATCH 094/359] python38Packages.cogapp: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/cogapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 022ab5a0b29c..16059fe3d6b5 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cogapp"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c43e374ee5ca2a35fbc68556f598bd8578eabe8a890487980bba56945b5ce9c6"; + sha256 = "09a6e82a55af45f5e946d7002ed997869abf6f57d28fdc79f128132b5da18bf8"; }; # there are no tests From 0ea262154a1ed256afd153c8e1749282f2a83e69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 14:27:38 +0000 Subject: [PATCH 095/359] python38Packages.cupy: 9.5.0 -> 9.6.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index c3b06b7d9caa..6336fc0bdc01 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "9.5.0"; + version = "9.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2e85c3ac476c80c78ce94cae8786cc82a615fc4d1b0d380f16b9665d2cc5d187"; + sha256 = "22469ea1ad51ffbb4af2b139ed0820ac5d0b78f1265b2a095ed5e5d5299aab91"; }; preConfigure = '' From 577451f200653075f459cf90e4619fb7895f2078 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 15:47:29 +0000 Subject: [PATCH 096/359] python38Packages.dropbox: 11.22.0 -> 11.23.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 5b9301172b6d..7fc0cb3b12ba 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.22.0"; + version = "11.23.0"; src = fetchFromGitHub { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "0fhzpss3zs5x3hr4amrmw8hras75qc385ikpw0sx5a907kigk7w5"; + sha256 = "1zrwr73dirmkbkcpy8v49hb52xffh0k9wp2603aysg9435w1rxvx"; }; postPatch = '' From 04b066581453250ea66a65cd968418b385d11025 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 15:57:48 +0000 Subject: [PATCH 097/359] python38Packages.elasticsearch: 7.15.1 -> 7.15.2 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 0548cb6e3cb0..ae5d14aa4883 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -12,11 +12,11 @@ buildPythonPackage (rec { # there's a clear path forward. See # https://github.com/elastic/elasticsearch-py/issues/1639 for more # info. - version = "7.15.1"; + version = "7.15.2"; src = fetchPypi { inherit pname version; - sha256 = "1e9a6302945d98046899a7c9b3d345c881ac7b05ba176d3a49c9d2702b1e8bc8"; + sha256 = "436f871848a5020bf9b47495812b229b59bd0c5d7e40adbd5e3c89896b311704"; }; # Check is disabled because running them destroy the content of the local cluster! From 603254bab2c8ca31fafef44dd879792510fac335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 14 Nov 2021 17:07:09 +0100 Subject: [PATCH 098/359] zsh-fast-syntax-highlighting: new upstream url --- pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix index d1791e4962f4..5b77978c0221 100644 --- a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix @@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation rec { version = "1.55"; src = fetchFromGitHub { - owner = "zdharma"; + owner = "zdharma-continuum"; repo = "fast-syntax-highlighting"; rev = "v${version}"; sha256 = "0h7f27gz586xxw7cc0wyiv3bx0x3qih2wwh05ad85bh2h834ar8d"; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Syntax-highlighting for Zshell"; - homepage = "https://github.com/zdharma/fast-syntax-highlighting"; + homepage = "https://github.com/zdharma-continuum/fast-syntax-highlighting"; license = licenses.bsd3; platforms = platforms.unix; }; From 2df1f0268bac7e7da859d1c01db902736f2cd975 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sun, 14 Nov 2021 16:27:56 +0000 Subject: [PATCH 099/359] python3Packages.django: remove lsix from maintainers --- pkgs/development/python-modules/django/2.nix | 2 +- pkgs/development/python-modules/django/3.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index 67946ab0d725..c1e5139d3015 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "A high-level Python Web framework"; homepage = "https://www.djangoproject.com/"; license = licenses.bsd3; - maintainers = with maintainers; [ georgewhewell lsix ]; + maintainers = with maintainers; [ georgewhewell ]; }; } diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index cfe9f451ef65..9b8aa8cba8f4 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "A high-level Python Web framework"; homepage = "https://www.djangoproject.com/"; license = licenses.bsd3; - maintainers = with maintainers; [ georgewhewell lsix ]; + maintainers = with maintainers; [ georgewhewell ]; }; } From ae75e0ce587f97584da6bf1351a61a6fb52bc88c Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 14 Nov 2021 12:34:19 -0500 Subject: [PATCH 100/359] cargo-depgraph: init at 1.2.2 --- .../tools/rust/cargo-depgraph/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-depgraph/default.nix diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/development/tools/rust/cargo-depgraph/default.nix new file mode 100644 index 000000000000..ab45d053477c --- /dev/null +++ b/pkgs/development/tools/rust/cargo-depgraph/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromSourcehut }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-depgraph"; + version = "1.2.2"; + + src = fetchFromSourcehut { + owner = "~jplatte"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Zt60F43hhFSj9zfAkEbgRqODvBRmzn04dHMijbz+uX0="; + }; + + cargoSha256 = "sha256-mMXIiAfYBqOS3z4735T9dB9TEo7Ph2JCNq0QfyetxJg="; + + meta = with lib; { + description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz"; + homepage = "https://sr.ht/~jplatte/cargo-depgraph"; + changelog = "https://git.sr.ht/~jplatte/cargo-depgraph/tree/v${version}/item/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee2d656c8bcf..bf0d08147815 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12802,6 +12802,7 @@ with pkgs; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-depgraph = callPackage ../development/tools/rust/cargo-depgraph { }; cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { inherit (darwin.apple_sdk.frameworks) Security; }; From 2b439432294626fe676f4c0c94ea75ccc95b429c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 14 Nov 2021 20:12:04 +0200 Subject: [PATCH 101/359] gnomeExtensions.sound-output-device-chooser: 38 -> 39 --- .../gnome/extensions/sound-output-device-chooser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index e439e5b5a50a..cf4b916b2010 100644 --- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "38"; + version = "39"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; rev = version; - sha256 = "sha256-LZ+C9iK+j7+DEscYCIObxXc0Bn0Z0xSsEFMZxc8REWA="; + sha256 = "sha256-RFdBdpKsz2MjdzxWX4UFwah+e68dqrkvm7ql0RAZZwg="; }; patches = [ From 962807bf9e66d89107b09d328d774b45e8169983 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 14 Nov 2021 14:42:16 -0500 Subject: [PATCH 102/359] kodi.packages.libretro-mgba: init at 0.9.2.31 --- .../kodi-packages/libretro-mgba/default.nix | 31 +++++++++++++++++++ pkgs/top-level/kodi-packages.nix | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/video/kodi-packages/libretro-mgba/default.nix diff --git a/pkgs/applications/video/kodi-packages/libretro-mgba/default.nix b/pkgs/applications/video/kodi-packages/libretro-mgba/default.nix new file mode 100644 index 000000000000..a58f1c51b295 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/libretro-mgba/default.nix @@ -0,0 +1,31 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }: + +buildKodiBinaryAddon rec { + pname = "kodi-libretro-mgba"; + namespace = "game.libretro.mgba"; + version = "0.9.2.31"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "game.libretro.mgba"; + rev = "${version}-${rel}"; + sha256 = "sha256-eZLuNhLwMTtzpLGkymc9cLC83FQJWZ2ZT0iyz4sY4EA="; + }; + + extraCMakeFlags = [ + "-DMGBA_LIB=${mgba}/lib/retroarch/cores/mgba_libretro.so" + ]; + + extraBuildInputs = [ mgba ]; + propagatedBuildInputs = [ + libretro + ]; + + meta = with lib; { + homepage = "https://github.com/kodi-game/game.libretro.mgba"; + description = "mGBA for Kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index e7c848ab5560..fc6249334c53 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -3,7 +3,7 @@ with lib; let - inherit (libretro) genesis-plus-gx snes9x; + inherit (libretro) genesis-plus-gx mgba snes9x; in let self = rec { @@ -76,6 +76,8 @@ let self = rec { libretro-genplus = callPackage ../applications/video/kodi-packages/libretro-genplus { inherit genesis-plus-gx; }; + libretro-mgba = callPackage ../applications/video/kodi-packages/libretro-mgba { inherit mgba; }; + libretro-snes9x = callPackage ../applications/video/kodi-packages/libretro-snes9x { inherit snes9x; }; jellyfin = callPackage ../applications/video/kodi-packages/jellyfin { }; From eb7e0ba2578eb94622ecffe5b6142edcc9a8bfc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 21:51:32 +0000 Subject: [PATCH 103/359] python38Packages.ibm-cloud-sdk-core: 3.12.0 -> 3.13.0 --- .../development/python-modules/ibm-cloud-sdk-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 741fd996ffdc..8c3c3670c424 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.12.0"; + version = "3.13.0"; src = fetchPypi { inherit pname version; - sha256 = "ff3e8675a982f7754359ec598329ba5635014e2bfd51573b9413605849ef314a"; + sha256 = "b27aec03e8c666b3e36c68b2331871f37a0c6c0467fe0f73462fda7300d3c19f"; }; propagatedBuildInputs = [ From 968d18045263799811c2ff9e238214bd1f6a2329 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 4 Nov 2021 00:20:56 +0100 Subject: [PATCH 104/359] php: Implement overrideAttrs that composes with buildEnv/withExtensions Hopefully. Also add a couple of tests to check that. --- pkgs/development/interpreters/php/generic.nix | 250 ++++++++++-------- pkgs/test/default.nix | 2 + pkgs/test/php/default.nix | 116 ++++++++ 3 files changed, 260 insertions(+), 108 deletions(-) create mode 100644 pkgs/test/php/default.nix diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index dbe01acb6dfd..7a1ee2a2ebaf 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -7,6 +7,7 @@ let , lib , stdenv , nixosTests + , tests , fetchurl , makeWrapper , symlinkJoin @@ -31,6 +32,7 @@ let , sha256 , extraPatches ? [ ] , packageOverrides ? (final: prev: { }) + , phpAttrsOverrides ? (attrs: { }) # Sapi flags , cgiSupport ? true @@ -52,6 +54,16 @@ let }@args: let + # Compose two functions of the type expected by 'overrideAttrs' + # into one where changes made in the first are available to the second. + composeOverrides = + f: g: attrs: + let + fApplied = f attrs; + attrs' = attrs // fApplied; + in + fApplied // g attrs'; + # buildEnv wraps php to provide additional extensions and # configuration. Its usage is documented in # doc/languages-frameworks/php.section.md. @@ -129,10 +141,20 @@ let passthru = php.passthru // { buildEnv = mkBuildEnv allArgs allExtensionFunctions; withExtensions = mkWithExtensions allArgs allExtensionFunctions; + overrideAttrs = + f: + let + newPhpAttrsOverrides = composeOverrides (filteredArgs.phpAttrsOverrides or (attrs: { })) f; + php = generic (filteredArgs // { phpAttrsOverrides = newPhpAttrsOverrides; }); + in + php.buildEnv { inherit extensions extraConfig; }; phpIni = "${phpWithExtensions}/lib/php.ini"; unwrapped = php; # Select the right php tests for the php version - tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; + tests = { + nixos = lib.recurseIntoAttrs nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; + package = tests.php; + }; inherit (php-packages) extensions buildPecl mkExtension; packages = php-packages.tools; meta = php.meta // { @@ -163,139 +185,151 @@ let mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; in - stdenv.mkDerivation { - pname = "php"; + stdenv.mkDerivation ( + let + attrs = { + pname = "php"; - inherit version; + inherit version; - enableParallelBuilding = true; + enableParallelBuilding = true; - nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] - ++ lib.optional stdenv.isDarwin xcbuild; + nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] + ++ lib.optional stdenv.isDarwin xcbuild; - buildInputs = - # PCRE extension - [ pcre2 ] + buildInputs = + # PCRE extension + [ pcre2 ] - # Enable sapis - ++ lib.optional pearSupport [ libxml2.dev ] + # Enable sapis + ++ lib.optional pearSupport [ libxml2.dev ] - # Misc deps - ++ lib.optional apxs2Support apacheHttpd - ++ lib.optional argon2Support libargon2 - ++ lib.optional systemdSupport systemd - ++ lib.optional valgrindSupport valgrind - ; + # Misc deps + ++ lib.optional apxs2Support apacheHttpd + ++ lib.optional argon2Support libargon2 + ++ lib.optional systemdSupport systemd + ++ lib.optional valgrindSupport valgrind + ; - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - configureFlags = - # Disable all extensions - [ "--disable-all" ] + configureFlags = + # Disable all extensions + [ "--disable-all" ] - # PCRE - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ [ "PCRE_LIBDIR=${pcre2}" ] + # PCRE + ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] + ++ [ "PCRE_LIBDIR=${pcre2}" ] - # Enable sapis - ++ lib.optional (!cgiSupport) "--disable-cgi" - ++ lib.optional (!cliSupport) "--disable-cli" - ++ lib.optional fpmSupport "--enable-fpm" - ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] - ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ - "--enable-libxml" - "--with-libxml-dir=${libxml2.dev}" - ] - ++ lib.optional pharSupport "--enable-phar" - ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" + # Enable sapis + ++ lib.optional (!cgiSupport) "--disable-cgi" + ++ lib.optional (!cliSupport) "--disable-cli" + ++ lib.optional fpmSupport "--enable-fpm" + ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] + ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ + "--enable-libxml" + "--with-libxml-dir=${libxml2.dev}" + ] + ++ lib.optional pharSupport "--enable-phar" + ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" - # Misc flags - ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" - ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" - ++ lib.optional cgotoSupport "--enable-re2c-cgoto" - ++ lib.optional embedSupport "--enable-embed" - ++ lib.optional (!ipv6Support) "--disable-ipv6" - ++ lib.optional systemdSupport "--with-fpm-systemd" - ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts" - ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts" + # Misc flags + ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" + ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" + ++ lib.optional cgotoSupport "--enable-re2c-cgoto" + ++ lib.optional embedSupport "--enable-embed" + ++ lib.optional (!ipv6Support) "--disable-ipv6" + ++ lib.optional systemdSupport "--with-fpm-systemd" + ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts" + ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts" - # Sendmail - ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] - ; + # Sendmail + ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] + ; - hardeningDisable = [ "bindnow" ]; + hardeningDisable = [ "bindnow" ]; - preConfigure = - # Don't record the configure flags since this causes unnecessary - # runtime dependencies - '' - for i in main/build-defs.h.in scripts/php-config.in; do - substituteInPlace $i \ - --replace '@CONFIGURE_COMMAND@' '(omitted)' \ - --replace '@CONFIGURE_OPTIONS@' "" \ - --replace '@PHP_LDFLAGS@' "" - done + preConfigure = + # Don't record the configure flags since this causes unnecessary + # runtime dependencies + '' + for i in main/build-defs.h.in scripts/php-config.in; do + substituteInPlace $i \ + --replace '@CONFIGURE_COMMAND@' '(omitted)' \ + --replace '@CONFIGURE_OPTIONS@' "" \ + --replace '@PHP_LDFLAGS@' "" + done - export EXTENSION_DIR=$out/lib/php/extensions - '' - # PKG_CONFIG need not be a relative path - + lib.optionalString (!lib.versionAtLeast version "7.4") '' - for i in $(find . -type f -name "*.m4"); do - substituteInPlace $i \ - --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' - done - '' + '' - ./buildconf --copy --force + export EXTENSION_DIR=$out/lib/php/extensions + '' + # PKG_CONFIG need not be a relative path + + lib.optionalString (!lib.versionAtLeast version "7.4") '' + for i in $(find . -type f -name "*.m4"); do + substituteInPlace $i \ + --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' + done + '' + '' + ./buildconf --copy --force - if test -f $src/genfiles; then - ./genfiles - fi - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "-lstdc++" "-lc++" - ''; + if test -f $src/genfiles; then + ./genfiles + fi + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-lstdc++" "-lc++" + ''; - postInstall = '' - test -d $out/etc || mkdir $out/etc - cp php.ini-production $out/etc/php.ini - ''; + postInstall = '' + test -d $out/etc || mkdir $out/etc + cp php.ini-production $out/etc/php.ini + ''; - postFixup = '' - mkdir -p $dev/bin $dev/share/man/man1 - mv $out/bin/phpize $out/bin/php-config $dev/bin/ - mv $out/share/man/man1/phpize.1.gz \ - $out/share/man/man1/php-config.1.gz \ - $dev/share/man/man1/ - ''; + postFixup = '' + mkdir -p $dev/bin $dev/share/man/man1 + mv $out/bin/phpize $out/bin/php-config $dev/bin/ + mv $out/share/man/man1/phpize.1.gz \ + $out/share/man/man1/php-config.1.gz \ + $dev/share/man/man1/ + ''; - src = fetchurl { - url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit sha256; - }; + src = fetchurl { + url = "https://www.php.net/distributions/php-${version}.tar.bz2"; + inherit sha256; + }; - patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + patches = [ ./fix-paths-php7.patch ] ++ extraPatches; - separateDebugInfo = true; + separateDebugInfo = true; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" ]; - passthru = { - buildEnv = mkBuildEnv { } [ ]; - withExtensions = mkWithExtensions { } [ ]; - inherit ztsSupport; - }; + passthru = { + buildEnv = mkBuildEnv { } [ ]; + withExtensions = mkWithExtensions { } [ ]; + overrideAttrs = + f: + let + newPhpAttrsOverrides = composeOverrides phpAttrsOverrides f; + php = generic (args // { phpAttrsOverrides = newPhpAttrsOverrides; }); + in + php; + inherit ztsSupport; + }; - meta = with lib; { - description = "An HTML-embedded scripting language"; - homepage = "https://www.php.net/"; - license = licenses.php301; - maintainers = teams.php.members; - platforms = platforms.all; - outputsToInstall = [ "out" "dev" ]; - }; - }; + meta = with lib; { + description = "An HTML-embedded scripting language"; + homepage = "https://www.php.net/"; + license = licenses.php301; + maintainers = teams.php.members; + platforms = platforms.all; + outputsToInstall = [ "out" "dev" ]; + }; + }; + in + attrs // phpAttrsOverrides attrs + ); in generic diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 80d82e5bee07..ac4aebda5cd8 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -37,6 +37,8 @@ with pkgs; cross = callPackage ./cross {}; + php = recurseIntoAttrs (callPackages ./php {}); + rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; diff --git a/pkgs/test/php/default.nix b/pkgs/test/php/default.nix new file mode 100644 index 000000000000..3c6c8f61b6db --- /dev/null +++ b/pkgs/test/php/default.nix @@ -0,0 +1,116 @@ +{ lib +, php +, runCommand +}: + +let + runTest = name: body: runCommand name { } '' + testFailed= + checking() { + echo -n "Checking $1... " > /dev/stderr + } + ok() { + echo ok > /dev/stderr + } + nok() { + echo fail > /dev/stderr + testFailed=1 + } + + ${body} + + if test -n "$testFailed"; then + exit 1 + fi + + touch $out + ''; + + check = cond: if cond then "ok" else "nok"; +in +{ + withExtensions-enables-previously-disabled-extensions = runTest "php-test-withExtensions-enables-previously-disabled-extensions" '' + php="${php}" + + checking "that imagick is not present by default" + $php/bin/php -r 'exit(extension_loaded("imagick") ? 1 : 0);' && ok || nok + + phpWithImagick="${php.withExtensions ({ all, ... }: [ all.imagick ])}" + checking "that imagick extension is present when enabled" + $phpWithImagick/bin/php -r 'exit(extension_loaded("imagick") ? 0 : 1);' && ok || nok + ''; + + overrideAttrs-preserves-enabled-extensions = + let + customPhp = + (php.withExtensions ({ all, ... }: [ all.imagick ])).overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + touch "$out/oApee-was-here" + ''; + }); + in + runTest "php-test-overrideAttrs-preserves-enabled-extensions" '' + php="${customPhp}" + phpUnwrapped="${customPhp.unwrapped}" + + checking "if overrides took hold" + test -f "$phpUnwrapped/oApee-was-here" && ok || nok + + checking "if imagick extension is still present" + $php/bin/php -r 'exit(extension_loaded("imagick") ? 0 : 1);' && ok || nok + + checking "if imagick extension is linked against the overridden PHP" + echo $php + $php/bin/php -r 'exit(extension_loaded("imagick") ? 0 : 1);' && ok || nok + ''; + + unwrapped-overrideAttrs-stacks = + let + customPhp = + lib.pipe php.unwrapped [ + (pkg: pkg.overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + touch "$out/oAs-first" + ''; + })) + + (pkg: pkg.overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + touch "$out/oAs-second" + ''; + })) + ]; + in + runTest "php-test-unwrapped-overrideAttrs-stacks" '' + checking "if first override remained" + ${check (builtins.match ".*oAs-first.*" customPhp.postInstall != null)} + + checking "if second override is there" + ${check (builtins.match ".*oAs-second.*" customPhp.postInstall != null)} + ''; + + wrapped-overrideAttrs-stacks = + let + customPhp = + lib.pipe php [ + (pkg: pkg.overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + touch "$out/oAs-first" + ''; + })) + + (pkg: pkg.overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + touch "$out/oAs-second" + ''; + })) + ]; + in + runTest "php-test-wrapped-overrideAttrs-stacks" '' + checking "if first override remained" + ${check (builtins.match ".*oAs-first.*" customPhp.unwrapped.postInstall != null)} + + checking "if second override is there" + ${check (builtins.match ".*oAs-second.*" customPhp.unwrapped.postInstall != null)} + ''; +} From e632b0acccb71a804b4bce09531b55b1754ec6c4 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 14 Nov 2021 23:11:27 +0100 Subject: [PATCH 105/359] less: 590 -> 596 --- pkgs/tools/misc/less/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 9c5a4b1568be..3c64f4240ea8 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "less"; - version = "590"; + version = "596"; src = fetchurl { url = "https://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "044fl3izmsi8n1vqzsqdp65q0qyyn5kmsg4sk7id0mxzx15zbbba"; + sha256 = "sha256-QhqP1ZfnIELu/P6OV2NnerxL6EM/bA321zmhbMDk1cM="; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. From 5badc25f5839346bfaa9983855850891d7346fc8 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 14 Nov 2021 22:12:01 +0000 Subject: [PATCH 106/359] pcl: fix build on aarch64 --- pkgs/development/libraries/pcl/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index ee8f4dfe2e0a..8afcdbf33f23 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -32,6 +32,12 @@ stdenv.mkDerivation rec { sha256 = "0jhvciaw43y6iqqk7hyxnfhn1b4bsw5fpy04s01r5pkcsjjbdbqc"; }; + # remove attempt to prevent (x86/x87-specific) extended precision use + # when SSE not detected + postPatch = lib.optionalString (!(stdenv.isi686 || stdenv.isx86_64)) '' + sed -i '/-ffloat-store/d' cmake/pcl_find_sse.cmake + ''; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; buildInputs = [ eigen From d9a814f4e6842a00614f7857f57649244bae8279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 14 Nov 2021 16:35:14 -0600 Subject: [PATCH 107/359] =?UTF-8?q?android-studio-beta:=202021.1.1.15=20?= =?UTF-8?q?=E2=86=92=202021.1.1.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 600902f75b10..5a94abf2f7dd 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,8 +13,8 @@ let sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg"; }; betaVersion = { - version = "2021.1.1.15"; # "Android Studio Bumblebee (2021.1.1) Beta 2" - sha256Hash = "sha256-J+Jw9F8pEE0SMWka//jADOiQ+GSOeRf5GBfp0RDtwqA="; + version = "2021.1.1.16"; # "Android Studio Bumblebee (2021.1.1) Beta 3" + sha256Hash = "pgmBWzq/5RHJTc41kzB43tbsjvrWx9BJ7UKsR8AO0V4="; }; latestVersion = { # canary & dev version = "2021.2.1.3"; # "Android Studio Chipmunk (2021.2.1) Canary 3" From 827693bec4cf758b75dd35993263494cfbb9d6fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 23:17:07 +0000 Subject: [PATCH 108/359] python38Packages.kombu: 5.1.0 -> 5.2.1 --- pkgs/development/python-modules/kombu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 3ba2291da792..53b83fe95755 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.1.0"; + version = "5.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "01481d99f4606f6939cdc9b637264ed353ee9e3e4f62cfb582324142c41a572d"; + sha256 = "f262a2adc71b53e5b7dad4933bbdee65d8766ca4df6a9043b13edaad2144aaec"; }; propagatedBuildInputs = [ From bf78db4e39853cbcc7391a3258d144d6bae50c9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 23:31:37 +0000 Subject: [PATCH 109/359] python38Packages.libcloud: 3.3.1 -> 3.4.0 --- pkgs/development/python-modules/libcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 78afad13dd20..eacc05ffd144 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.3.1"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"; + sha256 = "17618ccbe3493f2be015db9e1efa35080ff34d470de723f1384d908ff126e51c"; }; checkInputs = [ mock pytest pytest-runner requests-mock ]; From 0e590c91d20efb1be7978347a2d45940a1d2fc2e Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Wed, 10 Nov 2021 22:01:31 -0500 Subject: [PATCH 110/359] etc module: make `.text` and `.source` the same priority Before this change, one could set environment.etc.*.text and .source. .source would always take precedence, regardless of the priorities set. This change means that if, for instance, .text is set with mkForce but .source is set normally, the .text content will be the one to take effect. If they are set with the same priority they will conflict. --- nixos/modules/system/etc/etc.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 8f14f04a1f64..225a5683e79e 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -85,7 +85,7 @@ in ''; type = with types; attrsOf (submodule ( - { name, config, ... }: + { name, config, options, ... }: { options = { enable = mkOption { @@ -172,7 +172,9 @@ in target = mkDefault name; source = mkIf (config.text != null) ( let name' = "etc-" + baseNameOf name; - in mkDefault (pkgs.writeText name' config.text)); + in mkOverride + (options.text.highestPrio or lib.modules.defaultPriority) + (pkgs.writeText name' config.text)); }; })); From 2b84e72fc646ac6d715024bc64e221d7021d5e35 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 15 Nov 2021 00:55:03 +0100 Subject: [PATCH 111/359] mapnik: fix build by using proj 7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Robert Schütz --- pkgs/top-level/all-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee2d656c8bcf..f86e0876e9f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18490,7 +18490,15 @@ with pkgs; opencl-clang = callPackage ../development/libraries/opencl-clang { }; - mapnik = callPackage ../development/libraries/mapnik { }; + mapnik = callPackage ../development/libraries/mapnik { + gdal = gdal.override { + libgeotiff = libgeotiff.override { proj = proj_7; }; + libspatialite = libspatialite.override { proj = proj_7; }; + proj = proj_7; + }; + proj = proj_7; + }; + marisa = callPackage ../development/libraries/marisa {}; From c98ae967d35f23d3598d0ff1399eb7d9b07545ad Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 15 Nov 2021 00:59:16 +0100 Subject: [PATCH 112/359] mapnik: add erictapen as maintainer --- pkgs/development/libraries/mapnik/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 6fff0c1e1bbc..14eb3c047e2a 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open source toolkit for developing mapping applications"; homepage = "https://mapnik.org"; - maintainers = with maintainers; [ hrdinka ]; + maintainers = with maintainers; [ hrdinka erictapen ]; license = licenses.lgpl21; platforms = platforms.all; # https://github.com/mapnik/mapnik/issues/4232 From ebee81f3c7ed694a59b49cc14330a293458af9f9 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 15 Nov 2021 00:59:52 +0100 Subject: [PATCH 113/359] python3Packages.python-mapnik: add erictapen as maintainer --- pkgs/development/python-modules/python-mapnik/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 3a4e4af54def..2d888518ff45 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for Mapnik"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ erictapen ]; homepage = "https://mapnik.org"; license = licenses.lgpl21; }; From a53521b536daa74fe4f52549d65eb8715ff843b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 00:12:18 +0000 Subject: [PATCH 114/359] python38Packages.mne-python: 0.23.4 -> 0.24.0 --- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 8e17eacbf7b5..c9d8833e8ec9 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.23.4"; + version = "0.24.0"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "1kik52ssa6difkqz8xnvrcbpp4p7792hj1rcgyypb4q7sc048aqy"; + sha256 = "1982y54n7q9pl28haca0vx6cjrk2a8cj24piaj8j31f09rynn8k0"; }; propagatedBuildInputs = [ numpy scipy ]; From 7cca177876ea4e9668e64dfe192b000ea303c727 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 00:25:10 +0000 Subject: [PATCH 115/359] python38Packages.multitasking: 0.0.9 -> 0.0.10 --- pkgs/development/python-modules/multitasking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multitasking/default.nix b/pkgs/development/python-modules/multitasking/default.nix index 8ea4d633f662..2784a0d2e2ee 100644 --- a/pkgs/development/python-modules/multitasking/default.nix +++ b/pkgs/development/python-modules/multitasking/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "multitasking"; - version = "0.0.9"; + version = "0.0.10"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "b59d99f709d2e17d60ccaa2be09771b6e9ed9391c63f083c0701e724f624d2e0"; + sha256 = "810640fa6670be41f4a712b287d9307a14ad849d966f06a17d2cf1593b66c3cd"; }; doCheck = false; # No tests included From b004c68f5698fc255a6f1df3d2fd76d24c432ed6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 00:57:10 +0000 Subject: [PATCH 116/359] python38Packages.ntc-templates: 2.3.2 -> 3.0.0 --- pkgs/development/python-modules/ntc-templates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index d7b3db1f452a..9e8601dfd069 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "2.3.2"; + version = "3.0.0"; format = "pyproject"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "v${version}"; - sha256 = "0sga86ajbh3a8wsb7q5mxzxhlg4fds8pr33ybjgi1sda4bvp2dvp"; + sha256 = "0kijzmmvq2rw7ima19w7lyb2p26a5w52k70fzbkaqqw78qzw8178"; }; nativeBuildInputs = [ From 3f772a5f2baff61a263895c213fd7bf9819f0265 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Sun, 14 Nov 2021 14:12:02 -0800 Subject: [PATCH 117/359] qemu: add support for io_uring --- pkgs/applications/virtualization/qemu/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 48b83140e42c..d4d7054600c8 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -23,6 +23,7 @@ , libiscsiSupport ? true, libiscsi , smbdSupport ? false, samba , tpmSupport ? true +, uringSupport ? stdenv.isLinux, liburing , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly then (lib.optional stdenv.isx86_64 "i386-softmmu" @@ -77,7 +78,8 @@ stdenv.mkDerivation rec { ++ lib.optionals openGLSupport [ mesa epoxy libdrm ] ++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals libiscsiSupport [ libiscsi ] - ++ lib.optionals smbdSupport [ samba ]; + ++ lib.optionals smbdSupport [ samba ] + ++ lib.optionals uringSupport [ liburing ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build @@ -191,7 +193,8 @@ stdenv.mkDerivation rec { ++ lib.optional virglSupport "--enable-virglrenderer" ++ lib.optional tpmSupport "--enable-tpm" ++ lib.optional libiscsiSupport "--enable-libiscsi" - ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd"; + ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" + ++ lib.optional uringSupport "--enable-linux-io-uring"; doCheck = false; # tries to access /dev dontWrapGApps = true; From d73349bff0767392af829eedd85c6de3cbd4b498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 01:34:10 +0000 Subject: [PATCH 118/359] python38Packages.pdfkit: 0.6.1 -> 1.0.0 --- pkgs/development/python-modules/pdfkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix index 431f7f09796b..73d09c755ac5 100644 --- a/pkgs/development/python-modules/pdfkit/default.nix +++ b/pkgs/development/python-modules/pdfkit/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pdfkit"; - version = "0.6.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1lcc1njpjd2zadbljqsnkrvamschl6j099p4giz1jd6mg1ds67gg"; + sha256 = "992f821e1e18fc8a0e701ecae24b51a2d598296a180caee0a24c0af181da02a9"; }; # tests are not distributed From cd05ebecfbd1baf4ce4796dc6fb9e9ad6e820008 Mon Sep 17 00:00:00 2001 From: amfl Date: Mon, 15 Nov 2021 13:00:47 +1300 Subject: [PATCH 119/359] maintainers: add amfl --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4dbc5909a8f3..780ecaeebd2b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -603,6 +603,12 @@ fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5"; }]; }; + amfl = { + email = "amfl@none.none"; + github = "amfl"; + githubId = 382798; + name = "amfl"; + }; amiddelk = { email = "amiddelk@gmail.com"; github = "amiddelk"; From 6b23ea33ec800e54659715f7ec5ab3235b1cbdd2 Mon Sep 17 00:00:00 2001 From: amfl Date: Mon, 15 Nov 2021 11:58:14 +1300 Subject: [PATCH 120/359] gemget: init at 1.8.0 --- pkgs/tools/networking/gemget/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/networking/gemget/default.nix diff --git a/pkgs/tools/networking/gemget/default.nix b/pkgs/tools/networking/gemget/default.nix new file mode 100644 index 000000000000..e501172f75e5 --- /dev/null +++ b/pkgs/tools/networking/gemget/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gemget"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "makeworld-the-better-one"; + repo = pname; + rev = "v${version}"; + sha256 = "PmtIgxnzfLduNGTx8SNDky6juv+NTJ8Cr++SOCk/QNU="; + }; + + vendorSha256 = "sha256-Ep6HAJgurxFbA4L77z8V2ar06BBVWlAJS9VoSSUg27U="; + + meta = with lib; { + description = "Command line downloader for the Gemini protocol"; + homepage = "https://github.com/makeworld-the-better-one/gemget"; + license = licenses.mit; + maintainers = with maintainers; [ amfl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2feb163de09f..ef36a4c6de1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5432,6 +5432,8 @@ with pkgs; gelasio = callPackage ../data/fonts/gelasio { }; + gemget = callPackage ../tools/networking/gemget {}; + gen-oath-safe = callPackage ../tools/security/gen-oath-safe { }; genext2fs = callPackage ../tools/filesystems/genext2fs { }; From 65b23a7a302d18e609cf84bc5d2eb503eff154b0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Nov 2021 04:20:00 +0000 Subject: [PATCH 121/359] sqls: 0.2.19 -> 0.2.20 https://github.com/lighttiger2505/sqls/releases/tag/v0.2.20 --- pkgs/applications/misc/sqls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/applications/misc/sqls/default.nix index d3ecfcbde2b0..2c89d31df35a 100644 --- a/pkgs/applications/misc/sqls/default.nix +++ b/pkgs/applications/misc/sqls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sqls"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = pname; rev = "v${version}"; - sha256 = "1myypq9kdfbhl5h9h8d30a3pi89mix48wm1c38648ky9vhx0s4az"; + sha256 = "sha256-QYxiWxgzuD+JymlXlVmzZOtex70JC93VmWljAFQJMPQ="; }; - vendorSha256 = "13c7nv0anj260z34bd7w1hz0rkmsj9r1zz55qiwcr1vdgmvy84cz"; + vendorSha256 = "sha256-fo5g6anMcKqdzLG8KCJ/T4uTOp1Z5Du4EtCHYkLgUpo="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ]; From 15b7fa76711e138058fb77206b3c718e0631c16b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Nov 2021 04:20:00 +0000 Subject: [PATCH 122/359] python39Packages.normality: 2.1.3 -> 2.2.5 --- pkgs/development/python-modules/normality/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index ece47afad4e2..a91489f1aded 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "normality"; - version = "2.1.3"; + version = "2.2.5"; src = fetchFromGitHub { owner = "pudo"; repo = "normality"; rev = version; - sha256 = "WvpMs02vBGnCSPkxo6r6g4Di2fKkUr2SsBflTBxlhkU="; + sha256 = "n8Ycm5DeFItmMJTolazZKGIyN7CTg2ajDCwi/UqzVe8="; }; propagatedBuildInputs = [ From fee52c1bec3fef9b6d16f46afead438212885d01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 04:35:51 +0000 Subject: [PATCH 123/359] python38Packages.pyp: 0.3.4 -> 1.0.0 --- pkgs/development/python-modules/pyp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyp/default.nix b/pkgs/development/python-modules/pyp/default.nix index 4ef79bc90716..0b2ff25444a0 100644 --- a/pkgs/development/python-modules/pyp/default.nix +++ b/pkgs/development/python-modules/pyp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyp"; - version = "0.3.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hauntsaninja"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K9dGmvy4siurmhqwNfg1dT0TWc6tCSaxfPyaJkYM2Vw="; + sha256 = "09k7y77h7g4dg0x6lg9pn2ga9z7xiy4vlj15fj0991ffsi4ydqgm"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ From 94b137c851ba7b26d159d6b6f78c9849014739c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 04:44:03 +0000 Subject: [PATCH 124/359] python38Packages.pypresence: 4.2.0 -> 4.2.1 --- pkgs/development/python-modules/pypresence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix index 0fa188c0771a..c21692f7f2a9 100644 --- a/pkgs/development/python-modules/pypresence/default.nix +++ b/pkgs/development/python-modules/pypresence/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pypresence"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1c8r7yxih5zp46qb9anq5s91pw2wr7d9d0nzcfh4l42x10c8lqal"; + sha256 = "691daf98c8189fd216d988ebfc67779e0f664211512d9843f37ab0d51d4de066"; }; doCheck = false; # tests require internet connection From 5971d29609aef0fdaac9753b05c929d711dc03ad Mon Sep 17 00:00:00 2001 From: Alexander Bich Date: Mon, 15 Nov 2021 07:53:42 +0300 Subject: [PATCH 125/359] terraform-providers.cloudflare: 2.23.0 -> 3.4.0 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ffcc0b3d43b1..3023bb6c7ac1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -179,10 +179,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v2.23.0", - "sha256": "0cyw6lddw3pj5lqra78qn0nd16ffay86vc8sqa68grx7ik9jgn7l", - "vendorSha256": "19fdwif81lqp848jhawd09b0lalslrwadd519vsdw03v2wp4p962", - "version": "2.23.0" + "rev": "v3.4.0", + "sha256": "1w37wkpb785jfqq91piclcsrhy3idpbmwb90n5y7rkgmm37ij7ij", + "vendorSha256": "004pb5xnvisq3j113i6qfvnh1j06nkpkgzav3wb08k0bl19b6jks", + "version": "3.4.0" }, "cloudinit": { "owner": "hashicorp", From 04b69e480eb09ce75c0b41fcdc955dce93ed6b7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 05:06:01 +0000 Subject: [PATCH 126/359] python38Packages.pytelegrambotapi: 4.1.1 -> 4.2.0 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 6d1dca6b699f..4c1723edd8ef 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.1.1"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "cc8011ca05301653f2e5c2d02eadff0e882b611841a76f9e5b911994899df49e"; + sha256 = "05f85dacbcf0bdf2459698bab4325f3a699d1c04bc61581627d76d075c3d5488"; }; propagatedBuildInputs = [ requests ]; From 5ee42fa3f010c39e0f4c4115ccce87480451b8b0 Mon Sep 17 00:00:00 2001 From: Joel Date: Mon, 15 Nov 2021 15:38:28 +1000 Subject: [PATCH 127/359] apkeep: fix aarch64 build --- pkgs/tools/misc/apkeep/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index 53e49cc02ca2..4f6d4d983eb8 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -11,6 +11,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-YFs2AOMGp0WNrceK14AnigZdJl+UsQdUchpxaI7HSXw="; + prePatch = '' + rm .cargo/config.toml + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; From 12faa4aaf680b3618dc0ae8bb6aa75938a49dc6e Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Mon, 15 Nov 2021 07:38:14 +0100 Subject: [PATCH 128/359] visidata: 2.6.1 -> 2.7 --- pkgs/applications/misc/visidata/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index b1b92ebe2d3f..79a0758a2a5b 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -9,6 +9,7 @@ , openpyxl , xlrd , h5py +, odfpy , psycopg2 , pyshp , fonttools @@ -24,13 +25,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.6.1"; + version = "2.7"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1dmiy87x0yc0d594v3d3km13dl851mx7ym1vgh3bg91llg8ykg33"; + sha256 = "0b2h9vy0fch0bk0b33h8p4ssk3a25j67sfn0yvmxhbqjdmhlwv4h"; }; propagatedBuildInputs = [ @@ -60,6 +61,7 @@ buildPythonApplication rec { tabulate wcwidth zstandard + odfpy setuptools ] ++ lib.optionals withPcap [ dpkt dnslib ]; From 75322a3817a66dec05c677768b4b47b9359e1d71 Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Mon, 15 Nov 2021 01:58:37 -0500 Subject: [PATCH 129/359] pngcheck: enable building on darwin --- pkgs/tools/graphics/pngcheck/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 266b85c54c54..1d4379b7f8f2 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile.unx --replace "gcc" "clang" + ''; + makefile = "Makefile.unx"; makeFlags = [ "ZPATH=${zlib.static}/lib" ]; @@ -21,10 +25,10 @@ stdenv.mkDerivation rec { cp pngcheck $out/bin/pngcheck ''; - meta = { + meta = with lib; { homepage = "http://pmt.sourceforge.net/pngcrush"; description = "Verifies the integrity of PNG, JNG and MNG files"; - license = lib.licenses.free; - platforms = with lib.platforms; linux; + license = licenses.free; + platforms = with platforms; [ unix ]; }; } From d4fbff9d649a45ae847ff4016cae62d4a21c5d3a Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Mon, 15 Nov 2021 01:59:06 -0500 Subject: [PATCH 130/359] pngcheck: take ownership --- pkgs/tools/graphics/pngcheck/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 1d4379b7f8f2..a4680dff6f64 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "Verifies the integrity of PNG, JNG and MNG files"; license = licenses.free; platforms = with platforms; [ unix ]; + maintainers = with maintainers; [ starcraft66 ]; }; } From d30e64af0203999b7d4a2f2d7ea5ebdc324bf6eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 07:19:09 +0000 Subject: [PATCH 131/359] python38Packages.rebulk: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/rebulk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index f422934f02fb..570654dc7e15 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "025d191c11abf9174c6aff0006579624047d3371a654333c4bf7a4b421552cdc"; + sha256 = "809de3a97c68afa831f7101b10d316fe62e061dc9f7f67a44b7738128721173a"; }; # Some kind of trickery with imports that doesn't work. From 261f2073d8481ed799e06549a9228b6a71fbc489 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 15 Nov 2021 09:05:52 +0100 Subject: [PATCH 132/359] dbeaver: 21.2.4 -> 21.2.5 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index f7782d0a577c..65375172f405 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.2.4"; # When updating also update fetchedMavenDeps.sha256 + version = "21.2.5"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "BPcTj2YIGyP3g4qrQlDp13lziJwSUt0Zn00CayDku9g="; + sha256 = "bLZYwf6dtbzS0sWKfQQzv4NqRQZqLkJaT24eW3YOsdQ="; }; fetchedMavenDeps = stdenv.mkDerivation { From baeb944384d19a16c9d19bbd124195ab5a0938a7 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Mon, 15 Nov 2021 16:12:15 +0800 Subject: [PATCH 133/359] nixos/influxdb2: Add Hyperlink highlight for url. --- nixos/modules/services/databases/influxdb2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/influxdb2.nix b/nixos/modules/services/databases/influxdb2.nix index 01b9c4934847..15f008cbc6d6 100644 --- a/nixos/modules/services/databases/influxdb2.nix +++ b/nixos/modules/services/databases/influxdb2.nix @@ -17,7 +17,7 @@ in }; settings = mkOption { default = { }; - description = "configuration options for influxdb2, see https://docs.influxdata.com/influxdb/v2.0/reference/config-options for details."; + description = ''configuration options for influxdb2, see for details.''; type = format.type; }; }; From af5e7e66625adf15e2a0bf4150a4068acb70dd61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 09:50:19 +0100 Subject: [PATCH 134/359] python3Packages.ha-philipsjs: 2.7.5 -> 2.7.6 --- .../python-modules/ha-philipsjs/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index 14b60f551435..8bf2b5863f08 100644 --- a/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -12,14 +12,16 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "2.7.5"; + version = "2.7.6"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-CAYyVNVq1rZZ/AYOAE8bfd7f94+PlAsnFRdguparNtY="; + sha256 = "sha256-U5XigLFkpRoIXcFB4dpxi8pxqcmmb20sv9i9J70s0C0="; }; propagatedBuildInputs = [ @@ -34,7 +36,9 @@ buildPythonPackage rec { respx ]; - pythonImportsCheck = [ "haphilipsjs" ]; + pythonImportsCheck = [ + "haphilipsjs" + ]; meta = with lib; { description = "Python library to interact with Philips TVs with jointSPACE API"; From 00e6996f240221a1cbeb8b75312e0f6e4b7fe7f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 10:01:37 +0100 Subject: [PATCH 135/359] python3Packages.aiolookin: 0.0.3 -> 0.0.4 --- pkgs/development/python-modules/aiolookin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index a81c817e4e07..0af203d8fb7b 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiolookin"; - version = "0.0.3"; + version = "0.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ANMalko"; repo = pname; rev = "v${version}"; - sha256 = "15mdvrzvqpdvg9zkczzgzzc5v2ri3v5f17000mhxill1nhirxhqx"; + sha256 = "sha256-Kqys76c/9Mw3ETgF0N4rA9mz5DELwTMjAK38PPN8Ahs="; }; propagatedBuildInputs = [ From 82ae74264c446aa9a82025de0f79fcf1d276bc46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 10:04:33 +0100 Subject: [PATCH 136/359] python3Packages.frigidaire: 0.16 -> 0.17 --- pkgs/development/python-modules/frigidaire/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 7ec27a12db2d..fc268ba05a88 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.16"; + version = "0.17"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = pname; rev = version; - sha256 = "1yzwzvlxz28rhnwhwsn37v7l7fxikzr4j7m293db9452w340p0zl"; + sha256 = "sha256-R3OjZyQMUDu8+QPe9y2j1SoWi1b7z/OYWY4wFXGG3zA="; }; propagatedBuildInputs = [ @@ -34,7 +34,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "frigidaire" ]; + pythonImportsCheck = [ + "frigidaire" + ]; meta = with lib; { description = "Python API for the Frigidaire devices"; From e682fd7c83d16c35de979ecd419115c98a260601 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Nov 2021 09:20:52 +0000 Subject: [PATCH 137/359] steam: 1.0.0.72 -> 1.0.0.73 --- pkgs/games/steam/steam.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 74ee8778b393..fdc0058a2eee 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -2,7 +2,7 @@ let traceLog = "/tmp/steam-trace-dependencies.log"; - version = "1.0.0.72"; + version = "1.0.0.73"; in stdenv.mkDerivation { pname = "steam-original"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; - sha256 = "0l54ljnlnx289i1ssnss78251vyga726dnzsrhgnxwn1p1125m45"; + sha256 = "sha256-uVO6D1K8zGlq12lrIs7aTQEVnj1bk1P4wRUtkPWkNZE="; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; From fa9958a86caf674e20b380619409e5ebf4871ac7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 10:22:33 +0100 Subject: [PATCH 138/359] python3Packages.nettigo-air-monitor: 1.2.0 -> 1.2.1 --- .../python-modules/nettigo-air-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index ad591163f081..ede91e7df913 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-KPgBbYGbKpKEPMxywgRvJcSCEYSUQkiPEFqj+bB0g1s="; + sha256 = "sha256-hKEXTzJMSVBRDiqrN90/fETEhirwSWLdgRULRvlQjbY="; }; propagatedBuildInputs = [ From acdc53e9f62a82fccff541ba12ab0916a44dd942 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 09:32:19 +0000 Subject: [PATCH 139/359] python38Packages.statsmodels: 0.13.0 -> 0.13.1 --- pkgs/development/python-modules/statsmodels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 2be02376360f..173458a634b6 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.0"; + version = "0.13.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f2efc02011b7240a9e851acd76ab81150a07d35c97021cb0517887539a328f8a"; + sha256 = "006ec8d896d238873af8178d5475203844f2c391194ed8d42ddac37f5ff77a69"; }; nativeBuildInputs = [ cython ]; From 0603b9459f315163cb203e5227bafbfa0c517f05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 09:41:18 +0000 Subject: [PATCH 140/359] python38Packages.stripe: 2.61.0 -> 2.62.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 384d7e3902ed..a8c451ebf9a9 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.61.0"; + version = "2.62.0"; src = fetchPypi { inherit pname version; - sha256 = "8131addd3512a22c4c539dda2d869a8f488e06f1b02d1f3a5f0f4848fc56184e"; + sha256 = "1fb51d67a961ea889c5be324f020535ed511c6f483bd13a07f48f6e369fa8df0"; }; propagatedBuildInputs = [ requests ]; From f95c6d611200153e73bac4a4b4c91fa2d45b3709 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Fri, 12 Nov 2021 19:05:27 +0100 Subject: [PATCH 141/359] ceph-client: fix copy of python modules the site-packages content was wrongly copied, causing a .../site-packages/site-packages/... in the ceph-client packages. This renders thi ceph tool unusable. --- pkgs/tools/filesystems/ceph/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 04774e851b3e..eea867afdfc5 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -247,7 +247,7 @@ in rec { cp -r ${ceph}/bin/rbd-replay* $out/bin cp -r ${ceph}/sbin/mount.ceph $out/sbin cp -r ${ceph}/sbin/mount.fuse.ceph $out/sbin - cp -r ${ceph}/${sitePackages} $out/${sitePackages} + cp -r ${ceph}/${sitePackages}/* $out/${sitePackages} cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths substituteInPlace $out/bin/ceph --replace ${ceph} $out From fc960d3c0f4f2fade9a50faf08afaffbe313ef88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 09:44:58 +0000 Subject: [PATCH 142/359] python38Packages.striprtf: 0.0.15 -> 0.0.16 --- pkgs/development/python-modules/striprtf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index 18ca9313f035..efde42b51954 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.15"; + version = "0.0.16"; src = fetchPypi { inherit pname version; - sha256 = "1yvgnmds034z28mscff0amm0g47ni0753nshvrq2swdpipymiwz0"; + sha256 = "690387117f3341354fddd0957913158d1319c207755c0cc54a614f80248887b2"; }; meta = with lib; { From 5a6267150e6bd8ac6d514753b6efd298be43f526 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 09:52:45 +0000 Subject: [PATCH 143/359] python38Packages.sunpy: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 8101986f854f..d7ca6c23e4ce 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0DF+/lQpsQKO5omBKJAe3gBjQ6QQb50IdRSacIRL/JA="; + sha256 = "c8fcd3700d8f4b7880a669f28c44f784422da1dbfe59fb175f155703817695ed"; }; nativeBuildInputs = [ From 695241f2bc4d634ab03c1355e30e1f36e6b4c585 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 11:23:05 +0100 Subject: [PATCH 144/359] cpuid: 20211031 -> 20211114 --- pkgs/os-specific/linux/cpuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index a434501d5126..49c64c9378d3 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20211031"; + version = "20211114"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "13sxb2ar4gypiv0l87lr7hf3qjccwgsg1r92adv9jvrfxcv36pbn"; + sha256 = "1dz10d958hz7qbh77hxf2k6sc7y9nkvlmr2469hv6gwgqs6dq1vi"; }; # For pod2man during the build process. From 2f9a30b53a74d09116f5a5c6ec8cab05b1abd23d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 10:25:54 +0000 Subject: [PATCH 145/359] python38Packages.torchvision: 0.10.1 -> 0.11.1 --- pkgs/development/python-modules/torchvision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index d5b40471c7a5..d17eabb8c35b 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -24,13 +24,13 @@ let cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "v${version}"; - sha256 = "0dw4q4yf86wwkm38bpsjf0yfzai46icvaly861ymh5v9f90q60jw"; + sha256 = "05dg835mmpzf7k2jn101l7x7cnra1kldwbgf19zblym5lfn21zhf"; }; nativeBuildInputs = [ libpng ninja which ] From 25244353eab7b820a7326d85bf78043db4e01fdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 10:45:40 +0000 Subject: [PATCH 146/359] python38Packages.traits: 6.3.0 -> 6.3.2 --- pkgs/development/python-modules/traits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index d0c8f26f8aae..4e93f1369dd3 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "traits"; - version = "6.3.0"; + version = "6.3.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "770241df047feb9e3ed4c26a36c2468a5b754e6082a78eeb737f058bd45344f5"; + sha256 = "4520ef4a675181f38be4a5bab1b1d5472691597fe2cfe4faf91023e89407e2c6"; }; propagatedBuildInputs = [ numpy ]; From 4f0724e090826dcb67984feabce23b3d122d73d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 11:30:06 +0000 Subject: [PATCH 147/359] python38Packages.wcmatch: 8.2 -> 8.3 --- pkgs/development/python-modules/wcmatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index 0cc08a9bf2ce..55cb45b712c3 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.2"; + version = "8.3"; src = fetchPypi { inherit pname version; - sha256 = "4d54ddb506c90b5a5bba3a96a1cfb0bb07127909e19046a71d689ddfb18c3617"; + sha256 = "371072912398af61d1e4e78609e18801c6faecd3cb36c54c82556a60abc965db"; }; propagatedBuildInputs = [ bracex ]; From cfbf3b4da68631672f6734b02d4802f4278a514b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 11:39:26 +0000 Subject: [PATCH 148/359] python38Packages.west: 0.11.1 -> 0.12.0 --- pkgs/development/python-modules/west/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 680e37e7a8f5..1f9aad67f19d 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -3,14 +3,14 @@ }: buildPythonPackage rec { - version = "0.11.1"; + version = "0.12.0"; pname = "west"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "30771f3ec2a4281cd05c277a90f7dc94ded97d6dc1e1decdf4fe452dbbacc283"; + sha256 = "d7ce0d719fd218fee5983442fe93a33a21a6be6a736915a7ffbe75369714e9ce"; }; propagatedBuildInputs = [ From 931ab058daa7e4cd539533963f95e2bb0dbd41e6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 14 Nov 2021 09:30:06 +1000 Subject: [PATCH 149/359] miniserve: 0.17.0 -> 0.18.0 https://github.com/svenstaro/miniserve/releases/tag/v0.18.0 --- pkgs/tools/misc/miniserve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index b6d0bc9ede23..480201b88792 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-DqH/6Uu4L0fWbnGX8s3jCGwBgPE2PLIkS/dZIj+BA9Q="; + sha256 = "sha256-5rFxVk+D11Iqr0SP2VYdMEnFwijpxQT8e5EoK2PYtmQ="; }; - cargoSha256 = "sha256-LgdVO41e56DIRkky1aF0X80ixs7ZH93Qk9Yx67vkO9E="; + cargoSha256 = "sha256-40TJzhaD1bi/u8k472K89A51wKhm/XjBs13W6oU/06Q="; nativeBuildInputs = [ installShellFiles pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 0bef0c38f74372ca1794e800b8709b90558efba2 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Sun, 14 Nov 2021 09:57:54 -0500 Subject: [PATCH 150/359] lib.modules: add mkDerivedConfig mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b Create config definitions with the same priority as the definition of another option. This should be used for option definitions where one option sets the value of another as a convenience. For instance a config file could be set with a `text` or `source` option, where text translates to a `source` value using `mkDerivedConfig options.text (pkgs.writeText "filename.conf")`. It takes care of setting the right priority using `mkOverride`. --- lib/default.nix | 2 +- lib/modules.nix | 20 ++++++++++++++++++++ nixos/modules/system/etc/etc.nix | 5 ++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 5a85c5421172..68d73220fa9a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -119,7 +119,7 @@ let mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule - mkAliasOptionModule doRename; + mkAliasOptionModule mkDerivedConfig doRename; inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' diff --git a/lib/modules.nix b/lib/modules.nix index d9b4000e56bd..92ddc8c5bc70 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -956,6 +956,26 @@ rec { use = id; }; + /* mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b + + Create config definitions with the same priority as the definition of another option. + This should be used for option definitions where one option sets the value of another as a convenience. + For instance a config file could be set with a `text` or `source` option, where text translates to a `source` + value using `mkDerivedConfig options.text (pkgs.writeText "filename.conf")`. + + It takes care of setting the right priority using `mkOverride`. + */ + # TODO: make the module system error message include information about `opt` in + # error messages about conflicts. E.g. introduce a variation of `mkOverride` which + # adds extra location context to the definition object. This will allow context to be added + # to all messages that report option locations "this value was derived from + # which was defined in ". It can provide a trace of options that contributed + # to definitions. + mkDerivedConfig = opt: f: + mkOverride + (opt.highestPrio or defaultPriority) + (f opt.value); + doRename = { from, to, visible, warn, use, withPriority ? true }: { config, options, ... }: let diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 225a5683e79e..6cc8c341e6df 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -172,9 +172,8 @@ in target = mkDefault name; source = mkIf (config.text != null) ( let name' = "etc-" + baseNameOf name; - in mkOverride - (options.text.highestPrio or lib.modules.defaultPriority) - (pkgs.writeText name' config.text)); + in mkDerivedConfig options.text (pkgs.writeText name') + ); }; })); From ab79b9c94f6296e835450b1e807596d3924fa981 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 12:10:31 +0000 Subject: [PATCH 151/359] python38Packages.yfinance: 0.1.64 -> 0.1.66 --- 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 917fbf34d0c9..30b17f6897a9 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.64"; + version = "0.1.66"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "bde7ff6c04b7179881c15753460c600c4bd877dc9f33cdc98da68e7e1ebbc5a2"; + sha256 = "9ea6fd18319fd898a8428a4a3d67171812b54779e330ead4d4ed0c59eb311be5"; }; propagatedBuildInputs = [ From 930f8daa6530161913af24fedb20b50f0b7087ac Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Mon, 15 Nov 2021 07:14:12 -0500 Subject: [PATCH 152/359] ceres-solver: 2.0.0 split outputs, build dynamic, default with blas (#139268) Co-authored-by: Sandro --- .../libraries/ceres-solver/default.nix | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 794a09749c55..f5c000f2271e 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -1,10 +1,16 @@ -{ lib, stdenv -, eigen +{ lib +, stdenv +, fetchpatch , fetchurl +, blas , cmake +, eigen , gflags , glog +, suitesparse , runTests ? false +, enableStatic ? stdenv.hostPlatform.isStatic +, withBlas ? true }: # gflags is required to run tests @@ -19,9 +25,24 @@ stdenv.mkDerivation rec { sha256 = "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h"; }; + outputs = [ "out" "dev" ]; + + patches = [ + # Enable GNUInstallDirs, see: https://github.com/ceres-solver/ceres-solver/pull/706 + (fetchpatch { + url = "https://github.com/ceres-solver/ceres-solver/commit/4998c549396d36a491f1c0638fe57824a40bcb0d.patch"; + sha256 = "sha256-mF6Zh2fDVzg2kD4nI2dd9rp4NpvPErmwfdYo5JaBmCA="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optional runTests gflags; - propagatedBuildInputs = [ eigen glog ]; + propagatedBuildInputs = [ eigen glog ] + ++ lib.optionals withBlas [ blas suitesparse ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}" + ]; # The Basel BUILD file conflicts with the cmake build directory on # case-insensitive filesystems, eg. darwin. From e7d14125641c938f31bb7cad191edcb7f3bcb6df Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 15 Nov 2021 13:14:42 +0100 Subject: [PATCH 153/359] downonspot: init at unstable-2021-10-11 (#141494) Co-authored-by: Sandro --- pkgs/applications/misc/downonspot/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/misc/downonspot/default.nix diff --git a/pkgs/applications/misc/downonspot/default.nix b/pkgs/applications/misc/downonspot/default.nix new file mode 100644 index 000000000000..4764fc4d5e63 --- /dev/null +++ b/pkgs/applications/misc/downonspot/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, makeWrapper +, alsa-lib +, lame +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "downonspot"; + version = "unstable-2021-10-13"; + + src = fetchFromGitHub { + owner = "oSumAtrIX"; + repo = "DownOnSpot"; + rev = "9d78ea2acad4dfe653a895a1547ad0abe7c5b47a"; + sha256 = "03g99yx9sldcg3i6hvpdxyk70f09f8kfj3kh283vl09b1a2c477w"; + }; + + cargoSha256 = "0k200p6wgwb60ax1r8mjn3aq08zxpkqbfqpi3b25zi3xf83my44d"; + + # fixes: error: the option `Z` is only accepted on the nightly compiler + RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + openssl + alsa-lib + lame + ]; + + meta = with lib; { + description = "A Spotify downloader written in rust"; + homepage = "https://github.com/oSumAtrIX/DownOnSpot"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e86312d4c4b..b176e38afe28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4601,6 +4601,8 @@ with pkgs; dorkscout = callPackage ../tools/security/dorkscout { }; + downonspot = callPackage ../applications/misc/downonspot { }; + sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; slade = callPackage ../applications/misc/slade { From 23fc0c348d2934851dd75e9c23c66055d78f67aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 12:19:43 +0000 Subject: [PATCH 154/359] python38Packages.youtube-search-python: 1.4.9 -> 1.5.1 --- .../python-modules/youtube-search-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 8c1010552206..634ff5ec54e1 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.4.9"; + version = "1.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9c75540d41f6dcfd19f2f70fbe8346406e026a016aae56b87c207a0b4ff571e0"; + sha256 = "68c70e1b6a2ce5c2c0ee64ba9c63efc9ab6e6f8acb2f51e19d570b0287e61cc9"; }; propagatedBuildInputs = [ httpx ]; From 9283fc5384d862b21a26a19e7284e3390c7e1127 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 12:23:26 +0000 Subject: [PATCH 155/359] python38Packages.youtube-transcript-api: 0.4.1 -> 0.4.2 --- .../python-modules/youtube-transcript-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix index 6829df668b2f..cd40f800c1b4 100644 --- a/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "youtube-transcript-api"; - version = "0.4.1"; + version = "0.4.2"; # PyPI tarball is missing some test files src = fetchFromGitHub { owner = "jdepoix"; repo = "youtube-transcript-api"; rev = "v${version}"; - sha256 = "1gpk13j1n2bifwsg951gmrfnq8kfxjr15rq46dxn1bhyk9hr1zql"; + sha256 = "04x7mfp4q17w3n8dnklbxblz22496g7g4879nz0wzgijg3m6cwlp"; }; propagatedBuildInputs = [ requests ]; From d8caf2d2e7ddcfe56441b4eea51963f607b0f5ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 12:42:26 +0000 Subject: [PATCH 156/359] qbe: unstable-2021-10-28 -> unstable-2021-11-10 --- pkgs/development/compilers/qbe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index d58e9bf9b0cb..fd6dea1cb1d5 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "unstable-2021-10-28"; + version = "unstable-2021-11-10"; src = fetchgit { url = "git://c9x.me/qbe.git"; - rev = "0d68986b6f6aa046ab13776f39cc37b67b3477ba"; - sha256 = "sha256-K1XpVoJoY8QuUdP5rKnlAs4yTn5jhh9LKZjHalliNKs="; + rev = "b0f16dad64d14f36ffe235b2e9cca96aa3ce35ba"; + sha256 = "sha256-oPgr8PDxGNqIWxWsvVr9B8oN0Io/pUuzgIkZfY/qD+o="; }; makeFlags = [ "PREFIX=$(out)" ]; From 4862b748db650c02c00b59b364301de906431c23 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 08:04:07 -0500 Subject: [PATCH 157/359] stylua: 0.11.1 -> 0.11.2 --- pkgs/development/tools/stylua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 229cc9dd4d82..d0b7bbdca9db 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+5c8baeToaT4k/2VSK/XQki0NPsWTnS6Ap3NpWvj+yI="; + sha256 = "sha256-rdtFzHpOvv1uJBigJWenWyIZF/wpYP7iBW2FCsfq2d4="; }; - cargoSha256 = "sha256-uIcP5ZNb8K5pySw0Qq46hev9VUbq8XVqmzBBGPagUfE="; + cargoSha256 = "sha256-/4ZW1FIfK51ak2EIV6dYY3XpucPPR+OZySPWwcKP4v0="; cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] ++ lib.optionals luauSupport [ "--features" "luau" ]; From 16769bdede14bd5efab799e0985645a9a458ef24 Mon Sep 17 00:00:00 2001 From: milahu Date: Mon, 15 Nov 2021 14:30:42 +0100 Subject: [PATCH 158/359] python3Packages.slugid: init 2.0.0 (#141409) --- maintainers/maintainer-list.nix | 6 ++++ .../python-modules/slugid/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/slugid/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4dbc5909a8f3..b14431dbb7a4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7578,6 +7578,12 @@ fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22"; }]; }; + milahu = { + email = "milahu@gmail.com"; + github = "milahu"; + githubId = 12958815; + name = "Milan Hauth"; + }; milesbreslin = { email = "milesbreslin@gmail.com"; github = "milesbreslin"; diff --git a/pkgs/development/python-modules/slugid/default.nix b/pkgs/development/python-modules/slugid/default.nix new file mode 100644 index 000000000000..34f394bee302 --- /dev/null +++ b/pkgs/development/python-modules/slugid/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "slugid"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "taskcluster"; + repo = "slugid.py"; + rev = "v${version}"; + sha256 = "McBxGRi8KqVhe2Xez5k4G67R5wBCCoh41dRsTKW4xMA="; + }; + + doCheck = false; # has no tests + + pythonImportsCheck = [ + "slugid" + ]; + + meta = with lib; { + description = "URL-safe base64 UUID encoder for generating 22 character slugs"; + homepage = "https://github.com/taskcluster/slugid.py"; + license = licenses.mpl20; + maintainers = with maintainers; [ milahu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b540b14a8454..627fdbb039ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8635,6 +8635,8 @@ in { slowapi = callPackage ../development/python-modules/slowapi { }; + slugid = callPackage ../development/python-modules/slugid { }; + sly = callPackage ../development/python-modules/sly { }; smart-meter-texas = callPackage ../development/python-modules/smart-meter-texas { }; From ce6665dceef9873d1166afa2178b32a947591bf2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 08:43:08 -0500 Subject: [PATCH 159/359] lunatic: fix build --- pkgs/development/interpreters/lunatic/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index 39e8323e194c..c7c8a928ea8d 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -1,4 +1,4 @@ -{ cmake, fetchFromGitHub, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch, cmake }: rustPlatform.buildRustPackage rec { pname = "lunatic"; @@ -11,7 +11,17 @@ rustPlatform.buildRustPackage rec { sha256 = "1dz8v19jw9v55p3mz4932v6z24ihp6wk238n4d4lx9xj91mf3g6r"; }; - cargoSha256 = "1rkxl27l6ydmcq3flc6qbnd7zmpkfmyc86b8q4pi7dwhqnd5g70g"; + cargoPatches = [ + # NOTE: remove on next update + # update dependencies to resolve incompatibility with rust 1.56 + (fetchpatch { + name = "update-wasmtime.patch"; + url = "https://github.com/lunatic-solutions/lunatic/commit/cd8db51732712c19a8114db290882d1bb6b928c0.patch"; + sha256 = "sha256-eyoIOTqGSU/XNfF55FG+WrQPSMvt9L/S/KBsUQB5z1k="; + }) + ]; + + cargoSha256 = "sha256-yoG4gCk+nHE8pBqV6ND9NCegx4bxbdGEU5hY5JauloM="; nativeBuildInputs = [ cmake ]; From 79497a972a98f953b939fd8f21f61d6a92c533c7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 09:05:31 -0500 Subject: [PATCH 160/359] lunatic: mark broken on darwin --- pkgs/development/interpreters/lunatic/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index c7c8a928ea8d..de0c927567d1 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch, cmake }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch, cmake, stdenv }: rustPlatform.buildRustPackage rec { pname = "lunatic"; @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://lunatic.solutions"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; + broken = stdenv.isDarwin; }; } From 241c93fabe43e1220ce8aebb0b4219ffbb2b9b81 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Mon, 15 Nov 2021 15:13:48 +0100 Subject: [PATCH 161/359] nextcloud-client: remove caugner from maintainers --- pkgs/applications/networking/nextcloud-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index b7ff968f79bd..071f5adfd497 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -73,7 +73,7 @@ mkDerivation rec { description = "Nextcloud themed desktop client"; homepage = "https://nextcloud.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ caugner kranzes ]; + maintainers = with maintainers; [ kranzes ]; platforms = platforms.linux; }; } From 44be59afb9d8732c3d73690400bbd3f80ec03fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Nov 2021 15:22:03 +0100 Subject: [PATCH 162/359] netplan: remove default value from fetchFromGitHub, cleanup substituteInPlace --- pkgs/tools/admin/netplan/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/tools/admin/netplan/default.nix index 77f2ad26de1d..b298078aae35 100644 --- a/pkgs/tools/admin/netplan/default.nix +++ b/pkgs/tools/admin/netplan/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { repo = "netplan"; rev = version; hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE="; - fetchSubmodules = false; }; nativeBuildInputs = [ @@ -39,12 +38,14 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace netplan/cli/utils.py --replace "/lib/netplan/generate" "$out/lib/netplan/generate" - substituteInPlace netplan/cli/utils.py --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\"" + substituteInPlace netplan/cli/utils.py \ + --replace "/lib/netplan/generate" "$out/lib/netplan/generate" \ + --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\"" - substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \ - --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \ - --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= ' + substituteInPlace Makefile \ + --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \ + --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \ + --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= ' # from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81 sed -e "s/-Werror//g" -i Makefile From 83f892c511f0b647302d03af35955ba28d816073 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 15 Nov 2021 16:28:22 +0200 Subject: [PATCH 163/359] nixos/lib: add /usr to pathsNeededForBoot if /usr is split from root then it has to be mounted at boot See https://github.com/NixOS/nixpkgs/issues/146115 --- nixos/lib/utils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 439b627dc385..f1fa9f07a974 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -10,7 +10,7 @@ rec { # Check whenever fileSystem is needed for boot. NOTE: Make sure # pathsNeededForBoot is closed under the parent relationship, i.e. if /a/b/c # is in the list, put /a and /a/b in as well. - pathsNeededForBoot = [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/var/lib/nixos" "/etc" ]; + pathsNeededForBoot = [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/var/lib/nixos" "/etc" "/usr" ]; fsNeededForBoot = fs: fs.neededForBoot || elem fs.mountPoint pathsNeededForBoot; # Check whenever `b` depends on `a` as a fileSystem From 6f371f473782d518a2868484ef83572fcdc4d879 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Nov 2021 18:00:32 +0100 Subject: [PATCH 164/359] python3Packages.aiolyric: 1.0.7 -> 1.0.8 --- pkgs/development/python-modules/aiolyric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index 4c20e38d8cfe..44e532a6149d 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.7"; + version = "1.0.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3UyWUsamluJclwrQD+MuUPLhNJoNU4/8w1m92OLWyrg="; + sha256 = "sha256-A4EkqSIQ5p4E4DPLYu9a/lmb1sFhwDqFLhjhZS6Zf5c="; }; propagatedBuildInputs = [ aiohttp ]; From 09906e5682b7be64e2dae1a1dbd5214b3d8d1710 Mon Sep 17 00:00:00 2001 From: James Landrein Date: Mon, 15 Nov 2021 15:36:06 +0100 Subject: [PATCH 165/359] sonobuoy: 0.54.0 -> 0.55.0 --- pkgs/applications/networking/cluster/sonobuoy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index 13d15d0bf618..7f960931c100 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "08bb70f407d0334fa80b9dbc6850987f16eb27d3"; +let rev = "dc78b39a6ff0a1a94a29fa0fd72bcbe5d95004be"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.54.0"; # Do not forget to update `rev` above + version = "0.55.0"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-Gtpky+zkFKukIIHF91F4uBZjaguk8KlOEVhSwTj+ccs="; + sha256 = "sha256-fMZju0Cd1JtVC+EKHwW3ZGsB2m0V3UIHsKQMbvf4i5Y="; }; - vendorSha256 = "sha256-Lkwv95BZa7nFEXk1KcwXIRVpj9DZmqnWjkdrZkO/k24="; + vendorSha256 = "sha256-jPKCWTFABKRZCg6X5VVdrmOU/ZFc7yGD7R8RJrpcITg="; subPackages = [ "." ]; From 4bb0051feac526096a390d3ae5679043b0a37441 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 14:44:47 +0000 Subject: [PATCH 166/359] todoman: 4.0.0 -> 4.0.1 --- pkgs/applications/office/todoman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 8c7b4ee43842..0ec0f8e2fb02 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4c4d0c6533da8d553f3dd170c9c4ff3752eb11fd7177ee391414a39adfef60ad"; + sha256 = "ec88f8009321e77deb0ae682f7d036c139edf4175f8413011b532905c6e7d2b1"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From e5139adbdfc0a7053130521c30b84002955fe59b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Nov 2021 14:45:00 +0000 Subject: [PATCH 167/359] todoman: enable on darwin --- pkgs/applications/office/todoman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 0ec0f8e2fb02..f1740b326dcf 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -90,8 +90,8 @@ buildPythonApplication rec { Todoman is part of the pimutils project ''; + changelog = "https://github.com/pimutils/todoman/raw/v${version}/CHANGELOG.rst"; license = licenses.isc; maintainers = with maintainers; [ leenaars ]; - platforms = platforms.linux; }; } From 0aa439baee0284e1a600a6e8cc8829ebdb7d6f1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 15:01:57 +0000 Subject: [PATCH 168/359] vimwiki-markdown: 0.3.3 -> 0.4.0 --- pkgs/tools/misc/vimwiki-markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix index 18adf99b9c99..3375b86df0fc 100644 --- a/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -6,12 +6,12 @@ }: buildPythonApplication rec { - version = "0.3.3"; + version = "0.4.0"; pname = "vimwiki-markdown"; src = fetchPypi { inherit version pname; - sha256 = "ee4ef08f7e4df27f67ffebb5fa413a7cf4fad967a248c1c75d48b00122a5b945"; + sha256 = "e898c58fa6ecbb7474738d79c44db2b6ab3adfa958bffe80089194c2a70b1ec0"; }; propagatedBuildInputs= [ From 510cbfbec737589d63cf7a5fc9957bfb8d475747 Mon Sep 17 00:00:00 2001 From: "Neubauer, Sebastian" Date: Mon, 15 Nov 2021 16:02:41 +0100 Subject: [PATCH 169/359] typos: 1.2.0 -> 1.3.0 --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index f2fda08e8d4d..c5545633bb4e 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7L+hRr+/sphH4fq4vX7lI9KR6Tks1uLveSJ/wLqO1Ek="; + sha256 = "Y+sIyueLdREoq/NR6LwppyhWxB8s0iBjdFaDUSKnlRw="; }; - cargoSha256 = "sha256-AxhFQxtT3PfG3Y9nJlp8n4HjaOXxs9KDPY9Ha5Lr4VE="; + cargoSha256 = "3oqmiHH9QU8uHs9q2CgE0uTvfyaRxV3rFBxkXxC5/Tw="; meta = with lib; { description = "Source code spell checker"; From 383cef41ed7fa97078e06c390c2abce0b5673313 Mon Sep 17 00:00:00 2001 From: James Landrein Date: Mon, 15 Nov 2021 16:07:03 +0100 Subject: [PATCH 170/359] tea: 0.7.1 -> 0.8.0 --- pkgs/tools/misc/tea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/tools/misc/tea/default.nix index c968b57c60ad..5ff739c46ba5 100644 --- a/pkgs/tools/misc/tea/default.nix +++ b/pkgs/tools/misc/tea/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tea"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "tea"; rev = "v${version}"; - sha256 = "sha256-Y/Znj8vVjVt+rs+n8JRQsptq5u17G2D7r98PDxPLyd4="; + sha256 = "sha256-LtLel6JfmYr2Zu7g7oBjAqDcl5y7tJL3XGL7gw+kHxU="; }; vendorSha256 = null; From b608867a248c62f4ba6b9ef402ac33784bf3b418 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 15:18:27 +0000 Subject: [PATCH 171/359] xterm: 369 -> 370 --- pkgs/applications/terminal-emulators/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 4bb9386a112a..738260646f20 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "369"; + version = "370"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "ce1qSNBkiT0hSXQaACeBqXNJb9JNUtrdNk9jQ5p2TiY="; + sha256 = "ljxdhAoPD0wHf/KEWG6LH4Pz+YPcpvdPSzYZdbU4jII="; }; strictDeps = true; From f8a8ed3a2bf2f0b6011e75bdad5098c96658397e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 16:28:36 +0100 Subject: [PATCH 172/359] python3Packages.total-connect-client: 2021.11.2 -> 2021.11.4 --- .../python-modules/total-connect-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index fea974adfdee..bcf4910b0d44 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2021.11.2"; + version = "2021.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - sha256 = "sha256-JXau+NmulnZ0gg2XsXD9EFv3j2FBMqVqzpT1XGvMZuA="; + sha256 = "sha256-iggxKefrVZP4ljf8jGRrCAq0/xQLsr54L42KkdjBqgI="; }; propagatedBuildInputs = [ From 42f9ae293426c44a4a58f528670b1d92c3028c2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 15:29:33 +0000 Subject: [PATCH 173/359] you-get: 0.4.1545 -> 0.4.1555 --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index dd2115f99bff..bfd51a35fa78 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1545"; + version = "0.4.1555"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "63e9b0527424c565303fe3d8ede1cd35d48a4ecf4afe72e1c12b0e90b9fdcd39"; + sha256 = "99282aca720c7ee1d9ef4b63bbbd226e906ea170b789a459fafd5b0627b0b15f"; }; meta = with lib; { From 54523e57b4a20f6fc814469eb29d7dd8343cb043 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Nov 2021 15:30:00 +0000 Subject: [PATCH 174/359] you-get: install completions --- pkgs/tools/misc/you-get/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index bfd51a35fa78..a08fdcb1dd2c 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchPypi }: +{ lib, buildPythonApplication, fetchPypi, installShellFiles }: buildPythonApplication rec { pname = "you-get"; @@ -13,11 +13,20 @@ buildPythonApplication rec { sha256 = "99282aca720c7ee1d9ef4b63bbbd226e906ea170b789a459fafd5b0627b0b15f"; }; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd you-get \ + --zsh contrib/completion/_you-get \ + --fish contrib/completion/you-get.fish \ + --bash contrib/completion/you-get-completion.bash + ''; + meta = with lib; { description = "A tiny command line utility to download media contents from the web"; homepage = "https://you-get.org"; + changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ryneeverett ]; - platforms = platforms.all; }; } From 4e7dda04ccc1e93658abcfafcd4a911bc093336e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 14:57:11 +0000 Subject: [PATCH 175/359] vala_0_52: 0.52.6 -> 0.52.7 --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index ba9abc0def1d..32c9e6f2290a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -129,8 +129,8 @@ in rec { }; vala_0_52 = generic { - version = "0.52.6"; - sha256 = "sha256-FNfrTZZLfDrcFuRTcTIIbdxmJO0eDruBEeKsgierOnI="; + version = "0.52.7"; + sha256 = "sha256-C7WptPbRdUmewKWAJK3ANapRcAgPUzwo2cNY0aMsU2o="; }; vala_0_54 = generic { From dcb04673070a9efe38c45ff4bbf9e3feabc24253 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 15:33:15 +0000 Subject: [PATCH 176/359] ytcc: 2.5.2 -> 2.5.3 --- pkgs/tools/networking/ytcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 7b6104e25fc3..9062caa11d58 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "0xpinilb8rnha35laxq076p6v7hdis6davr9ckm5xycs3m4aj7s8"; + sha256 = "1skhg8ca2bjjfi02pjsi3w7v3f4xhzg7bqyy0cajxsymzqzqp7lm"; }; postPatch = '' From 4bfbd0af14c20ca48eb6a01ed2689103945970f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 15 Nov 2021 16:25:06 +0100 Subject: [PATCH 177/359] python3.pkgs.nbclient: remove entry point that is already defined in the jupyter_client package. Fixes https://github.com/NixOS/nixpkgs/issues/145968 --- pkgs/development/python-modules/nbclient/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index b6cfbc51cac0..caf98c420602 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -18,6 +18,13 @@ buildPythonPackage rec { checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; + postFixup = '' + # Remove until fixed by upstream + # https://github.com/jupyter/nbclient/pull/173#issuecomment-968760082 + rm $out/bin/.jupyter-run-wrapped + rm $out/bin/jupyter-run + ''; + meta = with lib; { homepage = "https://github.com/jupyter/nbclient"; description = "A client library for executing notebooks"; From 2a9912242d94a2973f93322d55934caeab23e2d3 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 15 Nov 2021 10:53:39 -0500 Subject: [PATCH 178/359] meslo-lgs-nf: 2020-03-22 -> 2021-09-03 --- pkgs/data/fonts/meslo-lgs-nf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/meslo-lgs-nf/default.nix b/pkgs/data/fonts/meslo-lgs-nf/default.nix index 305bd69f2dae..4d56af449cc2 100644 --- a/pkgs/data/fonts/meslo-lgs-nf/default.nix +++ b/pkgs/data/fonts/meslo-lgs-nf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "meslo-lgs-nf"; - version = "2020-03-22"; + version = "2021-09-03"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k-media"; - rev = "32c7d40239c93507277f14522be90b5750f442c9"; - sha256 = "10hq4whai1rqj495w4n80p0y21am8rihm4rc40xq7241d6dzilrd"; + rev = "389133fb8c9a2347929a23702ce3039aacc46c3d"; + sha256 = "sha256-dWqRxjqsa/Tiv0Ww8VLHRDhftD3eqa1t2/T0irFeMFI="; }; installPhase = '' From f8bbc587eb2dbd1e7168b59cd0bb0d5aef89d2da Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Mon, 8 Nov 2021 17:29:22 +0100 Subject: [PATCH 179/359] elan: wrap embedded linker --- .../0001-dynamically-patchelf-binaries.patch | 43 ++++++++----------- .../science/logic/elan/default.nix | 14 ++---- 2 files changed, 23 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch index 48b1263e7961..dc76305bd749 100644 --- a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch @@ -1,24 +1,19 @@ diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs -index c51e76d..d0a26d7 100644 +index c51e76d..ae8159e 100644 --- a/src/elan-dist/src/component/package.rs +++ b/src/elan-dist/src/component/package.rs -@@ -56,11 +56,35 @@ fn unpack_without_first_dir(archive: &mut tar::Archive, path: &Path) +@@ -56,6 +56,30 @@ fn unpack_without_first_dir(archive: &mut tar::Archive, path: &Path) entry .unpack(&full_path) .chain_err(|| ErrorKind::ExtractingPackage)?; -+ nix_patchelf_if_needed(&full_path); - } - - Ok(()) - } - -+fn nix_patchelf_if_needed(dest_path: &Path) { -+ let (is_bin, is_lib) = if let Some(p) = dest_path.parent() { -+ (p.ends_with("bin"), p.ends_with("lib")) -+ } else { -+ (false, false) -+ }; ++ nix_patch_if_needed(&full_path)?; ++ } + ++ Ok(()) ++} ++ ++fn nix_patch_if_needed(dest_path: &Path) -> Result<()> { ++ let is_bin = matches!(dest_path.parent(), Some(p) if p.ends_with("bin")); + if is_bin { + let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") + .arg("--set-interpreter") @@ -26,15 +21,15 @@ index c51e76d..d0a26d7 100644 + .arg(dest_path) + .output(); + } -+ else if is_lib { -+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") -+ .arg("--set-rpath") -+ .arg("@libPath@") -+ .arg(dest_path) -+ .output(); -+ } -+} + - #[derive(Debug)] - pub struct ZipPackage<'a>(temp::Dir<'a>); ++ if dest_path.extension() == Some(::std::ffi::OsStr::new("lld")) { ++ use std::os::unix::fs::PermissionsExt; ++ let new_path = dest_path.with_extension("orig"); ++ ::std::fs::rename(dest_path, &new_path)?; ++ ::std::fs::write(dest_path, format!(r#"#! @shell@ ++exec -a "$0" {} "$@" --dynamic-linker=@dynamicLinker@ ++"#, new_path.to_str().unwrap()))?; ++ ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?; + } + Ok(()) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index a5709b69fbb8..cc4f0680de3e 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,9 +1,5 @@ -{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl -, openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }: - -let - libPath = lib.makeLibraryPath [ gmp ]; -in +{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell +, openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }: rustPlatform.buildRustPackage rec { pname = "elan"; @@ -32,13 +28,13 @@ rustPlatform.buildRustPackage rec { (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; patchelf = patchelf; - libPath = "$ORIGIN/../lib:${libPath}"; + shell = runtimeShell; } '' export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ --subst-var patchelf \ --subst-var dynamicLinker \ - --subst-var libPath + --subst-var shell '') ]; @@ -50,8 +46,6 @@ rustPlatform.buildRustPackage rec { done popd - wrapProgram $out/bin/elan --prefix "LD_LIBRARY_PATH" : "${libPath}" - # tries to create .elan export HOME=$(mktemp -d) mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} From f74c838dbff7c8e508513af86c6e640aaa481eb0 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Mon, 15 Nov 2021 17:12:36 +0100 Subject: [PATCH 180/359] ceph-client: install sbin binaries into bin, link sbin to bin --- pkgs/tools/filesystems/ceph/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index eea867afdfc5..913367084ed2 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -241,12 +241,13 @@ in rec { ceph-client = runCommand "ceph-client-${version}" { meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices/Cephfs"; } '' - mkdir -p $out/{bin,sbin,etc,${sitePackages},share/bash-completion/completions} + mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions} cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin cp -r ${ceph}/bin/rbd-replay* $out/bin - cp -r ${ceph}/sbin/mount.ceph $out/sbin - cp -r ${ceph}/sbin/mount.fuse.ceph $out/sbin + cp -r ${ceph}/sbin/mount.ceph $out/bin + cp -r ${ceph}/sbin/mount.fuse.ceph $out/bin + ln -s bin $out/sbin cp -r ${ceph}/${sitePackages}/* $out/${sitePackages} cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths From 75a643d9773e5416d48168d88a15689a72ed52fd Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Mon, 15 Nov 2021 17:13:35 +0100 Subject: [PATCH 181/359] qownnotes: 21.10.9 -> 21.11.4 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 1bd29b06d9b9..dfaec8690228 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "21.10.9"; + version = "21.11.4"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "2c86d66ae427bdcd16d706b982cedaa669a27340f7819fc97a8e2b24c709e74f"; + sha256 = "3eb025873160cecd4fa35ae5079c150d4aa5dd3152fd58c5e216b592af43e8dc"; }; nativeBuildInputs = [ qmake qttools ]; From 621109350df973691eec50ba7ad5b022f56c0aab Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 12:26:09 -0500 Subject: [PATCH 182/359] hck: 0.6.6 -> 0.6.7 --- pkgs/tools/text/hck/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/tools/text/hck/default.nix index 00ab04a56c66..88ad2308913a 100644 --- a/pkgs/tools/text/hck/default.nix +++ b/pkgs/tools/text/hck/default.nix @@ -3,27 +3,26 @@ , fetchFromGitHub , cmake , stdenv -, libiconv , CoreFoundation , Security }: rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DUFJZEtJM5Sv41zJvSZ8KsNWFzlictM2T1wS7VxPL04="; + sha256 = "sha256-m4YVz3kh4nOkdf6PbbyxjKacUVKdFQet76CMrFYMRHI="; }; - cargoSha256 = "sha256-kubQL+p7J2koPDOje5wMxKDeCY4yi0kupfHsJCKYf44="; + cargoSha256 = "sha256-4z1kHSev+5+0wpYFEGvvafB50Wz1wr6zObCjvHR9FPU="; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; meta = with lib; { description = "A close to drop in replacement for cut that can use a regex delimiter instead of a fixed string"; From d635496f3a3fe33e290bed733a6579aadf611d00 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 15 Nov 2021 18:27:25 +0100 Subject: [PATCH 183/359] grafana: 8.2.3 -> 8.2.4, fix CVE-2021-41244 (#146164) ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.2.4 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 1ebac5327339..9c36a023b460 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGo117Module rec { pname = "grafana"; - version = "8.2.3"; + version = "8.2.4"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGo117Module rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-GC4pHwthsXu/+dXb1cBk5bC0O6NnyiChC+UWleq7JzA="; + sha256 = "sha256-dOV22xwdNLt0TnONzyDw0skGKuAYmiHafhFwhtRMN5M="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-LOswYw0P3dy6arrmUbnzBU0ie2YcPtk6xqtp9CowG2s="; + sha256 = "sha256-nfHUpAnFc2lDGAoHB1fJjF08ndfNlaMJAlsMH+TJNy0="; }; - vendorSha256 = "sha256-yZbdUiuRNFRaXduOYps5ygiaUgvNXw+Ah4wZrfYcJlY="; + vendorSha256 = "sha256-VvmSNSChbxeLWEQDE4JPfoZckQZ7nG7ElupNCc175Fk="; nativeBuildInputs = [ wire ]; From ee8e993fd430ed80b1ea58b1b9b396270ade09a1 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Mon, 20 Sep 2021 20:38:35 +0200 Subject: [PATCH 184/359] modules/nix-daemon: Replace daemon(IO)NiceLevel options The nix.daemonNiceLevel options allows for setting the nice level of the Nix daemon process. On a modern Linux kernel with group scheduling the nice level only affects threads relative to other threads in the same task group (see sched(7)). Therefore this option has not the effect one might expect. The options daemonCPUSchedPolicy and daemonIOSchedClass are introduced and the daemonIONiceLevel option renamed to daemonIOSchedPrority for consistency. These options allow for more effective control over CPU and I/O scheduling. Instead of setting daemonNiceLevel to a high value to increase the responsiveness of an interactive system during builds -- which would not have the desired effect, as described above -- one could set both daemonCPUSchedPolicy and daemonIOSchedClass to idle. --- nixos/modules/services/misc/nix-daemon.nix | 64 ++++++++++++++-------- 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index d04937004777..4ea45888e5fc 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -184,34 +184,51 @@ in ''; }; - daemonNiceLevel = mkOption { - type = types.int; - default = 0; + daemonCPUSchedPolicy = mkOption { + type = types.enum ["other" "batch" "idle"]; + default = "other"; + example = "batch"; description = '' - Nix daemon process priority. This priority propagates to build processes. - 0 is the default Unix process priority, 19 is the lowest. Note that nix - bypasses nix-daemon when running as root and this option does not have - any effect in such a case. + Nix daemon process CPU scheduling policy. This policy propagates to + build processes. other is the default scheduling policy for regular + tasks. The batch policy is similar to other, but optimised for + non-interactive tasks. idle is for extremely low-priority tasks + that should only be run when no other task requires CPU time. - Please note that if used on a recent Linux kernel with group scheduling, - setting the nice level will only have an effect relative to other threads - in the same task group. Therefore this option is only useful if - autogrouping has been disabled (see the kernel.sched_autogroup_enabled - sysctl) and no systemd unit uses any of the per-service CPU accounting - features of systemd. Otherwise the Nix daemon process may be placed in a - separate task group and the nice level setting will have no effect. - Refer to the man pages sched(7) and systemd.resource-control(5) for - details. - ''; + Please note that while using the idle policy may greatly improve + responsiveness of a system performing expensive builds, it may also + slow down and potentially starve crucial configuration updates + during load. + ''; }; - daemonIONiceLevel = mkOption { + daemonIOSchedClass = mkOption { + type = types.enum ["best-effort" "idle"]; + default = "best-effort"; + example = "idle"; + description = '' + Nix daemon process I/O scheduling class. This class propagates to + build processes. best-effort is the default class for regular tasks. + The idle class is for extremely low-priority tasks that should only + perform I/O when no other task does. + + Please note that while using the idle scheduling class can improve + responsiveness of a system performing expensive builds, it might also + slow down or starve crucial configuration updates during load. + ''; + }; + + daemonIOSchedPriority = mkOption { type = types.int; default = 0; + example = 1; description = '' - Nix daemon process I/O priority. This priority propagates to build processes. - 0 is the default Unix process I/O priority, 7 is the lowest. - ''; + Nix daemon process I/O scheduling priority. This priority propagates + to build processes. The supported priorities depend on the + scheduling policy: With idle, priorities are not used in scheduling + decisions. best-effort supports values in the range 0 (high) to 7 + (low). + ''; }; buildMachines = mkOption { @@ -587,8 +604,9 @@ in unitConfig.RequiresMountsFor = "/nix/store"; serviceConfig = - { Nice = cfg.daemonNiceLevel; - IOSchedulingPriority = cfg.daemonIONiceLevel; + { CPUSchedulingPolicy = cfg.daemonCPUSchedPolicy; + IOSchedulingClass = cfg.daemonIOSchedClass; + IOSchedulingPriority = cfg.daemonIOSchedPriority; LimitNOFILE = 4096; }; From aeaafd1502d562a12c57f780a460307629543e00 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sun, 17 Oct 2021 12:27:56 +0200 Subject: [PATCH 185/359] doc: Explain daemon(IO)NiceLevel removal in release note --- .../from_md/release-notes/rl-2111.section.xml | 15 +++++++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ 2 files changed, 17 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 0f974705558d..0aa30c2b1fec 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 @@ -1298,6 +1298,21 @@ Superuser created successfully. would be parsed as 3 parameters. + + + nix.daemonNiceLevel and + nix.daemonIONiceLevel have been removed in + favour of the new options + nix.daemonCPUSchedPolicy, + nix.daemonIOSchedClass + and + nix.daemonIOSchedPriority. + Please refer to the options documentation and the + sched(7) and + ioprio_set(2) man pages for guidance on how + to use them. + + The coursier package’s binary was renamed diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index eeaff0eeda4b..0eb7bf74197c 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -388,6 +388,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `boot.kernelParams` now only accepts one command line parameter per string. This change is aimed to reduce common mistakes like "param = 12", which would be parsed as 3 parameters. +- `nix.daemonNiceLevel` and `nix.daemonIONiceLevel` have been removed in favour of the new options [`nix.daemonCPUSchedPolicy`](options.html#opt-nix.daemonCPUSchedPolicy), [`nix.daemonIOSchedClass`](options.html#opt-nix.daemonIOSchedClass) and [`nix.daemonIOSchedPriority`](options.html#opt-nix.daemonIOSchedPriority). Please refer to the options documentation and the `sched(7)` and `ioprio_set(2)` man pages for guidance on how to use them. + - The `coursier` package's binary was renamed from `coursier` to `cs`. Completions which haven't worked for a while should now work with the renamed binary. To keep using `coursier`, you can create a shell alias. - The `services.mosquitto` module has been rewritten to support multiple listeners and per-listener configuration. From b0657ddc91101c625d2cba64b6b3d22350062f39 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 11 Nov 2021 15:48:28 +0100 Subject: [PATCH 186/359] flex-ndax: 0.1-20210714.0 -> 0.2-20211111.0 --- pkgs/applications/radio/flex-ndax/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index 4d27907cdd18..8be72ef3d6b5 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "flex-ndax"; - version = "0.1-20210714.0"; + version = "0.2-20211111.0"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nDAX"; rev = "v${version}"; - sha256 = "16zx6kbax59rcxyz9dhq7m8yx214knz3xayna1gzb85m6maly8v8"; + sha256 = "0m2hphj0qvgq25pfm3s76naf672ll43jv7gll8cfs7276ckg1904"; }; buildInputs = [ pulseaudio ]; - vendorSha256 = "0qn8vg84j9kp0ycn24lkaqjnnk339j3vis4bn48ia3z5vfc22gi5"; + vendorSha256 = "1bf0iidb8ggzahy3fvxispf3g940mv6vj9wqd8i3rldc6ca2i3pf"; meta = with lib; { homepage = "https://github.com/kc2g-flex-tools/nDAX"; From e7b0920211addd5ff840cfd5a8399859731acaac Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Sat, 6 Nov 2021 20:01:58 +0100 Subject: [PATCH 187/359] reveal-md: init at 5.2.0 Signed-off-by: Mark Sagi-Kazar --- pkgs/development/node-packages/default.nix | 13 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 466 ++++++++++++++++-- pkgs/top-level/all-packages.nix | 2 + 4 files changed, 446 insertions(+), 36 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 4c72f1527aaf..ea5ab3eadae8 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -340,6 +340,19 @@ let ''; }; + reveal-md = super.reveal-md.override ( + lib.optionalAttrs (!stdenv.isDarwin) { + nativeBuildInputs = [ pkgs.makeWrapper ]; + prePatch = '' + export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 + ''; + postInstall = '' + wrapProgram $out/bin/reveal-md \ + --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium + ''; + } + ); + ssb-server = super.ssb-server.override { buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ]; meta.broken = since "10"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ce30a571d86d..701f187ee997 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -239,6 +239,7 @@ , "redoc-cli" , "remod-cli" , "reveal.js" +, "reveal-md" , "rimraf" , "rollup" , { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" } diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 368ff2647358..17d137e36bd6 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -30834,6 +30834,15 @@ let sha512 = "om8L9O5XwqeSdwl5NtHgrzK3wcF4fT9T4gb/NktoH8EyoZipas/tvUZLV48xT7fQfMYr9qvb0WEutqdf0LWSqA=="; }; }; + "highlight.js-10.7.2" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "10.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz"; + sha512 = "oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="; + }; + }; "highlight.js-10.7.3" = { name = "highlight.js"; packageName = "highlight.js"; @@ -37595,6 +37604,24 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; + "livereload-0.9.3" = { + name = "livereload"; + packageName = "livereload"; + version = "0.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/livereload/-/livereload-0.9.3.tgz"; + sha512 = "q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw=="; + }; + }; + "livereload-js-3.3.2" = { + name = "livereload-js"; + packageName = "livereload-js"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.2.tgz"; + sha512 = "w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA=="; + }; + }; "ln-accounting-5.0.5" = { name = "ln-accounting"; packageName = "ln-accounting"; @@ -45825,6 +45852,15 @@ let sha512 = "jB5hAtsDOhCy/FNQJwQJOrGlxLUat482Yr14rbA5l2Zb1eOeoS+ccQPO036C1+z9VDBTmOZqzh1tBbI4myzIYw=="; }; }; + "open-8.3.0" = { + name = "open"; + packageName = "open"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-8.3.0.tgz"; + sha512 = "7INcPWb1UcOwSQxAXTnBJ+FxVV4MPs/X++FWWBtgY69/J5lc+tCteMt/oFK1MnkyHC4VILLa9ntmwKTwDR4Q9w=="; + }; + }; "open-8.4.0" = { name = "open"; packageName = "open"; @@ -46266,6 +46302,15 @@ let sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }; }; + "opts-2.0.2" = { + name = "opts"; + packageName = "opts"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz"; + sha512 = "k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg=="; + }; + }; "ora-1.4.0" = { name = "ora"; packageName = "ora"; @@ -46752,13 +46797,13 @@ let sha512 = "RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q=="; }; }; - "p-memoize-4.0.2" = { + "p-memoize-4.0.3" = { name = "p-memoize"; packageName = "p-memoize"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/p-memoize/-/p-memoize-4.0.2.tgz"; - sha512 = "REJQ6EIeFmvT9O/u0H/ZVWjRII/1/0GhckleQX0yn+Uk9EdXTtmfnrfa3FwF8ZUrfUEe8NInvlRa0ZBKlMxxTA=="; + url = "https://registry.npmjs.org/p-memoize/-/p-memoize-4.0.3.tgz"; + sha512 = "lX9GfP1NT5jheKsmvc1071L74/Vw7vul+uZEnst7LNuMtbKlWYwKItqcLSAVUyJnrfQAqFFCJQ5bt0whrDsWQA=="; }; }; "p-pipe-3.1.0" = { @@ -46788,6 +46833,15 @@ let sha512 = "2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw=="; }; }; + "p-reflect-2.1.0" = { + name = "p-reflect"; + packageName = "p-reflect"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-reflect/-/p-reflect-2.1.0.tgz"; + sha512 = "paHV8NUz8zDHu5lhr/ngGWQiW067DK/+IbJ+RfZ4k+s8y4EKyYCz8pGYWjxCg35eHztpJAt+NUgvN4L+GCbPlg=="; + }; + }; "p-retry-3.0.1" = { name = "p-retry"; packageName = "p-retry"; @@ -46815,6 +46869,15 @@ let sha512 = "e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA=="; }; }; + "p-settle-4.1.1" = { + name = "p-settle"; + packageName = "p-settle"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-settle/-/p-settle-4.1.1.tgz"; + sha512 = "6THGh13mt3gypcNMm0ADqVNCcYa3BK6DWsuJWFCuEKP1rpY+OKGp7gaZwVmLspmic01+fsg/fN57MfvDzZ/PuQ=="; + }; + }; "p-some-4.1.0" = { name = "p-some"; packageName = "p-some"; @@ -51730,6 +51793,15 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; + "puppeteer-1.19.0" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.19.0.tgz"; + sha512 = "2S6E6ygpoqcECaagDbBopoSOPDv0pAZvTbnBgUY+6hq0/XDFDOLEMNlHF/SKJlzcaZ9ckiKjKDuueWI3FN/WXw=="; + }; + }; "puppeteer-1.20.0" = { name = "puppeteer"; packageName = "puppeteer"; @@ -55762,6 +55834,15 @@ let sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; }; }; + "reveal.js-4.1.3" = { + name = "reveal.js"; + packageName = "reveal.js"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.1.3.tgz"; + sha512 = "5VbL4nVDUedVKnOIIM3UQAIUlp+CvR/SrUkrN5GDoVfcWJAxH2oIh7PWyShy7+pE7tgkH2q+3e5EikGRpgE+oA=="; + }; + }; "reverse-http-1.3.0" = { name = "reverse-http"; packageName = "reverse-http"; @@ -58939,6 +59020,15 @@ let sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; }; }; + "spdx-license-ids-3.0.11" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; + }; + }; "spdx-license-list-6.4.0" = { name = "spdx-license-list"; packageName = "spdx-license-list"; @@ -61684,13 +61774,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.9.12" = { + "systeminformation-5.9.13" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.9.12"; + version = "5.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.12.tgz"; - sha512 = "9tCCSA5ChSWBadJrrs7GYSvCBt9oKeqBAp0tv4FaeAIrYjIJ4gxrkFc+2xdMrJd8HEGKBMD2TSTMsXhmn+dBtw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.13.tgz"; + sha512 = "AGL34jWboB7bjmNYIcJ5hbYEVYXQuLPbIq7bJg3rJJNHYZvZkQC9hH15KpH9CPg9ZxCsTqAfUNyGMv1jmv78Tw=="; }; }; "sywac-1.3.0" = { @@ -63602,6 +63692,15 @@ let sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; }; }; + "try-require-1.2.1" = { + name = "try-require"; + packageName = "try-require"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/try-require/-/try-require-1.2.1.tgz"; + sha1 = "34489a2cac0c09c1cc10ed91ba011594d4333be2"; + }; + }; "try-resolve-1.0.1" = { name = "try-resolve"; packageName = "try-resolve"; @@ -65978,13 +66077,13 @@ let sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6"; }; }; - "usb-1.9.0" = { + "usb-1.9.1" = { name = "usb"; packageName = "usb"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/usb/-/usb-1.9.0.tgz"; - sha512 = "nybH1SzvwYkRQ5s8ko9XXyZkrcWV5VWMMv7yh5H++wALhjBFjt2XBoSJWxBUdu6U/UfceQz42inhv3/maxM8jg=="; + url = "https://registry.npmjs.org/usb/-/usb-1.9.1.tgz"; + sha512 = "T6DZbJAFNcxhY1FzaYdXhV2oqoRlvLhtSSmnbFAqyCxahUkc+g0BPZVXv7hIeQQxDCAQnr4Ia8bfOk1JlzNzzw=="; }; }; "use-3.1.1" = { @@ -70210,6 +70309,15 @@ let sha1 = "e52e84fea6983b93755e9b1564dba989b006b5a5"; }; }; + "yaml-front-matter-4.1.1" = { + name = "yaml-front-matter"; + packageName = "yaml-front-matter"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-front-matter/-/yaml-front-matter-4.1.1.tgz"; + sha512 = "ULGbghCLsN8Hs8vfExlqrJIe8Hl2TUjD7/zsIGMP8U+dgRXEsDXk4yydxeZJgdGiimP1XB7zhmhOB4/HyfqOyQ=="; + }; + }; "yaml-include-1.2.1" = { name = "yaml-include"; packageName = "yaml-include"; @@ -97645,7 +97753,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.9.12" + sources."systeminformation-5.9.13" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -98047,7 +98155,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.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -98444,7 +98552,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.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -102052,7 +102160,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.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { @@ -104272,7 +104380,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.10" + sources."spdx-license-ids-3.0.11" sources."split-1.0.1" sources."split-on-first-1.1.0" sources."split2-3.2.2" @@ -106234,7 +106342,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.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -108206,7 +108314,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.10" + sources."spdx-license-ids-3.0.11" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -108926,7 +109034,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.10" + sources."spdx-license-ids-3.0.11" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -109490,11 +109598,13 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-map-4.0.0" - (sources."p-memoize-4.0.2" // { + (sources."p-memoize-4.0.3" // { dependencies = [ sources."mimic-fn-3.1.0" ]; }) + sources."p-reflect-2.1.0" + sources."p-settle-4.1.1" sources."p-timeout-4.1.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -109594,7 +109704,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.10" + sources."spdx-license-ids-3.0.11" sources."split-1.0.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -111853,7 +111963,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.10" + sources."spdx-license-ids-3.0.11" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -112667,7 +112777,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.9.12" + sources."systeminformation-5.9.13" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.1" @@ -116267,7 +116377,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.10" + sources."spdx-license-ids-3.0.11" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -116315,6 +116425,290 @@ in bypassCache = true; reconstructLock = true; }; + reveal-md = nodeEnv.buildNodePackage { + name = "reveal-md"; + packageName = "reveal-md"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.2.0.tgz"; + sha512 = "vd3fS4qP/g7pUwLhbPUONK6YKPcgD3cxExDeZFOq+LRZqLgRWxnzXWMCIPsszvMCo0+n+hXEadNqrf9QrVeWkw=="; + }; + dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."accepts-1.3.7" + sources."agent-base-4.3.0" + sources."ansi-align-3.0.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."anymatch-3.1.2" + sources."argparse-1.0.10" + sources."array-flatten-1.1.1" + sources."async-limiter-1.0.1" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."boxen-5.1.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-crc32-0.2.13" + sources."buffer-from-1.1.2" + sources."bytes-3.1.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."camelcase-6.2.0" + sources."chalk-4.1.2" + sources."chokidar-3.5.2" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.1" + sources."clone-response-1.0.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-6.2.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."configstore-5.0.1" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.3" + sources."crypto-random-string-2.0.0" + sources."debug-4.3.2" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."defer-to-connect-1.1.3" + sources."define-lazy-prop-2.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dot-prop-5.3.0" + sources."duplexer3-0.1.4" + sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."escape-goat-2.1.1" + sources."escape-html-1.0.3" + sources."esprima-4.0.1" + sources."etag-1.8.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."extract-zip-1.7.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."fd-slicer-1.1.0" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."forwarded-0.2.0" + sources."fresh-0.5.2" + sources."fs-extra-10.0.0" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."get-stream-4.1.0" + sources."glob-7.2.0" + sources."glob-parent-5.1.2" + sources."global-dirs-3.0.0" + sources."got-9.6.0" + sources."graceful-fs-4.2.8" + sources."has-flag-4.0.0" + sources."has-yarn-2.1.0" + sources."highlight.js-10.7.2" + sources."http-cache-semantics-4.1.0" + sources."http-errors-1.7.2" + (sources."https-proxy-agent-2.2.4" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."iconv-lite-0.4.24" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-2.0.0" + sources."ipaddr.js-1.9.1" + sources."is-binary-path-2.1.0" + sources."is-ci-2.0.0" + sources."is-docker-2.2.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.3" + sources."is-installed-globally-0.4.0" + sources."is-npm-5.0.0" + sources."is-number-7.0.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.3" + sources."is-typedarray-1.0.0" + sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" + sources."isarray-1.0.0" + sources."js-yaml-3.14.1" + sources."json-buffer-3.0.0" + sources."jsonfile-6.1.0" + sources."keyv-3.1.0" + sources."latest-version-5.1.0" + sources."livereload-0.9.3" + sources."livereload-js-3.3.2" + sources."lodash-4.17.21" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."mustache-4.2.0" + sources."negotiator-0.6.2" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.1" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."open-8.3.0" + sources."opts-2.0.2" + sources."p-cancelable-1.1.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."parseurl-1.3.3" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."pend-1.2.0" + sources."picomatch-2.3.0" + sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."proxy-addr-2.0.7" + sources."proxy-from-env-1.1.0" + sources."pump-3.0.0" + sources."pupa-2.1.1" + (sources."puppeteer-1.19.0" // { + dependencies = [ + sources."mime-2.6.0" + sources."ws-6.2.2" + ]; + }) + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) + sources."readable-stream-2.3.7" + sources."readdirp-3.6.0" + sources."registry-auth-token-4.2.1" + sources."registry-url-5.1.0" + sources."responselike-1.0.2" + sources."reveal.js-4.1.3" + sources."rimraf-2.7.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."semver-7.3.5" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + (sources."serve-favicon-2.5.0" // { + dependencies = [ + sources."ms-2.1.1" + sources."safe-buffer-5.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + sources."signal-exit-3.0.5" + sources."sprintf-js-1.0.3" + sources."statuses-1.5.0" + sources."string-width-4.2.3" + sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.1" + sources."strip-json-comments-2.0.1" + sources."supports-color-7.2.0" + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."try-require-1.2.1" + sources."type-fest-0.20.2" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" + sources."unique-string-2.0.0" + sources."universalify-2.0.0" + sources."unpipe-1.0.0" + sources."update-notifier-5.1.0" + sources."url-parse-lax-3.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" + sources."widest-line-3.1.0" + sources."wrap-ansi-7.0.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."ws-7.5.5" + sources."xdg-basedir-4.0.0" + sources."yallist-4.0.0" + sources."yaml-front-matter-4.1.1" + sources."yargs-parser-20.2.9" + sources."yauzl-2.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "reveal.js on steroids! Get beautiful reveal.js presentations from your Markdown files."; + homepage = "https://github.com/webpro/reveal-md#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; @@ -118828,7 +119222,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.10" + sources."spdx-license-ids-3.0.11" sources."speedtest-net-1.6.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -120471,7 +120865,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.10" + sources."spdx-license-ids-3.0.11" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -120686,10 +121080,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "14.0.1"; + version = "14.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-14.0.1.tgz"; - sha512 = "ZcAkmFLVCultmwkQUjxKzxW/o5+CzNmDk6TPJj/d4Y7ipTGGrewIWmNm+InjdSr04PR5/yynsAJeYJY/wisdMg=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-14.1.0.tgz"; + sha512 = "IedkssuNVA11+v++2PIV2OHOU5A3SfRcXVi56vZVSsMhGrgtwmmit69jeM+08/Tun5DTBe7BuH1Zp1mMLmtKLA=="; }; dependencies = [ sources."@babel/code-frame-7.16.0" @@ -120859,7 +121253,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.10" + sources."spdx-license-ids-3.0.11" sources."specificity-0.4.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -121880,7 +122274,7 @@ in sources."node-addon-api-4.2.0" sources."node-gyp-build-4.3.0" sources."q-1.5.1" - sources."usb-1.9.0" + sources."usb-1.9.1" ]; buildInputs = globalBuildInputs; meta = { @@ -122164,7 +122558,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.10" + sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.0.3" (sources."string-width-1.0.2" // { dependencies = [ @@ -122560,7 +122954,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.10" + sources."spdx-license-ids-3.0.11" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -126639,7 +127033,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.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -129428,7 +129822,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.10" + sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" sources."ssri-8.0.1" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e62ae437e32..df080da43e7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9041,6 +9041,8 @@ with pkgs; reuse = callPackage ../tools/package-management/reuse { }; + inherit (nodePackages) reveal-md; + rewritefs = callPackage ../os-specific/linux/rewritefs { }; rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; From 5153a6cf192bf840538b969da19af30a4a96e869 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Thu, 11 Nov 2021 07:53:01 +0100 Subject: [PATCH 188/359] gradle: Clean up --- .../tools/build-managers/gradle/default.nix | 45 +++++++------------ .../gradle/gradle-4.10.3-spec.nix | 5 +++ .../gradle/gradle-5.6.4-spec.nix | 5 +++ pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/tools/build-managers/gradle/gradle-4.10.3-spec.nix create mode 100644 pkgs/development/tools/build-managers/gradle/gradle-5.6.4-spec.nix diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 877f28419055..443e91325af1 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,21 +1,20 @@ { lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: -let - gradleSpec = { version, nativeVersion, sha256 }: rec { - inherit nativeVersion; - name = "gradle-${version}"; +rec { + gradleGen = { version, nativeVersion, sha256 }: stdenv.mkDerivation { + pname = "gradle"; + inherit version; + src = fetchurl { inherit sha256; - url = "https://services.gradle.org/distributions/${name}-bin.zip"; + url = "https://services.gradle.org/distributions/gradle-${version}-bin.zip"; }; - }; -in -rec { - gradleGen = { name, src, nativeVersion }: stdenv.mkDerivation { - inherit name src nativeVersion; dontBuild = true; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ java ]; + installPhase = '' mkdir -pv $out/lib/gradle/ cp -rv lib/ $out/lib/gradle/ @@ -44,9 +43,6 @@ rec { echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies ''; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ java ]; - meta = with lib; { description = "Enterprise-grade build system"; longDescription = '' @@ -57,7 +53,9 @@ rec { between the flexibility of Ant and the convenience of a build-by-convention behavior. ''; - homepage = "http://www.gradle.org/"; + homepage = "https://www.gradle.org/"; + changelog = "https://docs.gradle.org/${version}/release-notes.html"; + downloadPage = "https://gradle.org/next-steps/?version=${version}"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ lorenzleutgeb ]; @@ -65,20 +63,11 @@ rec { }; gradle_latest = gradle_7_3; - gradle_7_3 = gradleGen (gradleSpec (import ./gradle-7.3-spec.nix)); - gradle_6_9 = gradleGen (gradleSpec (import ./gradle-6.9.1-spec.nix)); - # NOTE: No GitHub Release for this release, so update.sh does not work. - gradle_5_6 = gradleGen (gradleSpec { - version = "5.6.4"; - nativeVersion = "0.18"; - sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z"; - }); + gradle_7_3 = gradleGen (import ./gradle-7.3-spec.nix); + gradle_6_9 = gradleGen (import ./gradle-6.9.1-spec.nix); - # NOTE: No GitHub Release for this release, so update.sh does not work. - gradle_4_10 = gradleGen (gradleSpec { - version = "4.10.3"; - nativeVersion = "0.14"; - sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; - }); + # NOTE: No GitHub Release for the following versions. Update.sh will not work. + gradle_5_6 = gradleGen (import ./gradle-5.6.4-spec.nix); + gradle_4_10 = gradleGen (import ./gradle-4.10.3-spec.nix); } diff --git a/pkgs/development/tools/build-managers/gradle/gradle-4.10.3-spec.nix b/pkgs/development/tools/build-managers/gradle/gradle-4.10.3-spec.nix new file mode 100644 index 000000000000..598deab87e06 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/gradle-4.10.3-spec.nix @@ -0,0 +1,5 @@ +{ + version = "4.10.3"; + nativeVersion = "0.14"; + sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; +} diff --git a/pkgs/development/tools/build-managers/gradle/gradle-5.6.4-spec.nix b/pkgs/development/tools/build-managers/gradle/gradle-5.6.4-spec.nix new file mode 100644 index 000000000000..41e567c1449c --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/gradle-5.6.4-spec.nix @@ -0,0 +1,5 @@ +{ + version = "5.6.4"; + nativeVersion = "0.18"; + sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83e3dba01778..eb4e939f3d07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14597,8 +14597,7 @@ with pkgs; java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 }; gradle = res.gradleGen.gradle_latest; - gradle_4_10 = res.gradleGen.gradle_4_10; - gradle_4 = gradle_4_10; + gradle_4 = res.gradleGen.gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; gradle_6 = res.gradleGen.gradle_6_9; gradle_7 = res.gradleGen.gradle_7_3; From 9e7f498eafc0469b68fdf8dde8d9412c830def5c Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 15 Nov 2021 19:38:40 +0100 Subject: [PATCH 189/359] jupyter_server: Patch unicode test for Darwin (#145993) The test relies on creating and then reading files with unicode names to/from disk. Apple's HFS+, the default file system until recently, is unicode-normalizing with normal form D (NFD). So not all unicode file names round-trip. This patch implements one imperfect solution. ZHF: #144627 --- .../development/python-modules/jupyter_server/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 0e1469e0940e..2cb7d06b646a 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , fetchPypi , pythonOlder , pytestCheckHook @@ -34,6 +35,13 @@ buildPythonPackage rec { sha256 = "c1f32e0c1807ab2de37bf70af97a36b4436db0bc8af3124632b1f4441038bf95"; }; + patches = [ (fetchpatch + { name = "Normalize-file-name-and-path.patch"; + url = "https://github.com/jupyter-server/jupyter_server/pull/608/commits/345e26cdfd78651954b68708fa44119c2ac0dbd5.patch"; + sha256 = "1kqz3dyh2w0h1g1fbvqa13q17hb6y32694rlaasyg213mq6g4k32"; + }) + ]; + propagatedBuildInputs = [ argon2_cffi jinja2 From d25def1a8472f315030a3bc113c6b9f5be8f76a4 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Mon, 15 Nov 2021 17:31:51 +0530 Subject: [PATCH 190/359] broot: 1.6.6 -> 1.7.1 --- pkgs/tools/misc/broot/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 96788f8c7319..9817df780ea2 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -9,19 +9,20 @@ , oniguruma , libiconv , Security +, libxcb , zlib }: rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.6.6"; + version = "1.7.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Aezi005CKhGwCRZ2HwxFRRORBvVoZEzljTcKQZ8b8XI="; + sha256 = "sha256-Gg60jeDfHNKUYynJRgN4oLWhcdApWUdO5kRwl5hrFMM="; }; - cargoHash = "sha256-d06lvS5ajXPY/AwmE2rkya82mAOeEv04EtBElDvX2+I="; + cargoHash = "sha256-xsTlFfgX3Np3M/RqmK30DZBCrY1OXnEkjqBDI+ffd/U="; nativeBuildInputs = [ installShellFiles @@ -29,7 +30,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ libgit2 oniguruma ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2 oniguruma libxcb ] ++ lib.optionals stdenv.isDarwin [ libiconv Security zlib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83e3dba01778..6e8147a227b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2244,6 +2244,7 @@ with pkgs; broot = callPackage ../tools/misc/broot { inherit (darwin.apple_sdk.frameworks) Security; + inherit (xorg) libxcb; }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; From 702b5f6dc9d9e411406a59ccd3d5274d9ea29e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 15 Nov 2021 20:09:07 +0100 Subject: [PATCH 191/359] gtk4: 4.4.0 -> 4.4.1 https://gitlab.gnome.org/GNOME/gtk/-/blob/4.4.1/NEWS --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 78d9174d0953..38df17765c86 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.4.0"; + version = "4.4.1"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "4KFQj0QWhsOiDf7EivUzsZpLLgF8GOruMdzNt9KSUFs="; + sha256 = "D6ramD3GsLxAnLNMFxPB8yZ+Z8CT+GseOxfbYQCj3fQ="; }; nativeBuildInputs = [ From 322841df2c69ac87908beb61dc0481deae2cd37e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 15 Nov 2021 19:24:42 +0000 Subject: [PATCH 192/359] ledger-live-desktop: 2.34.4 -> 2.35.0 --- 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 636d377ebe48..ac24baa934a4 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.34.4"; + version = "2.35.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "00zl7ywmkbhwzkj7p618rin5pd0ix8cas5q1b8ka6ynw4wlg3w5c"; + hash = "sha256-o2XGBTqyHqQ/yq54B0GBFEk35Zxt2ZWGZCTjbEbKqiw="; }; appimageContents = appimageTools.extractType2 { From 38d1f15fe4d31d4da045b0bc89fadf89a8ecf17e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Nov 2021 18:42:54 +0000 Subject: [PATCH 193/359] linux-rt_5_10: 5.10.73-rt54 -> 5.10.78-rt55 --- 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 6ef781f6095c..c8d42ddda746 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.73-rt54"; # updated by ./update-rt.sh + version = "5.10.78-rt55"; # 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 = "0xhf0g5pra27hnavpy0y3mn05m5hqn5rd3d6fx0a3vr35c1jicpd"; + sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0szqm9f939p9z701i5hj881nf5bhfa0a6037bbcz974y0x8g9nmk"; + sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp"; }; }; in [ rt-patch ] ++ kernelPatches; From 9b6fb581af5d352889b2cdccfe896fd7504cff2c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Nov 2021 18:43:31 +0000 Subject: [PATCH 194/359] linux/hardened/patches/4.14: 4.14.254-hardened1 -> 4.14.255-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f6c95acf4c6f..15593d419357 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.254-hardened1.patch", - "sha256": "1mg4zims7ckb0ddnnahk1cj73lhdh7x7xkjz4cgsvwndw0qvmhdi", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.254-hardened1/linux-hardened-4.14.254-hardened1.patch" + "name": "linux-hardened-4.14.255-hardened1.patch", + "sha256": "0d84jwf9vd86qzxq8aqcyrzmwczf3qh2f7a801qsgzb96fyvakrl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.255-hardened1/linux-hardened-4.14.255-hardened1.patch" }, - "sha256": "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz", - "version": "4.14.254" + "sha256": "1mxjwqijnlvrdbpd973kdycz1dwklfkj9vpnj1cihgsf880q02zh", + "version": "4.14.255" }, "4.19": { "patch": { From 57d9fd1791d6f053e8e5e28732807642fc6b07d6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Nov 2021 18:43:37 +0000 Subject: [PATCH 195/359] linux/hardened/patches/4.19: 4.19.216-hardened1 -> 4.19.217-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 15593d419357..0709d0259682 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.216-hardened1.patch", - "sha256": "0a8rg0lc0pj6zlkbrd3fjrjgg3f18918zzs8q4nld092hqjfjbsm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.216-hardened1/linux-hardened-4.19.216-hardened1.patch" + "name": "linux-hardened-4.19.217-hardened1.patch", + "sha256": "1brx4dvh8acq1r5mbh2a5d95k3n7m4x3jnqnp0s69p3fx9gf1kxh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.217-hardened1/linux-hardened-4.19.217-hardened1.patch" }, - "sha256": "0cs8yy5jfbvvi5j9f3kzyc4j0fjylxdj1641f53ga6gkmjmayv3d", - "version": "4.19.216" + "sha256": "01500jcjvhbkn7xcan564jw0nnwc12cf8hhvl8118jqqqw612lc5", + "version": "4.19.217" }, "5.10": { "patch": { From b868e782821ca7419ca2e27928faecb2501c7433 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Nov 2021 18:43:47 +0000 Subject: [PATCH 196/359] linux/hardened/patches/5.14: 5.14.17-hardened1 -> 5.14.18-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0709d0259682..ea925272c57a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.14.17-hardened1.patch", - "sha256": "08s26hmmaji51aczh9spbg8ngbxz5mr067dgi05djp3cgs2hl5pw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.17-hardened1/linux-hardened-5.14.17-hardened1.patch" + "name": "linux-hardened-5.14.18-hardened1.patch", + "sha256": "1mk159nwkdd1kwsp9l7328x8mk7i5k3sw4nk858zr8izgllqijlp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.18-hardened1/linux-hardened-5.14.18-hardened1.patch" }, - "sha256": "0q7df51yk6di1m8ky0gplkyx6smlr9inxrd569qv3ww3ykg933sd", - "version": "5.14.17" + "sha256": "1pr7qh2wjw7h6r3fixg9ia5r3na7vdb6b4sp9wnbifnqckahzwis", + "version": "5.14.18" }, "5.4": { "patch": { From db13d848fcd2e4f74a00c2de1f1cd8178cc25e33 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Nov 2021 19:10:03 +0000 Subject: [PATCH 197/359] linux/hardened/patches/5.4: 5.4.158-hardened1 -> 5.4.159-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ea925272c57a..0ae863a4347e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,11 +42,11 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.158-hardened1.patch", - "sha256": "1pnxwvy5x04b95bfia63916qlrj5mrp2d54dcc4hg5k29vm0z6a5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.158-hardened1/linux-hardened-5.4.158-hardened1.patch" + "name": "linux-hardened-5.4.159-hardened1.patch", + "sha256": "1hzs6sqdyzddz0qwq4b6c7rcihbjgzq73ng6fma408c27y72d6pi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.159-hardened1/linux-hardened-5.4.159-hardened1.patch" }, - "sha256": "0ncdkf1iz49458k3dvq3dc5b2r9dp21jsn3ffm9lbhlgvkn8y0bf", - "version": "5.4.158" + "sha256": "0hw68yjf0c8kahwra8hq863318cbyqc89f429z75scmb9rgk466p", + "version": "5.4.159" } } From c783c8d8594ad43402f4a9a4bacf148381d0baa7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Nov 2021 19:10:37 +0000 Subject: [PATCH 198/359] linux/hardened/patches/5.15: init at 5.15.2-hardened1 --- nixos/tests/kernel-generic.nix | 1 + pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 2 ++ 4 files changed, 15 insertions(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 3fdd3995b7aa..45c5c1963a0d 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -29,6 +29,7 @@ let linux_4_19_hardened linux_5_4_hardened linux_5_10_hardened + linux_5_15_hardened linux_testing; }; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0ae863a4347e..1c05b7b77d26 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -39,6 +39,16 @@ "sha256": "1pr7qh2wjw7h6r3fixg9ia5r3na7vdb6b4sp9wnbifnqckahzwis", "version": "5.14.18" }, + "5.15": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-5.15.2-hardened1.patch", + "sha256": "15r7vkflcrj1hxfvhycqfflb3625br10qvn1ixhsv14xxdf3h39c", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.2-hardened1/linux-hardened-5.15.2-hardened1.patch" + }, + "sha256": "0xdi799k15l7l9kxlq4qbp79mp1c38vxal4z4p9l5gl194x06d2n", + "version": "5.15.2" + }, "5.4": { "patch": { "extra": "-hardened1", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64ad35a31722..a53eb4f83204 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22117,6 +22117,8 @@ with pkgs; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened; linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened; + linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; + linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8c97a418b295..9ee3aa58e955 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -233,6 +233,7 @@ in { linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { }; + linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; })); /* Linux kernel modules are inherently tied to a specific kernel. So @@ -506,6 +507,7 @@ in { linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { }); + linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From f726b6c47689da09e664c173557a53e4467963c9 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Nov 2021 19:29:51 +0000 Subject: [PATCH 199/359] linux-rt_5_11: remove --- .../linux/kernel/linux-rt-5.11.nix | 45 ------------------- pkgs/top-level/aliases.nix | 2 - pkgs/top-level/linux-kernels.nix | 11 +---- 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-rt-5.11.nix diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix deleted file mode 100644 index 5d1b14f1d0f0..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, buildLinux, fetchurl -, kernelPatches ? [ ] -, structuredExtraConfig ? {} -, extraMeta ? {} -, argsOverride ? {} -, ... } @ args: - -let - version = "5.11.4-rt11"; # updated by ./update-rt.sh - branch = lib.versions.majorMinor version; - kversion = builtins.elemAt (lib.splitString "-" version) 0; -in buildLinux (args // { - inherit version; - - # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. - modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version - else lib.replaceStrings ["-"] [".0-"] version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8"; - }; - - kernelPatches = let rt-patch = { - name = "rt"; - patch = fetchurl { - url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1az6cn9jj3bnjgwzzrjy1adnrnn06p2vzsnc1iib4xhs0sfr27hc"; - }; - }; in [ rt-patch ] ++ kernelPatches; - - structuredExtraConfig = with lib.kernel; { - PREEMPT_RT = yes; - # Fix error: unused option: PREEMPT_RT. - EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) - # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). - PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. - # Fix error: unused option: RT_GROUP_SCHED. - RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. - } // structuredExtraConfig; - - extraMeta = extraMeta // { - inherit branch; - }; -} // argsOverride) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 62efca5b8d00..8dc857e4a985 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -461,7 +461,6 @@ mapAliases ({ linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; - linuxPackages_rt_5_11 = linuxKernel.packages.linux_rt_5_11; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; @@ -489,7 +488,6 @@ mapAliases ({ linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; linux_5_10 = linuxKernel.kernels.linux_5_10; linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; - linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; linux_5_14 = linuxKernel.kernels.linux_5_14; linux_5_15 = linuxKernel.kernels.linux_5_15; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9ee3aa58e955..e109cca82077 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -159,14 +159,6 @@ in { ]; }; - linux_rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export-rt-sched-migrate - ]; - }; - linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -483,7 +475,6 @@ in { # realtime kernel packages linux_rt_5_4 = packagesFor kernels.linux_rt_5_4; linux_rt_5_10 = packagesFor kernels.linux_rt_5_10; - linux_rt_5_11 = packagesFor kernels.linux_rt_5_11; }; rpiPackages = { @@ -526,7 +517,7 @@ in { linux_latest = packages.linux_5_15; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; - linux_rt_latest = packages.linux_rt_5_11; + linux_rt_latest = packages.linux_rt_5_10; linux_hardkernel_latest = packages.hardkernel_4_14; }; From de1a7566119877d4cba16d184d0bbf4f1babfc7b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Nov 2021 20:14:01 +0000 Subject: [PATCH 200/359] electron_15: 15.3.0 -> 15.3.1 https://github.com/electron/electron/releases/tag/v15.3.1 --- 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 38f1827e5126..d688b893ff9b 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -135,13 +135,13 @@ rec { headers = "1y289vr8bws3z6gmhaj3avz95rdhc8gd3rc7bi40jv9j1pnlsd3m"; }; - electron_15 = mkElectron "15.3.0" { - armv7l-linux = "dfe2851ef94c17eb905cd8cf00b585be072e20a79a02c0c42585a0f51b8cdb20"; - aarch64-linux = "e0bb8d663dfbe8b65b9e38d4af992a919adc639acfb8748d95ca5b9bbcd7a83c"; - x86_64-linux = "7cb9c6c9c61848f7d82aaac47ca97bb78c6061e73b176fd3a323652c07335087"; - i686-linux = "289ef7d53c440a576839a4ee092284009235d740404ea07e6bf82f33254ae8df"; - x86_64-darwin = "667da0d56bab968d28c41c1f53b901fb685e56d1f56faf33912a240a0397bab5"; - aarch64-darwin = "9cf5caafc7cbf0e91483e24d5a696b81618d293a5eccd4d122c57baaab88724c"; - headers = "0jicbplni608cjxwhlrzxkxc9w9b4h6zqssilc9b0yr73jq1fyrd"; + electron_15 = mkElectron "15.3.1" { + armv7l-linux = "b3e73ad174f692da36a4e1d2cd6b849080ee891027e37126868c88e6b89d82ac"; + aarch64-linux = "35ebfeeedcb71bd256c24550c75b9515fdda2db7a2ee1deb1097040480a26198"; + x86_64-linux = "941330103b9ab66a0195dd86e1503b5d2087f93a0b1e8453d8270d47cfe2bfc2"; + i686-linux = "1eeef6b189b4305845a0832b98efcba773c329e351181debe003562a7885afff"; + x86_64-darwin = "a91b089b5dc5b1279966511344b805ec84869b6cd60af44f800b363bba25b915"; + aarch64-darwin = "89fafef20426c0a3a2326172d222d29fc5d24d64c8910b7abddf61bd2c6a6700"; + headers = "0f665x7yp0xz1p1cl8c3vcw3k7g53c13rkbz8cz3phl6v3n1s1w0"; }; } From 322808de0fd205c64b4eec18491d7069fb94b712 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Nov 2021 20:14:28 +0000 Subject: [PATCH 201/359] electron_14: 14.2.0 -> 14.2.1 https://github.com/electron/electron/releases/tag/v14.2.1 --- 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 d688b893ff9b..ff61c109b671 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -125,14 +125,14 @@ rec { headers = "1bd87c74863w0sjs8gfxl62kjjscc56dmmw85vhwz01s4niksr02"; }; - electron_14 = mkElectron "14.2.0" { - armv7l-linux = "a1357716ebda8d7856f233c86a8cbaeccad1c83f1d725d260b0a6510c47042a2"; - aarch64-linux = "b1f4885c3ad816d89446f64a87b78d5139a27fecbf6317808479bede6fd94ae1"; - x86_64-linux = "b2faec4744edb20e889c3c85af685c2a6aef90bfff58f55b90038a991cd7691f"; - i686-linux = "9207af6e3a24dfcc76fded20f26512bcb20f6b652295a4ad3458dc10fd2d7d6e"; - x86_64-darwin = "d647d658c8c2ec4a69c071e791cf7e823320860f987121bd7390978aecacb073"; - aarch64-darwin = "f5a7e52b639b94cf9b2ec53969c8014c6d299437c65d98c33d8e5ca812fbfd48"; - headers = "1y289vr8bws3z6gmhaj3avz95rdhc8gd3rc7bi40jv9j1pnlsd3m"; + electron_14 = mkElectron "14.2.1" { + armv7l-linux = "d95b5055a53ffb4c502885c3b35f0b938c1be3a7b77e378587d99e6ce009e5d5"; + aarch64-linux = "52d71b92606b639881b82efd369e4cc3fd01cade476cbb25cafb22e05a8c423b"; + x86_64-linux = "820271f62c17cdfe61ed7bce4eff1e82c375d317b7e8b47f965ce9fa863e5994"; + i686-linux = "478efa82bf017f65fda6f90405d3ccc6adb073bd4b2ab2985e550b5ac6135cba"; + x86_64-darwin = "d1684580a1c6e800e488428cc15cb223e9615a456784a7cb86ec116a0afafb85"; + aarch64-darwin = "b40c8a5b4680d509e1ab799d5a0bee19cebfc5c948196b35d9a92e52ebc8fafd"; + headers = "14yaw3kml2kmi7sns8z32kv4cd8anyj5nd7rfxcg74hj2pbl9dvp"; }; electron_15 = mkElectron "15.3.1" { From 757d972916277cb3fe33643eb4dadb5eb72be0b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 21:53:30 +0100 Subject: [PATCH 202/359] checkov: 2.0.571 -> 2.0.574 --- pkgs/development/tools/analysis/checkov/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3118946c6bf0..0bf46ed1b13e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.571"; + version = "2.0.574"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-cmSZHqR1BfVWXoUSJ3Et5TTdeUWklNA4egKLP4xKjw8="; + sha256 = "sha256-DM7fPwJcWEyOu55ThK/jP9jIUbiVCfEtltSP7puCoxQ="; }; nativeBuildInputs = with py.pkgs; [ @@ -70,6 +70,9 @@ buildPythonApplication rec { ]; propagatedBuildInputs = with py.pkgs; [ + aiodns + aiohttp + aiomultiprocess bc-python-hcl2 boto3 cachetools @@ -98,7 +101,11 @@ buildPythonApplication rec { ]; checkInputs = with py.pkgs; [ + aioresponses jsonschema + mock + pytest-asyncio + pytest-mock pytest-xdist pytestCheckHook ]; From d13480917ae9e28b75da3d1f2de66b63d3a30d97 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 21 Oct 2021 19:48:05 +0100 Subject: [PATCH 203/359] strongswan: 5.8.1 -> 5.9.4 remove two now-included patches, add new nixos module parameter ca_id --- .../strongswan-swanctl/swanctl-params.nix | 10 ++++++++++ pkgs/tools/networking/strongswan/default.nix | 19 +++---------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 8ae62931a8f9..cca61b9ce930 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -569,6 +569,16 @@ in { these sections offer more flexibility. ''; + ca_id = mkOptionalStrParam '' + Identity in CA certificate to accept for authentication. The specified + identity must be contained in one (intermediate) CA of the remote peer + trustchain, either as subject or as subjectAltName. This has the same + effect as specifying cacerts to force clients under + a CA to specific connections; it does not require the CA certificate + to be available locally, and can be received from the peer during the + IKE exchange. + ''; + cacerts = mkCommaSepListParam [] '' List of CA certificates to accept for authentication. The certificates may use a relative path from the diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 601446abb95c..9edc1c79fb0c 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkg-config, autoreconfHook, perl, gperf, bison, flex , gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib , openresolv @@ -17,13 +17,13 @@ with lib; stdenv.mkDerivation rec { pname = "strongswan"; - version = "5.8.1"; # Make sure to also update when upgrading! + version = "5.9.4"; # Make sure to also update when upgrading! src = fetchFromGitHub { owner = "strongswan"; repo = "strongswan"; rev = version; - sha256 = "1a1hw2jsbwvkdhhxjmq87hz13ivbgvqwks1q3adz14mqgbc64snd"; + sha256 = "1y1gs232x7hsbccjga9nbkf4bbi5wxazlkg00qd2v1nz86sfy4cd"; }; dontPatchELF = true; @@ -40,19 +40,6 @@ stdenv.mkDerivation rec { ./ext_auth-path.patch ./firewall_defaults.patch ./updown-path.patch - - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/strongswan/strongswan/pull/150.patch"; - sha256 = "1irfxb99blb8v3hs0kmlhzkkwbmds1p0gq319z8lmacz36cgyj2c"; - }) - - # fix build with -fno-common tollchain - (fetchpatch { - name = "fno-common.patch"; - url = "https://git.strongswan.org/?p=strongswan.git;a=patch;h=91c6387e69c09beaa9b9ca1e28471751a834fc24"; - sha256 = "0jp9walxwffp5cl7q0hb80h3s2gdj1nn3n8bvnbmwgh2s6pi148f"; - }) ]; postPatch = optionalString stdenv.isLinux '' From a39908a7cb0e01c7d3c2f8a9199b14de6209f687 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 15 Nov 2021 22:11:28 +0100 Subject: [PATCH 204/359] chromium: 95.0.4638.69 -> 96.0.4664.45 https://chromereleases.googleblog.com/2021/11/stable-channel-update-for-desktop.html This update includes 25 security fixes. CVEs: CVE-2021-38007 CVE-2021-38008 CVE-2021-38009 CVE-2021-38006 CVE-2021-38005 CVE-2021-38010 CVE-2021-38011 CVE-2021-38012 CVE-2021-38013 CVE-2021-38014 CVE-2021-38015 CVE-2021-38016 CVE-2021-38017 CVE-2021-38018 CVE-2021-38019 CVE-2021-38020 CVE-2021-38021 CVE-2021-38022 --- .../browsers/chromium/upstream-info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 624dde9e1702..ca73b620cfbb 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,20 +1,20 @@ { "stable": { - "version": "95.0.4638.69", - "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", - "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", + "version": "96.0.4664.45", + "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328", + "sha256bin64": "0546i4yd1jahv088hjxpq0jc393pscvl5ap3s2qw5jrybliyfd2g", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-24", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "0153d369bbccc908f4da4993b1ba82728055926a", + "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" } }, "chromedriver": { - "version": "95.0.4638.54", - "sha256_linux": "0p228x7w423p3zqwfdba2jj4x4gkxz4267qzzswpba335p3k1nyk", - "sha256_darwin": "1yxi8c18fa07w8kdm63v4663lhgx1y56957bkqb7hf459bzz594l" + "version": "96.0.4664.35", + "sha256_linux": "0iq129a4mj4sjs08s68n82wd8563sw8196xda27wk3pfpprr23db", + "sha256_darwin": "1prc7zbgnljqz2d89clpk5c0y48r79zmb9in4vinf3j6p2rxn0vy" } }, "beta": { From e30f006b3c6fc9cc8065d43d75b5dc2e70e01023 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 15 Nov 2021 21:06:16 +0000 Subject: [PATCH 205/359] cbqn-standalone: fix installPhase on darwin --- pkgs/development/interpreters/bqn/cbqn/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 44d63ace738b..4d872f0084e4 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -52,8 +52,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin/ cp BQN -t $out/bin/ - ln -s $out/bin/BQN $out/bin/bqn - ln -s $out/bin/BQN $out/bin/cbqn + # note guard condition for case-insensitive filesystems + [ -e $out/bin/bqn ] || ln -s $out/bin/BQN $out/bin/bqn + [ -e $out/bin/cbqn ] || ln -s $out/bin/BQN $out/bin/cbqn runHook postInstall ''; From 7adb11cf580fc75faa864a640f1204e7fb874463 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 13 Nov 2021 13:51:56 +0100 Subject: [PATCH 206/359] fcft: 2.4.5 -> 2.5.0 https://codeberg.org/dnkl/fcft/releases/tag/2.4.6 https://codeberg.org/dnkl/fcft/releases/tag/2.5.0 Replace withHarfBuzz with withShapingTypes which allows us to more accurately represent the current feature flag situation upstream. Additionally test all non-default configurations via passthru.tests. Settings for shapingType: * `[ "grapheme" ]`: depend on HarfBuzz, like withHarfBuzz before * `[ "grapheme" "run" ]`: depend on HarfBuzz and utf8proc. This is the same as `[ "run" ]` at the moment which may change in the future. * `[]`: No text shaping support, no additional dependencies --- pkgs/development/libraries/fcft/default.nix | 31 +++++++++++++++------ 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 8f2d56fad285..2101ee6dd42b 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -1,39 +1,54 @@ { stdenv, lib, fetchFromGitea, pkg-config, meson, ninja, scdoc , freetype, fontconfig, pixman, tllist, check -, withHarfBuzz ? true -, harfbuzz +# Text shaping methods to enable, empty list disables all text shaping. +# See `availableShapingTypes` or upstream meson_options.txt for available types. +, withShapingTypes ? [ "grapheme" "run" ] +, harfbuzz, utf8proc +, fcft # for passthru.tests }: let + # Needs to be reflect upstream meson_options.txt + availableShapingTypes = [ + "grapheme" + "run" + ]; + # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; in stdenv.mkDerivation rec { pname = "fcft"; - version = "2.4.5"; + version = "2.5.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "0z4bqap88pydkgcxrsvm3fmcyhi9x7z8knliarvdcvqlk7qnyzfh"; + sha256 = "0agqldh68hn898d3f6k99kjbz8had5j5k0jyvi71d4k9vhx8cy7c"; }; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ freetype fontconfig pixman tllist ] - ++ lib.optional withHarfBuzz harfbuzz; + ++ lib.optionals (withShapingTypes != []) [ harfbuzz ] + ++ lib.optionals (builtins.elem "run" withShapingTypes) [ utf8proc ]; checkInputs = [ check ]; mesonBuildType = "release"; - mesonFlags = [ - (mesonFeatureFlag "text-shaping" withHarfBuzz) - ]; + mesonFlags = builtins.map (t: + mesonFeatureFlag "${t}-shaping" (lib.elem t withShapingTypes) + ) availableShapingTypes; doCheck = true; + passthru.tests = { + noShaping = fcft.override { withShapingTypes = []; }; + onlyGraphemeShaping = fcft.override { withShapingTypes = [ "grapheme" ]; }; + }; + meta = with lib; { homepage = "https://codeberg.org/dnkl/fcft"; changelog = "https://codeberg.org/dnkl/fcft/releases/tag/${version}"; From debf4fc929cc937562b06607c1a3d81f92ee3a77 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 1 Nov 2021 12:55:18 +0100 Subject: [PATCH 207/359] gnat: 9 -> 11 Update the default GNAT version from 9 to 11, as GNAT >= 11 is required to compile the 22.* AdaCore libraries. To allow this, we need to pick a patch from ghdl's master fixing a compilation problem with GNAT 11. --- .../manual/from_md/release-notes/rl-2111.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ pkgs/development/compilers/ghdl/default.nix | 11 ++++++++++- pkgs/top-level/all-packages.nix | 3 +-- 4 files changed, 21 insertions(+), 3 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 0aa30c2b1fec..a64379b19ef6 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 @@ -1358,6 +1358,13 @@ Superuser created successfully. services.ddclient.passwordFile. + + + The default GNAT version has been changed: The + gnat attribute now points to + gnat11 instead of gnat9. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 0eb7bf74197c..9a76b4cca449 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -404,6 +404,9 @@ In addition to numerous new and upgraded packages, this release has the followin - The `services.ddclient.password` option was removed, and replaced with `services.ddclient.passwordFile`. +- The default GNAT version has been changed: The `gnat` attribute now points to `gnat11` + instead of `gnat9`. + ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index e7886eb8f5ed..266ee97a2e90 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, gnat, zlib, llvm, lib +{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat, zlib, llvm, lib , backend ? "mcode" }: assert backend == "mcode" || backend == "llvm"; @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { sha256 = "1gyh0xckwbzgslbpw9yrpj4gqs9fm1a2qpbzl0sh143fk1kwjlly"; }; + patches = [ + # Allow compilation with GNAT 11, picked from master + (fetchpatch { + name = "fix-gnat-11-compilation.patch"; + url = "https://github.com/ghdl/ghdl/commit/8356ea3bb4e8d0e5ad8638c3d50914b64fc360ec.patch"; + sha256 = "04pzn8g7xha8000wbjjmry6h1grfqyn3bjvj47hi4qwgl21wfjra"; + }) + ]; + LIBRARY_PATH = "${stdenv.cc.libc}/lib"; buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64ad35a31722..1e3e2b65bb0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11878,8 +11878,7 @@ with pkgs; inherit (gnome2) libart_lgpl; }); - # aarch64-darwin doesn't support earlier gcc - gnat = if (stdenv.isDarwin && stdenv.isAarch64) then gnat11 else gnat9; + gnat = gnat11; gnat6 = wrapCC (gcc6.cc.override { name = "gnat"; From 2458ae6a72d0bcfcc453f680c82d3ce18e646128 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 1 Nov 2021 12:56:30 +0100 Subject: [PATCH 208/359] xmlada: 21.0.0 -> 22.0.0 --- pkgs/development/libraries/ada/xmlada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ada/xmlada/default.nix b/pkgs/development/libraries/ada/xmlada/default.nix index b855166d5590..cd0aad61d403 100644 --- a/pkgs/development/libraries/ada/xmlada/default.nix +++ b/pkgs/development/libraries/ada/xmlada/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "xmlada"; - version = "21.0.0"; + version = "22.0.0"; src = fetchFromGitHub { name = "xmlada-${version}-src"; owner = "AdaCore"; repo = "xmlada"; rev = "v${version}"; - sha256 = "00vljkvck951nj853v9sda5qbfm1mp8y2k61ja2595rmp8qcrazw"; + sha256 = "1pg6m0sfc1vwvd18r80jv2vwrsb2qgvyl8jmmrmpbdni0npx0kv3"; }; nativeBuildInputs = [ From 7f96c6f0378be9c3c346f6cf3823d54be664dcac Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 1 Nov 2021 12:57:38 +0100 Subject: [PATCH 209/359] gprbuild, gprbuild-boot: 21.0.0 -> 22.0.0 --- pkgs/development/tools/build-managers/gprbuild/boot.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gprbuild/boot.nix b/pkgs/development/tools/build-managers/gprbuild/boot.nix index 352cd0b137be..8291b4066ad1 100644 --- a/pkgs/development/tools/build-managers/gprbuild/boot.nix +++ b/pkgs/development/tools/build-managers/gprbuild/boot.nix @@ -7,13 +7,13 @@ }: let - version = "21.0.0"; + version = "22.0.0"; gprConfigKbSrc = fetchFromGitHub { name = "gprconfig-kb-${version}-src"; owner = "AdaCore"; repo = "gprconfig_kb"; - rev = "v${version}"; + rev = "v21.0.0"; # TODO(@sternenseemann): no 22.0.0 yet sha256 = "11qmzfdd0ipmhxl4k2hjidqc9i40bywrfkbiivd3lhscxca5pxpg"; }; in @@ -27,7 +27,7 @@ stdenv.mkDerivation { owner = "AdaCore"; repo = "gprbuild"; rev = "v${version}"; - sha256 = "1knpwasbrz6sxh3dhkc4izchcz4km04j77r4vxxhi23fbd8v1ynj"; + sha256 = "0rv0ha0kxzab5hhv0jzkjkmchhlvlx8fci8xalnngrgb9nd4r3v8"; }; nativeBuildInputs = [ From bde7dc1f81fe41752af488838fd98845f8be3201 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 1 Nov 2021 12:58:23 +0100 Subject: [PATCH 210/359] gnatcoll-*: 21.0.0 -> 22.0.0 --- pkgs/development/libraries/ada/gnatcoll/bindings.nix | 6 +++--- pkgs/development/libraries/ada/gnatcoll/core.nix | 4 ++-- pkgs/development/libraries/ada/gnatcoll/db.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ada/gnatcoll/bindings.nix b/pkgs/development/libraries/ada/gnatcoll/bindings.nix index 666989af0acc..1937231d3a02 100644 --- a/pkgs/development/libraries/ada/gnatcoll/bindings.nix +++ b/pkgs/development/libraries/ada/gnatcoll/bindings.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "gnatcoll-${component}"; - version = "21.0.0"; + version = "22.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-bindings"; rev = "v${version}"; - sha256 = "1214hf0m8iz289rjpxdiddnixj65l2xjwbcr7mq5ysbddmig5992"; + sha256 = "0wbwnd6jccwfd4jdxbnzhc0jhm8ad4phz6y9b1gk8adykkk6jcz4"; }; patches = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - python3 ${component}/setup.py build $buildFlags + python3 ${component}/setup.py build --prefix $out $buildFlags runHook postBuild ''; diff --git a/pkgs/development/libraries/ada/gnatcoll/core.nix b/pkgs/development/libraries/ada/gnatcoll/core.nix index f5f84342137e..690361bb1119 100644 --- a/pkgs/development/libraries/ada/gnatcoll/core.nix +++ b/pkgs/development/libraries/ada/gnatcoll/core.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gnatcoll-core"; - version = "21.0.0"; + version = "22.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-core"; rev = "v${version}"; - sha256 = "0jgs2299zfbr6jg5bxlhqizi60si2m8vw7zq6ns4yhr38qqdskqg"; + sha256 = "0fn28dp6bgpp1sshr09m1x85g2gx11xqkiy410hiicfyg5hamh1l"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ada/gnatcoll/db.nix b/pkgs/development/libraries/ada/gnatcoll/db.nix index d0512507db24..0c597f199c34 100644 --- a/pkgs/development/libraries/ada/gnatcoll/db.nix +++ b/pkgs/development/libraries/ada/gnatcoll/db.nix @@ -51,13 +51,13 @@ in stdenv.mkDerivation rec { pname = "gnatcoll-${component}"; - version = "21.0.0"; + version = "22.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-db"; rev = "v${version}"; - sha256 = "0fdfng3yfy645nlw8l3c2za0zkn6pdhkvyrw20wnjx4k26glgb6r"; + sha256 = "1c39yg13faadg5mzpq3s83rn24npmpc4yjj0cvj7kqwpqxci4m55"; }; patches = lib.optionals (component == "sqlite") [ From 68ba489d8e9be9587148126cb8843f840376fc09 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 1 Nov 2021 16:12:57 +0100 Subject: [PATCH 211/359] gnatcoll-*: get python binary name from derivation --- pkgs/development/libraries/ada/gnatcoll/bindings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ada/gnatcoll/bindings.nix b/pkgs/development/libraries/ada/gnatcoll/bindings.nix index 1937231d3a02..fb2a744be7fb 100644 --- a/pkgs/development/libraries/ada/gnatcoll/bindings.nix +++ b/pkgs/development/libraries/ada/gnatcoll/bindings.nix @@ -68,13 +68,13 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - python3 ${component}/setup.py build --prefix $out $buildFlags + ${python3.interpreter} ${component}/setup.py build --prefix $out $buildFlags runHook postBuild ''; installPhase = '' runHook preInstall - python3 ${component}/setup.py install --prefix $out + ${python3.interpreter} ${component}/setup.py install --prefix $out runHook postInstall ''; From b011b33e427cfedcd68d673549fb8e9f9850faf2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 8 Nov 2021 18:07:11 +0100 Subject: [PATCH 212/359] emacs.pkgs.ada-mode: use latest wisi By upgrading the AdaCore libraries to their 22.*.* versions and GNAT to version 11 we can finally upgrade wisi beyond 3.1.5 and probably (hopefully) stay on latest for some time. --- .../editors/emacs/elisp-packages/elpa-packages.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index b7f861a4cd7a..60fac91839a1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -36,14 +36,16 @@ self: let inherit (self) emacs; }; + # Use custom elpa url fetcher with fallback/uncompress + fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; + generateElpa = lib.makeOverridable ({ generated ? ./elpa-generated.nix }: let imported = import generated { callPackage = pkgs: args: self.callPackage pkgs (args // { - # Use custom elpa url fetcher with fallback/uncompress - fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; + inherit fetchurl; }); }; @@ -69,12 +71,7 @@ self: let dontUnpack = false; srcs = [ super.ada-mode.src - # ada-mode needs a specific version of wisi, check NEWS or ada-mode's - # package-requires to find the version to use. - (pkgs.fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar.lz"; - sha256 = "18dwcc0crds7aw466vslqicidlzamf8avn59gqi2g7y2x9k5q0as"; - }) + self.wisi.src ]; sourceRoot = "ada-mode-${self.ada-mode.version}"; From 38dd8c99b0b6b3b1e4af377e63bc201bed0b0139 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 22:42:42 +0100 Subject: [PATCH 213/359] urlwatch: 2.23 -> 2.24 --- pkgs/tools/networking/urlwatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index b1a374f0349d..705b2397c6ac 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1ryygy7lalmwnv9kc8q4920gkdx878izy33a5dgxb780sy2qq8pg"; + sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU="; }; propagatedBuildInputs = with python3Packages; [ From 19badcf76fab26e58fcaf856a3e5b78516a309a6 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Mon, 15 Nov 2021 18:58:44 -0300 Subject: [PATCH 214/359] mongodb-tools: 4.2.0 -> 100.5.1 --- pkgs/tools/misc/mongodb-tools/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 7949a82edc48..99809f779f25 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -16,9 +16,8 @@ let "mongostat" "mongofiles" "mongotop" - "mongoreplay" ]; - version = "4.2.0"; + version = "100.5.1"; in buildGoPackage { pname = "mongo-tools"; @@ -28,10 +27,10 @@ in buildGoPackage { subPackages = tools; src = fetchFromGitHub { - rev = "r${version}"; + rev = version; owner = "mongodb"; repo = "mongo-tools"; - sha256 = "0mjwvx0cxvb6zam6jyr3753xjnwcygxcjzqhhlsq0b3xnwws9yh7"; + sha256 = "sha256-Qxtb7DJOgrCUvoGVgmKh4qKS4duvEWwW9BLkdt5M5ZY="; }; nativeBuildInputs = [ pkg-config ]; From 519f1c78ace5156288eb09a35acd3da8cbbb31d0 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Mon, 15 Nov 2021 19:07:24 -0300 Subject: [PATCH 215/359] mongodb-tools: add bryanasdev000 as maintainer --- pkgs/tools/misc/mongodb-tools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 99809f779f25..a4dc2ba905c1 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -52,6 +52,7 @@ in buildGoPackage { meta = { homepage = "https://github.com/mongodb/mongo-tools"; description = "Tools for the MongoDB"; + maintainers = with lib.maintainers; [ bryanasdev000 ]; license = lib.licenses.asl20; }; } From 5a41f4072ffa85c5fec5972abfee64d084aa0262 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 23:10:02 +0100 Subject: [PATCH 216/359] python3Packages.flux-led: 0.24.21 -> 0.24.24 --- pkgs/development/python-modules/flux-led/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 25ad1128d66b..58f23fba931c 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux_led"; - version = "0.24.21"; + version = "0.24.24"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-d55FrCnEh6uS/2yL0HcaeqGjTzWmrwg6h5jKReyzJAw="; + sha256 = "sha256-99EHmhyc6lAjYPHFvvqnd5r8HeEEJM6W3VK0/yLsz7I="; }; propagatedBuildInputs = [ From 81658e43f3d3e3cbe5f4ae0a77951537b2e040fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 23:13:13 +0100 Subject: [PATCH 217/359] python3Packages.greeclimate: 0.12.4 -> 0.12.5 --- pkgs/development/python-modules/greeclimate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index d5cf044e4949..2fd95e676c96 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "0.12.4"; + version = "0.12.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = version; - sha256 = "sha256-8mrQTRR1erqo0oi9ltuiQX947qdvJLyF/nj80LvovV8="; + sha256 = "sha256-Lu6DxYrK3WgRC09QQXZLIgYSIaWydcEofNiA1PKP8Ek="; }; propagatedBuildInputs = [ From a0def2f9cabc3ea5de43b23fb615243a61577307 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 23:17:52 +0100 Subject: [PATCH 218/359] python3Packages.pwntools: 4.6.0 -> 4.7.0 --- pkgs/development/python-modules/pwntools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index d0ea1b198490..6241a7d86e46 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -27,12 +27,12 @@ let debuggerName = lib.strings.getName debugger; in buildPythonPackage rec { - version = "4.6.0"; + version = "4.7.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FWnmE+XgbtRztgo/xxN2xK1bz1YhbqdywlrQIANHAww="; + sha256 = "sha256-dDiOKGdeehkp92PfWhzsaj1YlkEEm2z0drscVuxQqI4="; }; postPatch = '' From f0358795ff55575c58346fde261064ddbfea1680 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 15 Nov 2021 21:42:56 +0000 Subject: [PATCH 219/359] python3Packages.johnnycanencrypt: fix build with newer maturin --- .../python-modules/johnnycanencrypt/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index a8ce23d371f8..2f7921374e75 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -13,6 +13,7 @@ , pytestCheckHook , pythonOlder , PCSC +, libiconv }: buildPythonPackage rec { @@ -55,7 +56,10 @@ buildPythonPackage rec { buildInputs = [ pcsclite nettle - ] ++ lib.optionals stdenv.isDarwin [ PCSC ]; + ] ++ lib.optionals stdenv.isDarwin [ + PCSC + libiconv + ]; # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) doCheck = false; @@ -70,6 +74,8 @@ buildPythonPackage rec { # for compatibility with maturin 0.9.0. postPatch = '' sed '/project-url = /d' -i Cargo.toml + substituteInPlace pyproject.toml \ + --replace 'manylinux = "off"' 'skip-auditwheel = true' ''; preCheck = '' From 58cbee06b84c090cd142fc244a2038e8316c684e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Nov 2021 23:34:47 +0100 Subject: [PATCH 220/359] python3Packages.python-socketio: 5.4.1 -> 5.5.0 --- pkgs/development/python-modules/python-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index cd41899c5810..635f9cd13daf 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.4.1"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-qmC7AL2ZNB0D5p3c8ozacNMKc2COzYzPJfz6KXwWsd0="; + sha256 = "sha256-K5rs3UEGN1BvWDDfJE9/dPDLsZ4EGSsEf6PXodvc2Bg="; }; propagatedBuildInputs = [ From edfba44b90f62252b3086adda60d697595d7b5b8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 15 Nov 2021 23:15:01 +0100 Subject: [PATCH 221/359] gprbuild, gprbuild-boot: bump gprconfig_kb to 22.0.0 gprconfig_kb finally also saw a new release, so it matches the gprbuild version again. --- pkgs/development/tools/build-managers/gprbuild/boot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gprbuild/boot.nix b/pkgs/development/tools/build-managers/gprbuild/boot.nix index 8291b4066ad1..060a74314bd4 100644 --- a/pkgs/development/tools/build-managers/gprbuild/boot.nix +++ b/pkgs/development/tools/build-managers/gprbuild/boot.nix @@ -13,8 +13,8 @@ let name = "gprconfig-kb-${version}-src"; owner = "AdaCore"; repo = "gprconfig_kb"; - rev = "v21.0.0"; # TODO(@sternenseemann): no 22.0.0 yet - sha256 = "11qmzfdd0ipmhxl4k2hjidqc9i40bywrfkbiivd3lhscxca5pxpg"; + rev = "v${version}"; + sha256 = "0zvd0v5cz0zd1hfnhdd91c6sr3bbv1w715j2gvzx3vxlpx1c2q4n"; }; in From badb5a1af29cfcf0b22064c4610c7aecd69cc637 Mon Sep 17 00:00:00 2001 From: libjared Date: Wed, 27 Oct 2021 11:55:29 -0500 Subject: [PATCH 222/359] fhs-userenv-bubblewrap: add ca-certificates to fhs In Arch Linux, many of the certs in /etc/ssl/certs/ are symlinks to /etc/ca-certificates/extracted/. These symlinks are broken in the FHS env. This commit adds ca-certificates to the list of bind mounts, which fixes connection issues with Steam, wget, etc on Arch Linux hosts. --- pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 23718bf636c6..4773a1e2cf6e 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -66,6 +66,7 @@ let "asound.conf" # SSL "ssl/certs" + "ca-certificates" "pki" ]; in concatStringsSep "\n " From e31f392946cfce8a6ded8716f438bf670b0ce0da Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 9 Nov 2021 21:42:38 +0100 Subject: [PATCH 223/359] llvm_13: fix cross-compilation apply the same fix as used in 517d2b963f35abbca8ccc364141bc5f2b4e92974 --- pkgs/development/compilers/llvm/13/llvm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index a15bcc872a6d..957f29e44994 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -46,7 +46,8 @@ in stdenv.mkDerivation (rec { buildInputs = [ libxml2 libffi ] ++ optional enablePFM libpfm; # exegesis - propagatedBuildInputs = [ ncurses zlib ]; + propagatedBuildInputs = optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ ncurses ] + ++ [ zlib ]; checkInputs = [ which ]; From c3e221c6a1846d07255f14332fd02b54c19293d0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 16 Nov 2021 00:43:14 +0100 Subject: [PATCH 224/359] Fix evaluation after #143994 --- pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix | 2 +- pkgs/development/ocaml-modules/janestreet/bin_prot.nix | 2 +- pkgs/development/ocaml-modules/janestreet/core_bench.nix | 2 +- pkgs/development/ocaml-modules/janestreet/fieldslib.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-assert.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-bench.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-compare.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-expect.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-here.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-jane.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-let.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix | 2 +- pkgs/development/ocaml-modules/janestreet/sexplib.nix | 2 +- pkgs/development/ocaml-modules/janestreet/typerep.nix | 2 +- pkgs/development/ocaml-modules/janestreet/variantslib.nix | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix index 15f391342bdb..c2c51632b9f8 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -3,7 +3,7 @@ ppx_jane, sexplib, typerep, variantslib}: buildOcamlJane { - name = "async_rpc_kernel"; + pname = "async_rpc_kernel"; hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw"; propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix index 5f3c2ab83ff4..d90d91cc229e 100644 --- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -1,7 +1,7 @@ {lib, buildOcamlJane, type_conv}: buildOcamlJane { - name = "bin_prot"; + pname = "bin_prot"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.02"; hash = "0jlarpfby755j0kikz6vnl1l6q0ga09b9zrlw6i84r22zchnqdsh"; diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix index 52a9350eeeac..8c318f03b05b 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -6,7 +6,7 @@ }: buildOcamlJane { - name = "core_bench"; + pname = "core_bench"; hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj"; propagatedBuildInputs = [ core core_extended textutils ]; diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix index 6ed34f2a28c6..15dee416b643 100644 --- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -1,7 +1,7 @@ { lib, type_conv, buildOcamlJane }: buildOcamlJane { - name = "fieldslib"; + pname = "fieldslib"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix index 8f4eb7e41510..24ca4bfa9fa0 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix @@ -2,7 +2,7 @@ ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}: buildOcamlJane { - name = "ppx_assert"; + pname = "ppx_assert"; hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4"; propagatedBuildInputs = [ ppx_compare ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix index 2aa1b208d503..d20be4fe1557 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_inline_test, ppx_tools}: buildOcamlJane { - name = "ppx_bench"; + pname = "ppx_bench"; minimumSupportedOcamlVersion = "4.02"; hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix index 2dc64497ca23..6405b6928237 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv, bin_prot}: buildOcamlJane { - name = "ppx_bin_prot"; + pname = "ppx_bin_prot"; hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix index 103f17c455ea..a0c7c548baad 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_tools, ppx_type_conv}: buildOcamlJane { - name = "ppx_compare"; + pname = "ppx_compare"; hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459"; propagatedBuildInputs = [ppx_core ppx_driver ppx_tools ppx_type_conv ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix index 785cdbc31c07..e95d46e7281b 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}: buildOcamlJane { - name = "ppx_custom_printf"; + pname = "ppx_custom_printf"; hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_sexp_conv ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix index edb73814704f..8591117abb67 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv}: buildOcamlJane { - name = "ppx_enumerate"; + pname = "ppx_enumerate"; hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix index 7506e09e30e0..87675f75e50b 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix @@ -4,7 +4,7 @@ ppx_variants_conv, re, sexplib, variantslib, fieldslib}: buildOcamlJane { - name = "ppx_expect"; + pname = "ppx_expect"; hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx"; propagatedBuildInputs = [ ppx_assert ppx_compare ppx_core ppx_custom_printf ppx_driver diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix index 857e85f8f03a..756db313c266 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv}: buildOcamlJane { - name = "ppx_fields_conv"; + pname = "ppx_fields_conv"; hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix index d9c7de65347e..f55b6725c23d 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver}: buildOcamlJane { - name = "ppx_here"; + pname = "ppx_here"; hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw"; propagatedBuildInputs = [ ppx_core ppx_driver ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix index 0b9bb9838947..c09538d6f1df 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_tools}: buildOcamlJane { - name = "ppx_inline_test"; + pname = "ppx_inline_test"; hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix index e6c51bebd52c..0dc36f890bc3 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix @@ -6,7 +6,7 @@ ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}: buildOcamlJane { - name = "ppx_jane"; + pname = "ppx_jane"; hash = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9"; propagatedBuildInputs = [ ppx_assert ppx_bench ppx_bin_prot ppx_compare ppx_custom_printf diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix index 49333fb0e865..c43685065700 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver}: buildOcamlJane { - name = "ppx_let"; + pname = "ppx_let"; hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467"; propagatedBuildInputs = [ ppx_core ppx_driver ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix index 1ee00ecfa70f..e25ad6c28673 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools}: buildOcamlJane { - name = "ppx_optcomp"; + pname = "ppx_optcomp"; hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd"; propagatedBuildInputs = [ ppx_core ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix index 9afc27e8a5dd..32262223205c 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_tools}: buildOcamlJane { - name = "ppx_pipebang"; + pname = "ppx_pipebang"; hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index 537a5941a9fd..a56bbc7b3e4f 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv, sexplib}: buildOcamlJane { - name = "ppx_sexp_conv"; + pname = "ppx_sexp_conv"; hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix index 714c3356ea0c..2ea63cc3edc5 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: buildOcamlJane { - name = "ppx_sexp_message"; + pname = "ppx_sexp_message"; hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix index 5bfbd185cee9..eaaf04ffe6c1 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix @@ -2,7 +2,7 @@ ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: buildOcamlJane { - name = "ppx_sexp_value"; + pname = "ppx_sexp_value"; hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix index 842e90276b73..b6b7fc85c96b 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv, typerep}: buildOcamlJane { - name = "ppx_typerep_conv"; + pname = "ppx_typerep_conv"; hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix index a2c8de8a8deb..5c53eb92f294 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -2,7 +2,7 @@ ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}: buildOcamlJane { - name = "ppx_variants_conv"; + pname = "ppx_variants_conv"; hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ]; diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix index b0b2ce3a451e..e24d9565c813 100644 --- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -2,7 +2,7 @@ buildOcamlJane { minimumSupportedOcamlVersion = "4.02"; - name = "sexplib"; + pname = "sexplib"; version = "113.33.03"; hash = "1klar4qw4s7bj47ig7kxz2m4j1q3c60pfppis4vxrxv15r0kfh22"; diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix index 41e845b362ea..692c2d2286fb 100644 --- a/pkgs/development/ocaml-modules/janestreet/typerep.nix +++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -1,7 +1,7 @@ {lib, buildOcamlJane, type_conv}: buildOcamlJane { - name = "typerep"; + pname = "typerep"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.00"; diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix index 053ab412f88d..dfb330f49d58 100644 --- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -1,7 +1,7 @@ {lib, buildOcamlJane, type_conv}: buildOcamlJane { - name = "variantslib"; + pname = "variantslib"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.00"; From d8b017f3d876691fc8c4b951ad6cfe85bcd5cd3f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 15 Nov 2021 19:01:20 -0500 Subject: [PATCH 225/359] rivet: add a patch fix build --- pkgs/development/libraries/physics/rivet/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index b041dd483e1b..9739530f8ba3 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo="; }; + patches = [ + # Fixes build + (fetchpatch { + name = "rivet-3.1.5-namespace-fix.patch"; + url = "https://gitlab.com/hepcedar/rivet/-/commit/17a99b38b52e65a4a3fd6289124bd9dd874c30bf.diff"; + sha256 = "sha256-OknqghpMMB5nRHeeRc2ddxybhnkVGRB1x8jfOjrkyms="; + }) + ]; + latex = texlive.combine { inherit (texlive) scheme-basic collection-pstricks From f1c183531161fbc5c4d0f805b88a1a51d294760a Mon Sep 17 00:00:00 2001 From: pinn3 Date: Tue, 16 Nov 2021 02:33:39 +0100 Subject: [PATCH 226/359] fennel: 0.10.0 -> 1.0.0 https://git.sr.ht/~technomancy/fennel/tree/1.0.0/changelog.md#100--2021-11-14 Resolves #146076 --- pkgs/development/compilers/fennel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fennel/default.nix b/pkgs/development/compilers/fennel/default.nix index bae976a9b68f..ec6b3d619e1c 100644 --- a/pkgs/development/compilers/fennel/default.nix +++ b/pkgs/development/compilers/fennel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fennel"; - version = "0.10.0"; + version = "1.0.0"; src = fetchFromSourcehut { owner = "~technomancy"; repo = pname; rev = version; - sha256 = "sha256-/xCnaDNZJTBGxIgjPUVeEyMVeRWg8RCNuo5nPpLrJXY="; + sha256 = "sha256-HhxFTWC1gBY76pQzhn6EdgYHpYQr9zkUox0r4YC7mTQ="; }; nativeBuildInputs = [ installShellFiles ]; From cd58f44937a70b73447f464f1cb5a64badc78640 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 16 Nov 2021 10:06:24 +0800 Subject: [PATCH 227/359] nixos/pantheon: cleanup FAQ section --- nixos/modules/services/x11/desktop-managers/pantheon.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index 70cd7410c1e0..64933349e798 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -107,12 +107,6 @@ switchboard-with-plugs.override { AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. The Flatpak backend will not work before flag for Flatpak-only is provided. See this issue. - - To use AppCenter on NixOS, add pantheon.appcenter to , enable Flatpak support and optionally add the appcenter Flatpak remote: - - -$ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo - From 2681282aa253d50c89e3ccbef193e46c1a2aa024 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 16 Nov 2021 02:08:50 +0000 Subject: [PATCH 228/359] =?UTF-8?q?krane:=202.3.0=20=E2=86=92=202.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/krane/Gemfile.lock | 16 +++++------ .../networking/cluster/krane/gemset.nix | 28 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 7cc11b1af60f..c70d4b79e144 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -55,13 +55,13 @@ GEM http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) jsonpath (0.9.9) multi_json to_regexp (~> 0.2.1) jwt (2.3.0) - krane (2.3.0) + krane (2.3.1) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -77,15 +77,15 @@ GEM recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) memoist (0.16.2) - mime-types (3.3.1) + mime-types (3.4.0) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0901) + mime-types-data (3.2021.1115) minitest (5.14.4) multi_json (1.15.0) multipart-post (2.1.1) netrc (0.11.0) - oj (3.13.8) - os (1.1.1) + oj (3.13.9) + os (1.1.4) public_suffix (4.0.6) rake (13.0.6) recursive-open-struct (1.1.3) @@ -108,7 +108,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS ruby @@ -117,4 +117,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.2.20 + 2.2.24 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index 13163c193e36..a9a8620911d9 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -244,10 +244,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; type = "gem"; }; - version = "1.8.10"; + version = "1.8.11"; }; jsonpath = { dependencies = ["multi_json" "to_regexp"]; @@ -276,10 +276,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r4sfyapdqcgqns4skxwkxd9v7a4f0h7y7zrgyz7za1p56jmx9sr"; + sha256 = "0k1lwg0d2phs9n9zdx7nv5rv2p2vipm9jgzalr8x9nrq1is6wgvr"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; @@ -308,20 +308,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + sha256 = "1wvbwlkf6i17xvxx70cffw26ijvcc400vfhpbnvd8mmx556cnb4g"; type = "gem"; }; - version = "3.3.1"; + version = "3.4.0"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv"; + sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27"; type = "gem"; }; - version = "3.2021.0901"; + version = "3.2021.1115"; }; minitest = { groups = ["default"]; @@ -368,20 +368,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wk5vk0py65aqp3xrs8s8qkj8pw6xny5z5p9dx16qdx6j3zw5a6g"; + sha256 = "1hcmczbp9afxijzg0gvp9milyzk15phfmbpmmsj5ppmziwkdls16"; type = "gem"; }; - version = "3.13.8"; + version = "3.13.9"; }; os = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; + sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.4"; }; public_suffix = { groups = ["default"]; @@ -512,9 +512,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.1"; }; } From 55bb949a2ef305ed6aff95e69a6c04036185eed0 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 16 Nov 2021 03:40:37 +0100 Subject: [PATCH 229/359] seafile-client: 8.0.4 -> 8.0.5 - minor bugfix update - no security fixes - changelog: https://github.com/haiwen/seafile-client/releases/tag/v8.0.5 --- pkgs/applications/networking/seafile-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index b0975c56b059..2c134f84a9f6 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "8.0.4"; + version = "8.0.5"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-HIgIcw4Y/NXidCBwRMrdKojlqO8CJO+6N7s7PdBx4YQ="; + sha256 = "1p9wkvnr3km829gy84b1w1pv72pany5vr3r7ydz1c0aqrp0snfhx"; }; nativeBuildInputs = [ pkg-config cmake ]; From 9928e040e74322639fcebf87f58fb88780bd2ba4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 16 Nov 2021 03:40:59 +0100 Subject: [PATCH 230/359] seafile-client: add greizgh as maintainer due to their own request --- pkgs/applications/networking/seafile-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 2c134f84a9f6..7d5d414a4f97 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -29,6 +29,6 @@ mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ schmittlauch ]; + maintainers = with maintainers; [ schmittlauch greizgh ]; }; } From e0c6f91e6d855b49df94892ff4c831ea9bd67884 Mon Sep 17 00:00:00 2001 From: flurie Date: Mon, 15 Nov 2021 23:42:10 -0500 Subject: [PATCH 231/359] bpb: fix build on darwin --- pkgs/tools/security/bpb/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/bpb/default.nix b/pkgs/tools/security/bpb/default.nix index 121c5674c08c..4d601aac1553 100644 --- a/pkgs/tools/security/bpb/default.nix +++ b/pkgs/tools/security/bpb/default.nix @@ -2,6 +2,7 @@ , lib , rustPlatform , fetchFromGitHub +, Security }: rustPlatform.buildRustPackage rec { @@ -20,6 +21,8 @@ rustPlatform.buildRustPackage rec { # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP = 1; + buildInputs = lib.optional stdenv.isDarwin Security; + meta = with lib; { description = "Tool to automatically sign git commits, replacing gpg for that purpose"; homepage = "https://github.com/withoutboats/bpb"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e3e2b65bb0b..167cd3b8d2db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2228,7 +2228,7 @@ with pkgs; bozohttpd = callPackage ../servers/http/bozohttpd { }; bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; - bpb = callPackage ../tools/security/bpb { }; + bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; }; bpytop = callPackage ../tools/system/bpytop { }; From cd8f237c0c4eff99b30248ab647a78347ea3f7de Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 13 Nov 2021 08:14:17 +1000 Subject: [PATCH 232/359] clusterctl: init at 1.0.1 --- .../networking/cluster/clusterctl/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/networking/cluster/clusterctl/default.nix diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix new file mode 100644 index 000000000000..752c9b3c6172 --- /dev/null +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "clusterctl"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "cluster-api"; + rev = "v${version}"; + sha256 = "sha256-EkBZZUkr1u0u75WDDFAdLLpS01+3+eyXpu4HRg2Q780="; + }; + + vendorSha256 = "sha256-VO1Z4NUWrd4JuFYFg0a01psqoIM8ps3vKd0djR5OELU="; + + subPackages = [ "cmd/clusterctl" ]; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = let t = "sigs.k8s.io/cluster-api/version"; in [ + "-X ${t}.gitMajor=${lib.versions.major version}" + "-X ${t}.gitMinor=${lib.versions.minor version}" + "-X ${t}.gitVersion=v${version}" + ]; + + postInstall = '' + # errors attempting to write config to read-only $HOME + export HOME=$(mktemp -d) + + installShellCompletion --cmd clusterctl \ + --bash <($out/bin/clusterctl completion bash) \ + --zsh <($out/bin/clusterctl completion zsh) + ''; + + meta = with lib; { + description = "Kubernetes cluster API tool"; + homepage = "https://cluster-api.sigs.k8s.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e3e2b65bb0b..efc67fa3c0fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2459,6 +2459,8 @@ with pkgs; clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; + clusterctl = callPackage ../applications/networking/cluster/clusterctl { }; + coloredlogs = with python3Packages; toPythonApplication coloredlogs; colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; From 79c28d614deabbb49d3a9fa5fa3b20c19bde6c4a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 15 Nov 2021 22:29:58 -0800 Subject: [PATCH 233/359] roon-server: add alsa-lib to LD_LIBRARY_PATH This allows RAATServer to fully identify ALSA devices. --- pkgs/servers/roon-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index ffb4bc0c7e82..96b10829d865 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { makeWrapper "$dotnetDir/$binName" "${binPath}" \ --add-flags "$binDir/$binName.dll" \ --argv0 "$binName" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ icu66 openssl ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib icu66 ffmpeg openssl ]}" \ --prefix PATH : "$dotnetDir" \ --prefix PATH : "${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]}" \ --run "cd $binDir" \ From 6ece9b660d50afcd03bc251007655f72601351b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 08:49:25 +0100 Subject: [PATCH 234/359] python3Packages.pytibber: 0.20.0 -> 0.21.0 --- .../development/python-modules/pytibber/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 1ca78b51e983..9b3668b59783 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.20.0"; + version = "0.21.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - sha256 = "sha256-q7DNRCJrt4B/u7QV4MocxmlfEdLmJMP7umv3+PJjIoE="; + sha256 = "sha256-lUe79VHlK/2/1SZfC+Ha+27NUoIKoTlqn75XA/mPCNU="; }; propagatedBuildInputs = [ @@ -35,12 +36,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + pytestFlagsArray = [ + "test/test.py" + ]; # tests access network doCheck = false; - pythonImportsCheck = [ "tibber" ]; + pythonImportsCheck = [ + "tibber" + ]; meta = with lib; { description = "Python library to communicate with Tibber"; From a153ef57e0a36f5fc908ab0e7d65f0fb4ac667d4 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 16 Nov 2021 07:53:28 +0000 Subject: [PATCH 235/359] vaultwarden: fix the build for rustc 1.56 rustc 1.55 was ignoring vaultwarden's `rust-version = 1.57`, causing the build to succeed. rustc 1.56 was erroring out because it does not ignore the minimum `rust-version`. Patch out the `rust-version` because we do not really need 1.57; rustc 1.56 with RUSTC_BOOTSTRAP=1 produces a working vaultwarden. This fixes https://github.com/NixOS/nixpkgs/issues/146215 --- pkgs/tools/security/vaultwarden/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 2d2816dac0f0..6bdf428b199b 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -19,12 +19,20 @@ in rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ViXpoPkBznB0o/dc/l1r3m0y+z2w58wqlU8/cg8u7tI="; + postPatch = '' + # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working + # vaultwarden when using RUSTC_BOOTSTRAP=1 + sed -ri 's/^rust-version = .*//g' Cargo.toml + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ] ++ optional (dbBackend == "mysql") libmysqlclient ++ optional (dbBackend == "postgresql") postgresql; + # vaultwarden depends on rocket v0.5.0-dev, which requires nightly features. + # This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed. RUSTC_BOOTSTRAP = 1; cargoBuildFlags = [ featuresFlag ]; @@ -42,6 +50,6 @@ in rustPlatform.buildRustPackage rec { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/vaultwarden"; license = licenses.gpl3Only; - maintainers = with maintainers; [ msteen ]; + maintainers = with maintainers; [ msteen ivan ]; }; } From 09cab6323b5de0f06344e8cad03e4ccc2a869059 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 Nov 2021 09:24:32 +0100 Subject: [PATCH 236/359] home-assistant: 2021.11.3 -> 2021.11.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dbd447a41f8a..37b078adefa1 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.11.3"; + version = "2021.11.4"; 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 c98b054e52f6..59d2ee364b23 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -152,7 +152,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.11.3"; + hassVersion = "2021.11.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -169,7 +169,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "sha256-HycMb29niuUp7flRdWgrKSOcnr0l3PqjULCrgrwLrFw="; + sha256 = "sha256-411oqzC8VTD7CM9vM/M3m4zW0Ygf2g2hoAXAxGBv7iw="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 867e614f97623ed7d75857fc9e4cfde19b206e89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Oct 2021 00:27:22 +0200 Subject: [PATCH 237/359] nodePackages.node2nix: backport patch to reduce derivation size --- pkgs/development/node-packages/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index ea5ab3eadae8..45c566b0d601 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -243,6 +243,11 @@ let url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch"; sha256 = "0sif7803c9g6gjmmdniw5qxrq5igiz9nqdmdrcf1hxfi5x43a32h"; }) + # Extract common logic from composePackage to a shell function + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/e4c951971df6c9f9584c7252971c13b55c369916.patch"; + sha256 = "0w8fcyr12g2340rn06isv40jkmz2khmak81c95zpkjgipzx7hp7w"; + }) ]; }; postInstall = '' From 5933da24d2d0ea63c1dccbb70a34756045a1ad0d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 16 Nov 2021 08:39:54 +0000 Subject: [PATCH 238/359] mp3blaster: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: nmixer.cc:219:26: error: format not a string literal and no format arguments [-Werror=format-security] 219 | mvwprintw(mixwin, my_y - 1, my_x, (char*)source); | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/applications/audio/mp3blaster/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index d7dd5f102dbd..0d65fe813ec1 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libvorbis, SDL }: stdenv.mkDerivation rec { pname = "mp3blaster"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/stragulus/mp3blaster/pull/8 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/stragulus/mp3blaster/commit/62168cba5eaba6ffe56943552837cf033cfa96ed.patch"; + sha256 = "088l27kl1l58lwxfnw5x2n64sdjy925ycphni3icwag7zvpj0xz1"; + }) + ]; + buildInputs = [ ncurses libvorbis From d8b840f9544227513666b38db7f3abf0b4220a2e Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Tue, 16 Nov 2021 09:57:38 +0100 Subject: [PATCH 239/359] visidata: 2.7 -> 2.7.1 --- pkgs/applications/misc/visidata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 79a0758a2a5b..6c1f035dfef6 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -25,13 +25,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.7"; + version = "2.7.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "0b2h9vy0fch0bk0b33h8p4ssk3a25j67sfn0yvmxhbqjdmhlwv4h"; + sha256 = "13s1541n1sr2rkfk1qpsm61y2q773x6fs4cwin660qq4bzmgymhy"; }; propagatedBuildInputs = [ @@ -90,7 +90,7 @@ buildPythonApplication rec { meta = { description = "Interactive terminal multitool for tabular data"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.raskin ]; + maintainers = with lib.maintainers; [ raskin markus1189 ]; homepage = "http://visidata.org/"; changelog = "https://github.com/saulpw/visidata/blob/v${version}/CHANGELOG.md"; }; From 21f640f93ab5d2bbdf1bd7a3ca5fa65f0f824ae8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 16 Nov 2021 12:30:31 +0300 Subject: [PATCH 240/359] gmid: fix cross-compilation --- pkgs/servers/gemini/gmid/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix index f06498d583b5..803945c7a234 100644 --- a/pkgs/servers/gemini/gmid/default.nix +++ b/pkgs/servers/gemini/gmid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bison, libressl, libevent }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, libressl, libevent }: stdenv.mkDerivation rec { pname = "gmid"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-BBd0AL5jRRslxzDnxcTZRR+8J5D23NAQ7mp9K+leXAQ="; }; + patches = [ + # Fix cross-compilation + (fetchpatch { + url = "https://github.com/omar-polo/gmid/commit/eb77afa8d308a2f4f422df2ff19f023b5b2cc591.patch"; + sha256 = "sha256-rTTZUpfXOg7X0Ad0Y9evyU7k+aVYpJ0t9SEkNA/sSdk="; + }) + ]; + nativeBuildInputs = [ bison ]; buildInputs = [ libressl libevent ]; From 0d3fcab2a0611ec88ee69e9702c85ef37bc5a923 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 14 Nov 2021 18:33:11 +0100 Subject: [PATCH 241/359] blocksat-cli: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/blocksat-cli/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index 624d4f490e3c..1bba2b30be55 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "blocksat-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g/V1//Jo8wnoOHEotF2ElVm+vzTIwZ6EzssJg6WJw6g="; + sha256 = "96ec5e548dcdb71ada75727d76b34006fe5f6818bd89cf982e15616d41889603"; }; propagatedBuildInputs = [ @@ -35,11 +35,15 @@ buildPythonPackage rec { pytestFlagsArray = [ # disable tests which require being connected to the satellite "--ignore=blocksatcli/test_satip.py" + "--ignore=blocksatcli/api/test_listen.py" + "--ignore=blocksatcli/api/test_msg.py" "--ignore=blocksatcli/api/test_net.py" # disable tests which require being online "--ignore=blocksatcli/api/test_order.py" ]; + pythonImportsCheck = [ "blocksatcli" ]; + meta = with lib; { description = "Blockstream Satellite CLI"; homepage = "https://github.com/Blockstream/satellite"; From 0f7a65dcbe9878d93ab1407ce6cf58d00c5c41bb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 16 Nov 2021 10:38:27 +0100 Subject: [PATCH 242/359] python3Packages.zfec: add pythonImportsCheck --- pkgs/development/python-modules/zfec/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 391e1656749a..1cb2780cc948 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { sed -i -e '/argparse/d' setup.py ''; + pythonImportsCheck = [ "zfec" ]; + meta = with lib; { homepage = "https://github.com/tahoe-lafs/zfec"; description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; From a018a794deff4ae9cd4b2e0a21433bd57b0b3eb2 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 21 Oct 2021 13:00:14 +0200 Subject: [PATCH 243/359] dotnetCorePackages:*_3_1: 3.1.19 -> 3.1.21 --- pkgs/development/compilers/dotnet/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 62a08b145bfb..cdc1c23ae05a 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -24,29 +24,29 @@ rec { # v3.1 (LTS) aspnetcore_3_1 = buildAspNetCore { - version = "3.1.19"; + version = "3.1.21"; sha512 = { - x86_64-linux = "c9234b5dba62c88b5f7e869c7dc7fc94d9cd7b300b0ed2461132c32762c0d3d1f23a1ee0432264704fefeb35f77ca7d1dd41910daee84df9aa325559a43cfc71"; - aarch64-linux = "4cba9b43a9beb977bb50c290c0e7cbbf42664538609079dd1bc0e925a0cc4a1f76748492d4d0d402610ae910e878449bab5d797a9f12e63399585b11f9bfbee9"; - x86_64-darwin = "a30959156c818d8d93df398742a70a050decfddbd777ddd6adb4d3c1aa5ed129545eab8f0aa3f12be991611dbc3582336ed747f3075906a2a29a1cd30ef3ad90"; + x86_64-linux = "f59252166dbfe11a78373226222d6a34484b9132e24283222aea8a950a5e9657da2e4d4e9ff8cbcc2fd7c7705e13bf42a31232a6012d1e247efc718e3d8e2df1"; + aarch64-linux = "f3d014431064362c29361e3d3b33b7aaaffe46e22f324cd42ba6fc6a6d5b712153e9ec82f10cf1bee416360a68fb4520dc9c0b0a8860316c4c9fce75f1adae80"; + x86_64-darwin = "477912671e21c7c61f5666323ad9e9c246550d40b4d127ccc71bcb296c86e07051e3c75251beef11806f198eebd0cd4b36790950f24c730dc6723156c0dc11b5"; }; }; runtime_3_1 = buildNetRuntime { - version = "3.1.19"; + version = "3.1.21"; sha512 = { - x86_64-linux = "2cf268cc13bb4739203a18a9160aac58f2088e8ec275b1f7ef2fe2b74bc16edfdfbeb886a74fc9421edbf2899fa9e3ee7ea2734a83b1800b4a9848fb7e10bbbe"; - aarch64-linux = "c6a97bc6e2f2644d57d3fa5a512274b7129956371b07e0f39f734875b15bc0c178a9b068e2fa3e06e8a3a6696163ad1856f5d87a689612211ee02e589138110e"; - x86_64-darwin = "41ae9bc0212247c4721f41be384dae620971360c09fa31430f062c2ab851f10506ef620bf63ee414819b5dd20ddae8a1ce581bbe0d699378b244375e0822bd34"; + x86_64-linux = "cc4b2fef46e94df88bf0fc11cb15439e79bd48da524561dffde80d3cd6db218133468ad2f6785803cf0c13f000d95ff71eb258cec76dd8eb809676ec1cb38fac"; + aarch64-linux = "80971125650a2fa0163e39a2de98bc2e871c295b723559e6081a3ab59d99195aa5b794450f8182c5eb4e7e472ca1c13340ef1cc8a5588114c494bbb5981f19c4"; + x86_64-darwin = "049257f680fe7dfb8e98a2ae4da6aa184f171b04b81c506e7a83509e46b1ea81ea6000c4d01c5bed46d5495328c6d9a0eeecbc0dc7c2c698296251fb04b5e855"; }; }; sdk_3_1 = buildNetSdk { - version = "3.1.413"; + version = "3.1.415"; sha512 = { - x86_64-linux = "2a0824f11aba0b79d3f9a36af0395649bc9b4137e61b240a48dccb671df0a5b8c2086054f8e495430b7ed6c344bb3f27ac3dfda5967d863718a6dadeca951a83"; - aarch64-linux = "39f198f07577faf81f09ca621fb749d5aac38fc05e7e6bd6226009679abc7d001454068430ddb34b320901955f42de3951e2707e01bce825b5216df2bc0c8eca"; - x86_64-darwin = "2c8e5b7e578aa36d40946d0deea93dff72a68ebb5504b1593d86d63022be8b65b284cf2adad711a926b7170fc865ac4cb38531a4f2ef087e07147e67300e86b8"; + x86_64-linux = "df7a6d1abed609c382799a8f69f129ec72ce68236b2faecf01aed4c957a40a9cfbbc9126381bf517dff3dbe0e488f1092188582701dd0fef09a68b8c5707c747"; + aarch64-linux = "7a5b9922988bcbde63d39f97e283ca1d373d5521cca0ab8946e2f86deaef6e21f00244228a0d5d8c38c2b9634b38bc7338b61984f0e12dd8fdb8b2e6eed5dd34"; + x86_64-darwin = "e26529714021d1828687c404dd0800c61eb267c9da62ee629b91f5ffa8af77d156911bd3c1a58bf11e5c589cfe4a852a95c14a7cb25f731e92a484348868964d"; }; }; From c94cfb48dfae36f447a2334e0e5aa1d21a684adb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 21 Oct 2021 13:01:07 +0200 Subject: [PATCH 244/359] dotnetCorePackages.*_5*: 5.0.10 -> 5.0.12 --- pkgs/development/compilers/dotnet/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index cdc1c23ae05a..c57a9191568e 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -53,29 +53,29 @@ rec { # v5.0 (Current) aspnetcore_5_0 = buildAspNetCore { - version = "5.0.10"; + version = "5.0.12"; sha512 = { - x86_64-linux = "60fd41e42e07a96416baf2dd7ea8112a7c7d510bc6f4656274981777d2cf5e824cd519924cdf06215338d74e78cdc7801e1b24c39b3d67cd2d1b3c6fee6474a9"; - aarch64-linux = "e86dd5b26e5add2f35c3a029c78e3c447755a319c105d371da297f66db5eff260f3f55ccf23e508e9a33536876708ac2e358dc62a4a28518f88df3a9131adb01"; - x86_64-darwin = "124abacba27e26249d265d51fd7abc7ab0bed9859ce3a6a8e4f193031bff3f28dd81af639542b0cc043a3957e2a90a2f5b41c6ec6b4a50a4cb8fce12bc8654f9"; + x86_64-linux = "0529f23ffa651ac2c2807b70d6e5034f6ae4c88204afdaaa76965ef604d6533f9440d68d9f2cdd3a9f2ca37e9140e6c61a9f9207d430c71140094c7d5c33bf79"; + aarch64-linux = "70570177896943613f0cddeb046ffccaafb1c8245c146383e45fbcfb27779c70dff1ab22c2b13a14bf096173c9279e0a386f61665106a3abb5f623b50281a652"; + x86_64-darwin = "bd9e7dd7f48c220121dde85b3acc4ce7eb2a1944d472f9340276718ef72d033f05fd9a62ffb9de93b8e7633843e731ff1cb5e8c836315f7571f519fdb0a119e1"; }; }; runtime_5_0 = buildNetRuntime { - version = "5.0.10"; + version = "5.0.12"; sha512 = { - x86_64-linux = "421b00d5751381e6bf829dcba8fa0d781f0efd065be492739d60a4bef2b7b362dbec77fa3289e2ee45cab40616f95318fc214699ffe2f33aa15e77c2d163841c"; - aarch64-linux = "30861f2bd41fcd7c1d657be1eafa09f22886af0c3e09d1854c626b675a469347ce9fb79b2ea92b5ed4e2fd3d3457766ac03fc5393a690099e1d2b9b15f3334b9"; - x86_64-darwin = "2839f4fafa1f85a90b43a74a4898cbba915324f7363f1716e58cb9163d1415fa4d360703e27d0cadfe8495a370ccddbcfcc514076a880d6343a0bff76bb5ac2a"; + x86_64-linux = "32b5f86db3b1d4c21e3cf616d22f0e4a7374385dac0cf03cdebf3520dcf846460d9677ec1829a180920740a0237d64f6eaa2421d036a67f4fe9fb15d4f6b1db9"; + aarch64-linux = "a8089fad8d21a4b582aa6c3d7162d56a21fee697fd400f050a772f67c2ace5e4196d1c4261d3e861d6dc2e5439666f112c406104d6271e5ab60cda80ef2ffc64"; + x86_64-darwin = "a3160eaec15d0e2b62a4a2cdbb6663ef2e817fd26a3a3b8b3d75c5e3538b2947ff66eaddafb39cc297b9f087794d5fbd5a0e097ec8522ab6fea562f230055264"; }; }; sdk_5_0 = buildNetSdk { - version = "5.0.401"; + version = "5.0.403"; sha512 = { - x86_64-linux = "a444d44007709ceb68d8f72dec0531e17f85f800efc0007ace4fa66ba27f095066930e6c6defcd2f85cdedea2fec25e163f5da461c1c2b8563e5cd7cb47091e0"; - aarch64-linux = "770dcf18c08cd285934af61bedc06ffcc16a74115d15376f72376cdfbb4ab9cc9f53537ca1fe5d906b4b3c30b960ffe1404d6f7e01254091b4b9d288e9e972fa"; - x86_64-darwin = "eca773f407314123fd5b2017f68520c0647651f53e546583c4145b596c230c42898b3e56355cd5ace76b793df4aca3cd7ff9142718c86eedeabbabb70b393d0e"; + x86_64-linux = "7ba5f7f898dba64ea7027dc66184d60ac5ac35fabe750bd509711628442e098413878789fad5766be163fd2867cf22ef482a951e187cf629bbc6f54dd9293a4a"; + aarch64-linux = "6cc705fe45c0d8df6a493eb2923539ef5b62d048d5218859bf3af06fb3934c9c716c16f98ee1a28c818d77adff8430bf39a2ae54a59a1468b704b4ba192234ac"; + x86_64-darwin = "70beea069db182cca211cf04d7a80f3d6a3987d76cbd2bb60590ee76b93a4041b1b86ad91057cddbbaddd501c72327c1bc0a5fec630f38063f84bd60ba2b4792"; }; }; From 86d5dd09f1ba96f82bf4f3a1eb4cd7881520a025 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 9 Nov 2021 12:17:00 +0100 Subject: [PATCH 245/359] ryujinx: Update dependencies --- pkgs/misc/emulators/ryujinx/default.nix | 6 +++--- pkgs/misc/emulators/ryujinx/deps.nix | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index d1c9a7547b49..43c98cbacac2 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7096"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.7101"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "f41687f4c1948e9e111afd70e979e98ea5de52fa"; - sha256 = "0l0ll0bbqnqr63xlv4j9ir8pqb2ni7xmw52r8mdzw8vxq6xgs70b"; + rev = "911ea38e939459c652c6e27a28599340a61267dc"; + sha256 = "0znn5bcjhajs26y2ykizpya11ism27zlpbsrf12a25ak4vj6pzvx"; }; projectFile = "Ryujinx.sln"; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index c89d203863c3..92638ea9b4ac 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -12,17 +12,17 @@ (fetchNuGet { name = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) (fetchNuGet { name = "LibHac"; version = "0.13.3"; sha256 = "0mh7q1i9wk5mj7xc1rbsasfmd0d1y6xs5m4nllmclk4drzkzsi56"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "02kv8xh6xvpav7vqj281321ly1imghxcc18cdgadiq8dwgm87xwp"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "062zb8gqbzxq2xrmr8lbl215pnhw1fdidq43m975vsfgzmqrga8f"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { name = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.12"; sha256 = "0950m6x86jp5dybzakfsp74qzrk4pk8wkazc178v36j14sqmj2zq"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.12"; sha256 = "173zymcac00rjb0l4yvksglj32b6fnwxzi60kpi0ki3z3a2k8kd3"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "0z8l0gzy9dih0mn5a2rknyph1w73y4m03s250wghym1zp6rz910p"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "1s4klc4p5wiqiiqcfqyi56cci9f29b588h52vj7na7gfqry4b51l"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) From 708666dcb6a5339a02c9e9fb5c78ae350b3b54bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Oct 2021 10:19:23 +0200 Subject: [PATCH 246/359] nodePackages: update package set --- .../development/node-packages/composition.nix | 2 +- pkgs/development/node-packages/node-env.nix | 79 +- .../node-packages/node-packages.nix | 866 +++++++++--------- 3 files changed, 504 insertions(+), 443 deletions(-) diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 64326c6b2160..53bdef1f9864 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 21089c4d5459..5f055785791b 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master @@ -40,36 +40,22 @@ let ''; }; - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi + local strippedName - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) + local DIR=$PWD cd $TMPDIR - unpackFile ${src} + unpackFile $src # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" + mkdir -p "$(dirname "$DIR/$packageName")" - if [ -f "${src}" ] + if [ -f "$src" ] then # Figure out what directory has been unpacked packageDir="$(find . -maxdepth 1 -type d | tail -1)" @@ -79,28 +65,53 @@ let chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] + 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})" + 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}" + mv "$strippedName" "$DIR/$packageName" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; - # Include the dependencies of the package - cd "$DIR/${packageName}" + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.name}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} cd .. ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -415,6 +426,8 @@ let passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -492,6 +505,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 17d137e36bd6..955b684a9ff7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,6 +22,15 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; + "@alexbosworth/fiat-1.0.0" = { + name = "_at_alexbosworth_slash_fiat"; + packageName = "@alexbosworth/fiat"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@alexbosworth/fiat/-/fiat-1.0.0.tgz"; + sha512 = "GN8uppujBmlSI38NTj1pG8gX1bstwn9exELArqeKvFoLuzuK1nizKjY7Re+1zbt0tXa5BZ6H3JVl7JRlxL8OuQ=="; + }; + }; "@alexbosworth/html2unicode-1.1.5" = { name = "_at_alexbosworth_slash_html2unicode"; packageName = "@alexbosworth/html2unicode"; @@ -2812,31 +2821,31 @@ let sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; }; }; - "@gitbeaker/core-34.5.0" = { + "@gitbeaker/core-34.6.0" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "34.5.0"; + version = "34.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-34.5.0.tgz"; - sha512 = "MfBwD3W79/nhmrwYyfw7R8FmVNS3CsoCulNfhySY38LT3w1GLMnDOIDTpELySTwoIWVXYT/QHdEPlGIG6nPXOg=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-34.6.0.tgz"; + sha512 = "yKF+oxffPyzOnyuHCqLGJrBHhcFHuGHtcmqKhGKtnYPfqcNYA8rt4INAHaE5wMz4ILua9b4sB8p42fki+xn6WA=="; }; }; - "@gitbeaker/node-34.5.0" = { + "@gitbeaker/node-34.6.0" = { name = "_at_gitbeaker_slash_node"; packageName = "@gitbeaker/node"; - version = "34.5.0"; + version = "34.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/node/-/node-34.5.0.tgz"; - sha512 = "klm9PI7r6OpCmkS3Q26nPnVUwTb/VfF/IdOYv02/8SguEI3gMWfmR8PNvD99nsKN7lvL6ZoHl79gMGbgr65fHg=="; + url = "https://registry.npmjs.org/@gitbeaker/node/-/node-34.6.0.tgz"; + sha512 = "gVV4Wuev43Jbyoy1fszC885+bkvWH4zWiUhtIu0PSAm628j/OxO7idLIqUEMV0hDf6wm/PE/vOSP6PhjE0N+fA=="; }; }; - "@gitbeaker/requester-utils-34.5.0" = { + "@gitbeaker/requester-utils-34.6.0" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "34.5.0"; + version = "34.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-34.5.0.tgz"; - sha512 = "fgMGE/A5sOLjuhRPRCyiwLOCBqbhlDpVjo6nooizyQcOH5K4c4EZNgGD5AQshg6U5r3xdLNCKHYFu36pbR91uQ=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-34.6.0.tgz"; + sha512 = "H8utxbSP1kEdX0KcyVYrTDTT0A3UcPwrIV1ahyufX9ZLybYSUsA56B8Wx5kJSbWGFT1ffu2f8H2YDMwNCKKsBg=="; }; }; "@google-cloud/paginator-3.0.6" = { @@ -3559,22 +3568,22 @@ let sha512 = "s0jhnq/1X1IQQpKcAoUAd3KZ6X58nEjIi+vL4aC0iyDW6v2pmt8J5G/ilUZSbvplyJ2GdTMYi7NOCz2f3QAGZA=="; }; }; - "@jsii/check-node-1.43.0" = { + "@jsii/check-node-1.44.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.43.0.tgz"; - sha512 = "9+bZhSZB5Mz4yQb0y+sJTbFugtUmVyEaRNRoaptc31w8xERiOXr1SJNQe3JCOckArf5KfeeGHVbXB9ZMBcBSkg=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.44.0.tgz"; + sha512 = "f5yHUWdhPWav5Bf3O0BtT89LYg1YjLQib6LzroHXJOwCgQZdK9A+eZZ0bTmtWSEKd5UDhZmrN1JCXpZ7UzgpnA=="; }; }; - "@jsii/spec-1.43.0" = { + "@jsii/spec-1.44.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.43.0.tgz"; - sha512 = "4FZmzdBdVO64VEq1dQ6vXvBIWWHnUjP8bz7jAIjwSTE6iyJnSz2XT32tJpNg57RpBHRDdUuZGCgYa+xl06iGcA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.44.0.tgz"; + sha512 = "q0hbiXrDqQ2FsM4RA/aKyB8Zy8oi7ukDBJt/kEMO8rN9RC5uQ5uxFoR6UTS3d3raQpyzXpAkfs7UQldvi65B3w=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -5629,13 +5638,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.67" = { + "@redocly/openapi-core-1.0.0-beta.68" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.67"; + version = "1.0.0-beta.68"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.67.tgz"; - sha512 = "xH9Dl4D2VbXh7qMv1x7oQPfE9FpQsSjjJCe8QzRBF6aiTQFcxCB9LG4msa3Ym5KQuGkCDMyQXuA5oPTtzDooRQ=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.68.tgz"; + sha512 = "ocvDC13Fr8USbBlBUgl8wQlRFBCNEqz6gVTNlQ8IFOglCKxmOeu4JqnFENNGow3ycKTl35c891clfCw1vPyPcQ=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -6673,13 +6682,13 @@ let sha512 = "qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ=="; }; }; - "@types/eslint-7.28.2" = { + "@types/eslint-7.29.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.28.2"; + version = "7.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz"; - sha512 = "KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz"; + sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; }; }; "@types/eslint-scope-3.7.1" = { @@ -7060,13 +7069,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.176" = { + "@types/lodash-4.14.177" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.176"; + version = "4.14.177"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz"; - sha512 = "xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz"; + sha512 = "0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw=="; }; }; "@types/long-4.0.1" = { @@ -7456,13 +7465,13 @@ let sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; }; }; - "@types/react-16.14.20" = { + "@types/react-16.14.21" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.20"; + version = "16.14.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.20.tgz"; - sha512 = "SV7TaVc8e9E/5Xuv6TIyJ5VhQpZoVFJqX6IZgj5HZoFCtIDCArE3qXkcHlc6O/Ud4UwcMoX+tlvDA95YrKdLgA=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.21.tgz"; + sha512 = "rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg=="; }; }; "@types/react-dom-16.9.14" = { @@ -7717,13 +7726,13 @@ let sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; }; }; - "@types/url-parse-1.4.4" = { + "@types/url-parse-1.4.5" = { name = "_at_types_slash_url-parse"; packageName = "@types/url-parse"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.4.tgz"; - sha512 = "KtQLad12+4T/NfSxpoDhmr22+fig3T7/08QCgmutYA6QSznSRmEtuL95GrhVV40/0otTEdFc+etRcCTqhh1q5Q=="; + url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.5.tgz"; + sha512 = "8Wje3itJpk/FX+QItca9vjNLjGx5jlEYBw/CpMi03Fphk2DSVeZDUqWTE81BeCI5Bl6Z+zmA1O9L/8e3ZUSeLg=="; }; }; "@types/vfile-3.0.2" = { @@ -7762,13 +7771,13 @@ let sha512 = "iGlQJ1w5e3qPUryroO6v4lxg3ql1ztdTCwQW3xEwFawdyPLoeUSv48SYfMwc7kQA7h6ThUqflZIjgKAykeF9oA=="; }; }; - "@types/webpack-4.41.31" = { + "@types/webpack-4.41.32" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.31"; + version = "4.41.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz"; - sha512 = "/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz"; + sha512 = "cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg=="; }; }; "@types/webpack-sources-3.2.0" = { @@ -8122,31 +8131,31 @@ let sha512 = "B4Rc4wGgxTAOivy0tmBEuPAbSYeTzv3dusoQUOW1CVT3N5zYkEuxVj8OXmUQ1YECWaK+IjvQQMFkBuXt//lp7g=="; }; }; - "@vue/compiler-core-3.2.21" = { + "@vue/compiler-core-3.2.22" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.21"; + version = "3.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.21.tgz"; - sha512 = "NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.22.tgz"; + sha512 = "uAkovrVeTcjzpiM4ECmVaMrv/bjdgAaLzvjcGqQPBEyUrcqsCgccT9fHJ/+hWVGhyMahmBwLqcn4guULNx7sdw=="; }; }; - "@vue/compiler-dom-3.2.21" = { + "@vue/compiler-dom-3.2.22" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.21"; + version = "3.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.21.tgz"; - sha512 = "gsJD3DpYZSYquiA7UIPsMDSlAooYWDvHPq9VRsqzJEk2PZtFvLvHPb4aaMD8Ufd62xzYn32cnnkzsEOJhyGilA=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.22.tgz"; + sha512 = "VZdsw/VuO1ODs8K7NQwnMQzKITDkIFlYYC03SVnunuf6eNRxBPEonSyqbWNoo6qNaHAEBTG6VVcZC5xC9bAx1g=="; }; }; - "@vue/shared-3.2.21" = { + "@vue/shared-3.2.22" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.21"; + version = "3.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz"; - sha512 = "5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.22.tgz"; + sha512 = "qWVav014mpjEtbWbEgl0q9pEyrrIySKum8UVYjwhC6njrKzknLZPvfuYdQyVbApsqr94tf/3dP4pCuZmmjdCWQ=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -11866,13 +11875,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1028.0" = { + "aws-sdk-2.1029.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1028.0"; + version = "2.1029.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1028.0.tgz"; - sha512 = "OmR0NcpU8zsDcUOZhM+eZ6CzlUFtuaEuRyjm6mxDO0KI7lJAp7/NzB6tcellRrgWxL+NO7b5TSxi+m28qu5ocQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1029.0.tgz"; + sha512 = "nCmaMPkJr3EATXaeqR3JeNC0GTDH2lJZ3Xq/ZCAW+yrfaPQWv8HqJJHBCNGtmk3FmcCoxc7ed/gEB8XSl0tocA=="; }; }; "aws-sdk-2.920.0" = { @@ -13999,13 +14008,13 @@ let sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; }; }; - "bower-1.8.12" = { + "bower-1.8.13" = { name = "bower"; packageName = "bower"; - version = "1.8.12"; + version = "1.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz"; - sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.13.tgz"; + sha512 = "8eWko16JlCTdaZZG70kddHPed17pHEbH8/IjfP4IFkQsfEqRsyNM09Dc8cDBFkSvtQ/2lTea7A+bMhRggG2a+Q=="; }; }; "bower-endpoint-parser-0.2.1" = { @@ -14413,13 +14422,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.18.0" = { + "browserslist-4.18.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.18.0"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.18.0.tgz"; - sha512 = "ER2M0g5iAR84fS/zjBDqEgU6iO5fS9JI2EkHr5zxDxYEFk3LjhU9Vpp/INb6RMQphxko7PDV1FH38H/qVP5yCA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz"; + sha512 = "8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ=="; }; }; "brq-0.1.8" = { @@ -15116,6 +15125,15 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; + "bytes-3.1.1" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"; + sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; + }; + }; "bytesish-0.4.4" = { name = "bytesish"; packageName = "bytesish"; @@ -15422,6 +15440,15 @@ let sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; }; }; + "camelcase-6.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz"; + sha512 = "tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="; + }; + }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -15647,22 +15674,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.1.33" = { + "cdk8s-1.1.35" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.1.33"; + version = "1.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.33.tgz"; - sha512 = "+ts6ksmpPxryb7MB6hlNF1NNqLy/n2D/DzqW/dcB4ymML7iaXDrCwkWWOqaQCIE5SL1rm37uBnX/pyjDOtsn8A=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.35.tgz"; + sha512 = "6hhAP+XivkMFKiqenOuBX+7D+5Ae6s+X8KF0TEoiwrrRFa1Wt5LvM7JGsJT7F7+jMNF+UAF53kxpffNZMCpOJA=="; }; }; - "cdk8s-plus-22-1.0.0-beta.40" = { + "cdk8s-plus-22-1.0.0-beta.42" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.40"; + version = "1.0.0-beta.42"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.40.tgz"; - sha512 = "5BMhOy2wJyruukF9cKkqXgrVlI6UiZZaEnBmLwEoOMWi/v3NoQPcsHT9CVTauUEfSFlzBb0iFcuqrafYWIpYaw=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.42.tgz"; + sha512 = "aC9H+ulFxXIafMhIj5w5KxTY3Fknjxztc2/uEPWZqB9K+aUozhfTTeVcBsmFuOw3p6LvI6Xbs6cJuJ2h7zCiDQ=="; }; }; "cdktf-0.7.0" = { @@ -17294,13 +17321,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.43.0" = { + "codemaker-1.44.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.43.0.tgz"; - sha512 = "6FA4syN+22H9V0Dfadk9xbQ894kkeIhOH6HleiLRL0lU6Ts3nMB4lM01cHtnY/5YhLBr+XrHboV5Bi5xVFf4sg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.44.0.tgz"; + sha512 = "GrUjFBFDbMyykrmL9aGf7Viv2I+wAH9mnkW/5qCHsZw51LuZKAidBHp5nS3oT1mdkcIorjqUJjRSJ3LzslgFEQ=="; }; }; "codepage-1.4.0" = { @@ -19887,13 +19914,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-3.0.9" = { + "csstype-3.0.10" = { name = "csstype"; packageName = "csstype"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz"; - sha512 = "rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="; + url = "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz"; + sha512 = "2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="; }; }; "csurf-1.11.0" = { @@ -23604,13 +23631,13 @@ let sha512 = "U9dKi10V9w/BdIVB8a8dTKYLK3Q1d2WZ+Yo5qfM3XX/O4jI7KpnwgvWgGoVv0jTWPC2NlebF00ffWS/8NfUAtA=="; }; }; - "electron-to-chromium-1.3.896" = { + "electron-to-chromium-1.3.899" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.896"; + version = "1.3.899"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz"; - sha512 = "NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.899.tgz"; + sha512 = "w16Dtd2zl7VZ4N4Db+FIa7n36sgPGCKjrKvUUmp5ialsikvcQLjcJR9RWnlYNxIyEHLdHaoIZEqKsPxU9MdyBg=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -28214,31 +28241,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.1.2" = { + "gatsby-core-utils-3.1.3" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.1.2.tgz"; - sha512 = "l3LUdGNDlM3fLrdxRUGnsd/Szu9e8yLEL/pZIV2LuhTHMNwjOStiycEQivezsUhHNPobep1r5t4yWzP6r2cw/Q=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.1.3.tgz"; + sha512 = "+pg2i3DYVLzmJ/67SVGM+zVxerilGCbcgVxDoN58Y+Htv5TwogUWzPymfoFrJEsWGhlVKlYq7I8jVWSXPzwMHw=="; }; }; - "gatsby-recipes-1.1.2" = { + "gatsby-recipes-1.1.3" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-1.1.2.tgz"; - sha512 = "r6FSPM2eKH+rlC6JX0SgVYBFxBXJW5J/MwFtsP8N+C6Yvr7Cosi9OlMreMx/SBza4HYMXxIoDBYvX68qbBQrhg=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-1.1.3.tgz"; + sha512 = "AdO9Y7vtpa0VSWXe3gZIeIUDJ6/j/MeAkpkuJHbbU8hix9gtbVPoOcmF8VFJUMALNRzhhFsgqRN2mK6jXJlang=="; }; }; - "gatsby-telemetry-3.1.2" = { + "gatsby-telemetry-3.1.3" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.1.2.tgz"; - sha512 = "uz8J+cGkQ1vgIc5BCrR5Jm/cF/kKF+Ys+tqXofn4ah95ezT94U+g+m3FPPB49cut7H4OZsONCXeLyLRzdIx7EQ=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.1.3.tgz"; + sha512 = "vZSj67F4vzoqqK5CyNIRTDTWOqhBYkMey+i6swY3H51tehGTHRyzzOhJorQOJa76cQOcOMXr1/vvxX1T84Y96g=="; }; }; "gauge-1.2.7" = { @@ -31410,6 +31437,15 @@ let sha512 = "4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A=="; }; }; + "http-errors-1.8.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; + }; + }; "http-headers-3.0.2" = { name = "http-headers"; packageName = "http-headers"; @@ -35651,13 +35687,13 @@ let sha512 = "M+opnlcNb1Ne5igms/OJn/e2ZyQgcCwmqqljuOsHXBMFm7vMOVLSjEUcBYcW7ifJeM1+XYg8+wfuAoZhqY1zCg=="; }; }; - "jsii-1.43.0" = { + "jsii-1.44.0" = { name = "jsii"; packageName = "jsii"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.43.0.tgz"; - sha512 = "2GsSiwbX++/f6BE/fnT9s0iBQtT+MSsnFBZdpyw4sV50gEg9gbD1rPO/ewSLuUh83mrztPtdiurxsBpYGj17Nw=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.44.0.tgz"; + sha512 = "6CRoO+swOmTyvuYbMzZJ89pCn3cbCLUUo8qLN9JLZhT5Pc8uJgCdCn67rK9Vu5LRgwI7thOKP2ij9TG+8Ejyng=="; }; }; "jsii-pacmak-1.37.0" = { @@ -35669,40 +35705,40 @@ let sha512 = "cXLXAOyCqd/QNBy+OfcmMgj8UdNVbJJsKoM/C3SvRgdi+fpQlxh1iDTOcKUwd3/QgMuDMDLvKCCpLmq/YRjreA=="; }; }; - "jsii-pacmak-1.43.0" = { + "jsii-pacmak-1.44.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.43.0.tgz"; - sha512 = "GrvEz/Rbiwu+O3HWNiDybXV+homhzSZH0DgBkfCvmPvPUJPmSn1u3cU586F77gESGTOy9bOXJOkGfXpq9PZO4Q=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.44.0.tgz"; + sha512 = "m6x3xQM20vi0jIXCpW4lIOYK4dS8jdOIi4mQNQcreraoskYSsrv9d2G2THXGPojF5ozNjnPBNgsIXaH4XdkZKw=="; }; }; - "jsii-reflect-1.43.0" = { + "jsii-reflect-1.44.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.43.0.tgz"; - sha512 = "UoEK0c2CO0LPvb53TkedFFyAKBXbrb35vs65HJhfBzBqyZBcPQ3+mm6lFA38oTtsDFNBJe0Eyg0cuFaWzWDllg=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.44.0.tgz"; + sha512 = "mgyCUYXqLbOxkNgiENDuRnDB0S0pIKZvqFZPW7fMBTOU8XxVPhZD3DhFGEIj6cPtbTUbz18Kc5qKk3l8mEkmfg=="; }; }; - "jsii-rosetta-1.43.0" = { + "jsii-rosetta-1.44.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.43.0.tgz"; - sha512 = "AjJ0tlrnBatJB7OJ/cn9sFaLpM4Ra7fSkxLlHNWsVE1KFAUnCLIcDloXaytaDmBXY/emxi3/XbWwGUIqbjbCIw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.44.0.tgz"; + sha512 = "6loHTZdcNLYs4JNi2Uwe9xY9caFGpKC/OPtj5Je1+zLx/MyiJeAhd448T+Tg8SXRRIZ549ZZ6Xn4COYZQVU+AA=="; }; }; - "jsii-srcmak-0.1.398" = { + "jsii-srcmak-0.1.400" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.398"; + version = "0.1.400"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.398.tgz"; - sha512 = "owTEb9AENT/MQQoHIIiAWvD/sTJtooHwlsNTnM3GaBmEZdntsCjYrDbWGZG1baZjRq2d6PBPqVs7EfxHMIUXjA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.400.tgz"; + sha512 = "7FVK/c8VBb33mqUYDHJ5JnnW6xmGFyf7Z5LWf2yVAD1FXk3kj4BYpcnJ5K7eDHpY60PtNeivEzM8vJrrDqPIpQ=="; }; }; "json-bigint-1.0.0" = { @@ -35993,13 +36029,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.51" = { + "json2jsii-0.2.53" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.51"; + version = "0.2.53"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.51.tgz"; - sha512 = "r/pye6PVthtdz3wW8vAwL3t0xUt40FIhqlY5bkZJ6OR2jM2WBJWgBuCoLs3YhKxwNRR7uDsfHTAhexX8ga0tUA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.53.tgz"; + sha512 = "mofX4sQEkIJWtFn6ZLZZwOpPd/T0KLgiVCN8jFgSxYiED36xp9CXkU+UV3lPRiUMGhDmo/brXRuQ8U7vRutgCg=="; }; }; "json3-3.2.6" = { @@ -41808,6 +41844,15 @@ let sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; }; + "mime-3.0.0" = { + name = "mime"; + packageName = "mime"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz"; + sha512 = "jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="; + }; + }; "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; @@ -43888,13 +43933,13 @@ let sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; }; - "node-abi-3.3.0" = { + "node-abi-3.5.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.3.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.3.0.tgz"; - sha512 = "/+2sCVPXmj07GY/l0ggRr7+trqzX7F9d4QVfSArqIVYmRzc/LkXKr5FlRO6U8uZ/gVVclDDaBxBNITj1z1Z/Zw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.5.0.tgz"; + sha512 = "LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw=="; }; }; "node-addon-api-1.7.2" = { @@ -45771,13 +45816,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.43.0" = { + "oo-ascii-tree-1.44.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.43.0.tgz"; - sha512 = "OjCQZnEi/ssOj5f7d3oILcTrzpKN9eWIWEpoEdRr+8NOdcLBGiXDdUYotIx/ajcjmRPjuoRtRT7NE6cKWWT/fA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.44.0.tgz"; + sha512 = "31f6M3ID8HKIOOAlyQWlURL0koXyEgjF0U1fiu2BuV8TepwCUDUy6MnKHE/72H9cXAwnBXpJHf0dun4B8D3AlA=="; }; }; "opal-runtime-1.0.11" = { @@ -45978,13 +46023,13 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; - "openapi-sampler-1.1.0" = { + "openapi-sampler-1.1.1" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.1.0.tgz"; - sha512 = "/LhZYKNBWphLEpbAG5BdpBZbIbmLgC4vTiTj8N/MV0LF9ptmKOiJ2nETVlacNjXHt7iqDgZDELJCIoZ3q5ZG6A=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.1.1.tgz"; + sha512 = "WAFsl5SPYuhQwaMTDFOcKhnEY1G1rmamrMiPmJdqwfl1lr81g63/befcsN9BNi0w5/R0L+hfcUj13PANEBeLgg=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -50056,15 +50101,6 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; - "prettier-2.3.2" = { - name = "prettier"; - packageName = "prettier"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz"; - sha512 = "lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ=="; - }; - }; "prettier-2.4.1" = { name = "prettier"; packageName = "prettier"; @@ -50101,13 +50137,13 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-plugin-svelte-2.4.0" = { + "prettier-plugin-svelte-2.5.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.4.0.tgz"; - sha512 = "JwJ9bOz4XHLQtiLnX4mTSSDUdhu12WH8sTwy/XTDCSyPlah6IcV7NWeYBZscPEcceu2YnW8Y9sJCP40Z2UH9GA=="; + url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.5.0.tgz"; + sha512 = "+iHY2uGChOngrgKielJUnqo74gIL/EO5oeWm8MftFWjEi213lq9QYTOwm1pv4lI1nA61tdgf80CF2i5zMcu1kw=="; }; }; "prettier-stylelint-0.4.2" = { @@ -50722,13 +50758,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "proto3-json-serializer-0.1.5" = { + "proto3-json-serializer-0.1.6" = { name = "proto3-json-serializer"; packageName = "proto3-json-serializer"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.5.tgz"; - sha512 = "G395jcZkgNXNeS+6FGqd09TsXeoCs9wmBWByDiwFy7Yd7HD8pyfyvf6q+rGh7PhT4AshRpG4NowzoKYUtkNjKg=="; + url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.6.tgz"; + sha512 = "tGbV6m6Kad8NqxMh5hw87euPS0YoZSAOIfvR01zYkQV8Gpx1V/8yU/0gCKCvfCkhAJsjvzzhnnsdQxA1w7PSog=="; }; }; "protobufjs-3.8.2" = { @@ -54808,6 +54844,15 @@ let sha512 = "y3cj3wDwpXTE1boMco/nsquHj2noK0mtnXwBC8FJ/CtU06y66jOBWX1kLknluBl06pYbxtx1ypAOHKvjgT4vsA=="; }; }; + "remark-mdx-2.0.0-rc.2" = { + name = "remark-mdx"; + packageName = "remark-mdx"; + version = "2.0.0-rc.2"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-rc.2.tgz"; + sha512 = "TMgFSEVx42/YzJWjDY+GKw7CGSbp3XKqBraXPxFS27r8iD9U6zuOZKXH4MoLl9JqiTOmQi0M1zJwT2YhPs32ug=="; + }; + }; "remark-mdxjs-2.0.0-next.8" = { name = "remark-mdxjs"; packageName = "remark-mdxjs"; @@ -55348,13 +55393,13 @@ let sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ=="; }; }; - "reselect-4.1.2" = { + "reselect-4.1.3" = { name = "reselect"; packageName = "reselect"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/reselect/-/reselect-4.1.2.tgz"; - sha512 = "wg60ebcPOtxcptIUfrr7Jt3h4BR86cCW3R7y4qt65lnNb4yz4QgrXcbSioVsIOYguyz42+XTHIyJ5TEruzkFgQ=="; + url = "https://registry.npmjs.org/reselect/-/reselect-4.1.3.tgz"; + sha512 = "TVpMknnmdSRNhLPgTDSCQKw32zt1ZIJtEcSxfL/ihtDqShEMUs2X2UY/g96YAVynUXxqLWSXObLGIcqKHQObHw=="; }; }; "reserved-words-0.1.2" = { @@ -56131,13 +56176,13 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; - "router-1.3.5" = { + "router-1.3.6" = { name = "router"; packageName = "router"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.3.5.tgz"; - sha512 = "kozCJZUhuSJ5VcLhSb3F8fsmGXy+8HaDbKCAerR1G6tq3mnMZFMuSohbFvGv1c5oMFipijDjRZuuN/Sq5nMf3g=="; + url = "https://registry.npmjs.org/router/-/router-1.3.6.tgz"; + sha512 = "gsjhou+LFApzkIP8VDrouG6Z4pqkeF11n3o5orlwPPvPTl0x7c+dbF71itKOhDoFHygmc3N3uqm55Uq/gIDUwg=="; }; }; "router-ips-1.0.0" = { @@ -59011,15 +59056,6 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.10" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "3.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; - sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; - }; - }; "spdx-license-ids-3.0.11" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; @@ -59722,13 +59758,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.127" = { + "sscaff-1.2.129" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.127"; + version = "1.2.129"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.127.tgz"; - sha512 = "lmfLzIKLeolLAujyn2yNcUkg2ia31j7NHVgGEiIe+YqhYomSXzjQxM/k1G0cNvMYNPWvkBakS4Um/ppe2/Zrog=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.129.tgz"; + sha512 = "S9j7nQ83ETJv+NV9nV6Dr5gOAD/gnzMwlf9LLzDEPuwvDolXkIN9kFnzi+Sqxb0zoHxev7t+2342qbcsU0ORgg=="; }; }; "ssh-config-1.1.6" = { @@ -61486,13 +61522,13 @@ let sha512 = "EQS/oRZzMtYdAprppZxY3HcysKh11w54MgA63ybtL+TAZ4hVqYOnhw41JVJjWN9dhPnNjjLzvbZ2tMhTsla1Og=="; }; }; - "svelte2tsx-0.4.8" = { + "svelte2tsx-0.4.9" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.4.8"; + version = "0.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.8.tgz"; - sha512 = "FSaJW/PW40XIV3zrHsW4aX6fBDPUu19gl1+zupCqOeT7wRip2RBxxt5ENDsPx/U5EuQC5+ultlYDGhSi6276wQ=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.9.tgz"; + sha512 = "FXly9uQTzdLFliTF86mfkT8MgR1DGJ3yvRC/jv2t2RoRLKNgLaXBv8DP2o2RcJL+NQ2X4kRD3IQsf9/99KZ5mg=="; }; }; "sver-compat-1.5.0" = { @@ -62360,13 +62396,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.9.0" = { + "terser-5.10.0" = { name = "terser"; packageName = "terser"; - version = "5.9.0"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz"; - sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; + url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; + sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -63206,6 +63242,15 @@ let sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; + "toidentifier-1.0.1" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; + }; + }; "toiletdb-1.4.1" = { name = "toiletdb"; packageName = "toiletdb"; @@ -67536,15 +67581,6 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; - "vscode-css-languageservice-5.0.0" = { - name = "vscode-css-languageservice"; - packageName = "vscode-css-languageservice"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.0.0.tgz"; - sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; - }; - }; "vscode-css-languageservice-5.1.8" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; @@ -67581,13 +67617,13 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-emmet-helper-2.1.2" = { + "vscode-emmet-helper-2.6.4" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; - version = "2.1.2"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.2.tgz"; - sha512 = "Fy6UNawSgxE3Kuqi54vSXohf03iOIrp1A74ReAgzvGP9Yt7fUAvkqF6No2WAc34/w0oWAHAeqoBNqmKKWh6U5w=="; + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.6.4.tgz"; + sha512 = "fP0nunW1RUWEKGf4gqiYLOVNFFGXSRHjCl0pikxtwCFlty8WwimM+RBJ5o0aIiwerrYD30HqeaVyvDW027Sseg=="; }; }; "vscode-html-languageservice-2.1.12" = { @@ -67599,15 +67635,6 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-html-languageservice-4.0.0" = { - name = "vscode-html-languageservice"; - packageName = "vscode-html-languageservice"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.0.0.tgz"; - sha512 = "UmC+GS0IqBeZnOAmdtQvaDzoH1c5/un+b7qALUziu/Y4SOPXso5dF+YkJeTqsde6YU2pLm78RtMDzl9BParwbw=="; - }; - }; "vscode-html-languageservice-4.1.1" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; @@ -68454,13 +68481,13 @@ let sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; }; }; - "web3-utils-1.6.0" = { + "web3-utils-1.6.1" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.6.0.tgz"; - sha512 = "bgCAWAeQnJF035YTFxrcHJ5mGEfTi/McsjqldZiXRwlHK7L1PyOqvXiQLE053dlzvy1kdAxWl/sSSfLMyNUAXg=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.6.1.tgz"; + sha512 = "RidGKv5kOkcerI6jQqDFDoTllQQqV+rPhTzZHhmbqtFObbYpU93uc+yG1LHivRTQhA6llIx67iudc/vzisgO+w=="; }; }; "webassemblyjs-1.11.1" = { @@ -68571,13 +68598,13 @@ let sha512 = "3S6e9Vo1W2ijk4F4PPWRIu6D/uGgqaPmqw+av3W3jLDujuNkdxX5h5c+RQ6GkjVR+WwIPOfgY8av+j5j4tMqJw=="; }; }; - "webpack-5.64.0" = { + "webpack-5.64.1" = { name = "webpack"; packageName = "webpack"; - version = "5.64.0"; + version = "5.64.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.64.0.tgz"; - sha512 = "UclnN24m054HaPC45nmDEosX6yXWD+UGC12YtUs5i356DleAUGMDC9LBAw37xRRfgPKYIdCYjGA7RZ1AA+ZnGg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.64.1.tgz"; + sha512 = "b4FHmRgaaAjP+aVOVz41a9Qa5SmkUPQ+u8FntTQ1roPHahSComB6rXnLwc976VhUY4CqTaLu5mCswuHiNhOfVw=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -68715,13 +68742,13 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "webpack-sources-3.2.1" = { + "webpack-sources-3.2.2" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz"; - sha512 = "t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz"; + sha512 = "cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw=="; }; }; "webpack-stream-6.1.0" = { @@ -70291,6 +70318,15 @@ let sha512 = "QaYgJZMfWD6fKN/EYMk6w1oLWPCr1xj9QaPSZW5qkDb3y8nGCXhy2Ono+AF4F+CSL/vGcqswcAT0BaS//pgD2A=="; }; }; + "yaml-2.0.0-9" = { + name = "yaml"; + packageName = "yaml"; + version = "2.0.0-9"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml/-/yaml-2.0.0-9.tgz"; + sha512 = "Bf2KowHjyVkIIiGMt7+fbhmlvKOaE8DWuD07bnL4+FQ9sPmEl/5IzGpBpoxPqOaHuyasBjJhyXDcISpJWfhCGw=="; + }; + }; "yaml-ast-parser-0.0.43" = { name = "yaml-ast-parser"; packageName = "yaml-ast-parser"; @@ -71816,7 +71852,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.10" + sources."spdx-license-ids-3.0.11" sources."split2-3.2.2" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -71948,7 +71984,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" @@ -73447,7 +73483,7 @@ in ]; }) sources."@nestjs/schematics-8.0.4" - sources."@types/eslint-7.28.2" + sources."@types/eslint-7.29.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" @@ -73488,7 +73524,7 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" @@ -73511,7 +73547,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.3" // { @@ -73675,7 +73711,7 @@ in sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" sources."tapable-1.1.3" - (sources."terser-5.9.0" // { + (sources."terser-5.10.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -73715,7 +73751,7 @@ in ]; }) sources."webpack-node-externals-3.0.0" - sources."webpack-sources-3.2.1" + sources."webpack-sources-3.2.2" sources."which-2.0.2" sources."windows-release-4.0.0" sources."wrappy-1.0.2" @@ -74003,13 +74039,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.15" sources."@vue/cli-ui-addon-widgets-4.5.15" - (sources."@vue/compiler-core-3.2.21" // { + (sources."@vue/compiler-core-3.2.22" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.21" - sources."@vue/shared-3.2.21" + sources."@vue/compiler-dom-3.2.22" + sources."@vue/shared-3.2.22" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -74091,6 +74127,7 @@ in sources."inherits-2.0.3" sources."qs-6.7.0" sources."setprototypeof-1.1.1" + sources."toidentifier-1.0.0" ]; }) (sources."boxen-4.2.0" // { @@ -74106,7 +74143,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -74253,7 +74290,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.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -74415,7 +74452,7 @@ in sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-3.8.1" - sources."http-errors-1.8.0" + sources."http-errors-1.8.1" sources."http-signature-1.2.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" @@ -74703,6 +74740,7 @@ in sources."http-errors-1.7.2" sources."inherits-2.0.3" sources."setprototypeof-1.1.1" + sources."toidentifier-1.0.0" ]; }) sources."read-pkg-5.2.0" @@ -74766,6 +74804,7 @@ in sources."http-errors-1.7.3" sources."ms-2.1.1" sources."setprototypeof-1.1.1" + sources."toidentifier-1.0.0" ]; }) sources."serve-static-1.14.1" @@ -74822,7 +74861,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.10" + sources."spdx-license-ids-3.0.11" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -74919,7 +74958,7 @@ in ]; }) sources."to-regex-range-2.1.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" @@ -75284,7 +75323,7 @@ in sources."pump-3.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."camelcase-keys-7.0.1" sources."ccount-2.0.1" sources."chalk-2.4.2" @@ -75581,7 +75620,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.10" + sources."spdx-license-ids-3.0.11" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -75750,7 +75789,7 @@ in sources."async-3.2.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."caniuse-lite-1.0.30001280" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -75761,7 +75800,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.896" + sources."electron-to-chromium-1.3.899" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -75890,9 +75929,9 @@ in sha512 = "7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA=="; }; dependencies = [ - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."caniuse-lite-1.0.30001280" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."escalade-3.1.1" sources."fraction.js-4.1.2" sources."node-releases-2.0.1" @@ -75927,7 +75966,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1028.0" // { + (sources."aws-sdk-2.1029.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -76154,7 +76193,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/eslint-7.28.2" + sources."@types/eslint-7.29.0" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" sources."@types/mdast-3.0.10" @@ -76447,7 +76486,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.10" + sources."spdx-license-ids-3.0.11" (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -76548,12 +76587,13 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.11.0"; + version = "11.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.11.0.tgz"; - sha512 = "jmJjvAB00rF+zKthCDzCOIz8IxJah2cjgcBHSjLqgV7AYbyyDEUNiFZhSlymEfmGc2pJI2/JhetYEVu9PpDl3Q=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.12.0.tgz"; + sha512 = "wb6LDwuSA5UGHb7yIRZK3YAk9odlPkV5e4qwswwlKTOj0BV2gawClTsJ1uE27WIWFIu7OQaoB1TxUiL1jKQueQ=="; }; dependencies = [ + sources."@alexbosworth/fiat-1.0.0" sources."@alexbosworth/html2unicode-1.1.5" sources."@alexbosworth/node-fetch-2.6.2" sources."@alexbosworth/saxophone-0.6.2" @@ -76672,7 +76712,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."caporal-1.4.0" // { dependencies = [ sources."colorette-1.4.0" @@ -77485,10 +77525,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.12"; + version = "1.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz"; - sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.13.tgz"; + sha512 = "8eWko16JlCTdaZZG70kddHPed17pHEbH8/IjfP4IFkQsfEqRsyNM09Dc8cDBFkSvtQ/2lTea7A+bMhRggG2a+Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -77512,7 +77552,7 @@ in sources."argparse-1.0.4" sources."array-find-index-1.0.2" sources."balanced-match-1.0.2" - sources."bower-1.8.12" + sources."bower-1.8.13" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" @@ -77610,7 +77650,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.10" + sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -78506,7 +78546,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.10" + sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."standard-error-1.1.0" @@ -78919,7 +78959,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.10" + sources."spdx-license-ids-3.0.11" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" @@ -79478,7 +79518,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.10" + sources."spdx-license-ids-3.0.11" sources."split-on-first-1.1.0" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { @@ -79596,14 +79636,14 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.29"; + version = "1.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.29.tgz"; - sha512 = "hvQr4muvZ5mM//MpTH7IK8bSKRl/c3s/8GXx4BghWI+noG0/O06XxaN4ZeQuIdXHuZ4/7Qi2YA6a7qgifnetyQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.31.tgz"; + sha512 = "xaViO1Divm4/4v+oTlYV28MohHaoT4vNI2T4M9I/6oAHF1yNiSJWWd76mjOICVIoAi7OpjBj5YtyBrXcmq9pzA=="; }; dependencies = [ - sources."@jsii/check-node-1.43.0" - sources."@jsii/spec-1.43.0" + sources."@jsii/check-node-1.44.0" + sources."@jsii/spec-1.44.0" sources."@types/node-12.20.37" sources."@xmldom/xmldom-0.7.5" sources."ajv-8.8.0" @@ -79612,14 +79652,14 @@ in sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" sources."call-bind-1.0.2" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."case-1.6.3" - sources."cdk8s-1.1.33" - sources."cdk8s-plus-22-1.0.0-beta.40" + sources."cdk8s-1.1.35" + sources."cdk8s-plus-22-1.0.0-beta.42" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.43.0" // { + (sources."codemaker-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -79684,38 +79724,38 @@ in sources."is-weakref-1.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.43.0" // { + (sources."jsii-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.43.0" // { + (sources."jsii-pacmak-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.43.0" // { + (sources."jsii-reflect-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.43.0" // { + (sources."jsii-rosetta-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.398" // { + (sources."jsii-srcmak-0.1.400" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.51" + sources."json2jsii-0.2.53" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -79731,7 +79771,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.43.0" + sources."oo-ascii-tree-1.44.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -79753,7 +79793,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.127" + sources."sscaff-1.2.129" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -79779,7 +79819,7 @@ in sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yaml-2.0.0-8" + sources."yaml-2.0.0-9" (sources."yargs-15.4.1" // { dependencies = [ sources."camelcase-5.3.1" @@ -79875,8 +79915,8 @@ in }) sources."@graphql-typed-document-node/core-3.1.0" sources."@josephg/resolvable-1.0.1" - sources."@jsii/check-node-1.43.0" - sources."@jsii/spec-1.43.0" + sources."@jsii/check-node-1.44.0" + sources."@jsii/spec-1.44.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -79987,7 +80027,7 @@ in sources."bytes-3.1.0" sources."call-bind-1.0.2" sources."camel-case-4.1.2" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."camelcase-keys-6.2.2" // { dependencies = [ sources."camelcase-5.3.1" @@ -80222,19 +80262,19 @@ in (sources."jsii-pacmak-1.37.0" // { dependencies = [ sources."@jsii/check-node-1.37.0" - sources."codemaker-1.43.0" + sources."codemaker-1.44.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.43.0" // { + (sources."jsii-reflect-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.43.0" // { + (sources."jsii-rosetta-1.44.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" @@ -80301,7 +80341,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.43.0" + sources."oo-ascii-tree-1.44.0" sources."open-7.4.2" sources."optimism-0.16.1" sources."ora-5.4.1" @@ -80394,7 +80434,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.127" + sources."sscaff-1.2.129" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -80545,7 +80585,7 @@ in sources."ansi-styles-3.2.1" sources."arch-2.2.0" sources."arrify-1.0.1" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."camelcase-keys-7.0.1" sources."chalk-2.4.2" sources."clipboardy-3.0.0" @@ -80610,7 +80650,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.10" + sources."spdx-license-ids-3.0.11" sources."strip-final-newline-2.0.0" sources."strip-indent-4.0.0" sources."supports-color-5.5.0" @@ -81134,7 +81174,7 @@ in sources."bser-2.1.1" sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."call-bind-1.0.2" sources."chainsaw-0.1.0" sources."chownr-2.0.0" @@ -81513,7 +81553,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -82107,7 +82147,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.10" + sources."spdx-license-ids-3.0.11" sources."specificity-0.3.2" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -82391,10 +82431,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.54.0"; + version = "0.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.54.0.tgz"; - sha512 = "pj7VGs/Fzi50vWsF2VlmjmZDE1IScxEMO9TKgpaj8Fi/eGczFz8WxAnbGiAjDzVHYqyaCq/eQtU0Ix7bm1V3Bw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.55.0.tgz"; + sha512 = "qTlCHI6qpMsRLK6Wt4OfC8NxUbZxZ2bVaq/7oan0LR2N2gh3KvQToe8aq2IlrGmRBM8CdnuiD7Wz8uPB5QelpQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -82523,7 +82563,7 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" @@ -82564,7 +82604,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -82742,7 +82782,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.10" + sources."spdx-license-ids-3.0.11" sources."specificity-0.4.1" sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { @@ -83830,7 +83870,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.10" + sources."spdx-license-ids-3.0.11" sources."split-1.0.1" sources."split2-3.2.2" sources."string-width-4.2.3" @@ -84387,7 +84427,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.10" + sources."spdx-license-ids-3.0.11" sources."sshpk-1.16.1" sources."ssri-8.0.1" sources."statuses-1.5.0" @@ -84789,7 +84829,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.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -85388,7 +85428,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."bulk-write-stream-1.1.4" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" @@ -86150,12 +86190,12 @@ in sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" sources."@types/rc-1.2.0" - sources."@types/react-16.14.20" + sources."@types/react-16.14.21" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" sources."@types/react-window-infinite-loader-1.0.5" sources."@types/scheduler-0.16.2" - sources."@types/url-parse-1.4.4" + sources."@types/url-parse-1.4.5" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ @@ -86192,7 +86232,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -86252,7 +86292,7 @@ in sources."core-util-is-1.0.3" sources."crypto-random-string-1.0.0" sources."csscolorparser-1.0.3" - sources."csstype-3.0.9" + sources."csstype-3.0.10" sources."debounce-1.2.1" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" @@ -86270,7 +86310,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.6.1" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -86868,7 +86908,7 @@ in sources."big.js-5.2.2" sources."buffer-4.9.2" sources."buffer-queue-1.0.0" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."caseless-0.12.0" sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" @@ -87393,7 +87433,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.2" sources."nice-try-1.0.5" - sources."node-abi-3.3.0" + sources."node-abi-3.5.0" sources."node-addon-api-3.2.1" sources."node-api-version-0.1.4" sources."node-fetch-2.6.6" @@ -87527,7 +87567,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.10" + sources."spdx-license-ids-3.0.11" sources."speedometer-0.1.4" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" @@ -87713,7 +87753,7 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" @@ -87748,7 +87788,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -87915,7 +87955,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.10" + sources."spdx-license-ids-3.0.11" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -89363,7 +89403,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.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" sources."split2-3.2.2" sources."sprintf-js-1.0.3" @@ -89448,7 +89488,7 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.9.0" // { + (sources."terser-5.10.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -89793,10 +89833,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "11.0.0"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-11.0.0.tgz"; - sha512 = "eR6yaJepLQ8hMGIfW2Bj41e4ZnxbsbMZvYjDxWl98YnUlqn46qoUi20N3VB0xq9mv1IKsOO+Rqfnjov5Y93zLg=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-11.1.0.tgz"; + sha512 = "uhrQhFPG7L/81j90+QKaDImDJriqCdPY4ZcN9exFs9sdeF28Cdv/vD2XuRhjD5FxVbA/nNpFL37QsTSQwtjdjA=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -90151,7 +90191,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.31" // { + (sources."@types/webpack-4.41.32" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -90340,7 +90380,7 @@ in sources."tslib-2.3.1" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."caniuse-api-3.0.0" sources."caniuse-lite-1.0.30001280" sources."caseless-0.12.0" @@ -90600,7 +90640,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.896" + sources."electron-to-chromium-1.3.899" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92254,7 +92294,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-2.0.0" @@ -92286,7 +92326,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -92419,7 +92459,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.10" + sources."spdx-license-ids-3.0.11" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -92596,7 +92636,7 @@ in sources."lowercase-keys-1.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { @@ -93577,7 +93617,7 @@ in sources."promise-breaker-5.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."proto3-json-serializer-0.1.5" + sources."proto3-json-serializer-0.1.6" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" (sources."proxy-agent-5.0.0" // { @@ -93613,7 +93653,7 @@ in sources."retry-0.12.0" sources."retry-request-4.2.2" sources."rimraf-3.0.2" - (sources."router-1.3.5" // { + (sources."router-1.3.6" // { dependencies = [ sources."array-flatten-3.0.0" sources."debug-2.6.9" @@ -93766,7 +93806,7 @@ in (sources."update-notifier-5.1.0" // { dependencies = [ sources."boxen-5.1.2" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."chalk-4.1.2" sources."global-dirs-3.0.0" sources."has-flag-4.0.0" @@ -93912,7 +93952,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."buffer-5.7.1" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."camelcase-keys-7.0.1" // { dependencies = [ sources."type-fest-1.4.0" @@ -94060,7 +94100,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.10" + sources."spdx-license-ids-3.0.11" sources."string-width-5.0.1" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" @@ -94295,7 +94335,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.6.0" + sources."web3-utils-1.6.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.0" @@ -94807,10 +94847,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.1.3.tgz"; - sha512 = "GKOKnNXNMCJ/FDTieZ0eAVbOWoDRzSbbUU1+QQzbSvWl2fBtWXvpz9Grrk66gkHlu1KtqzuN9zR11AIa12dEzw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.1.4.tgz"; + sha512 = "B8PYO0FPZMuaEJnvLDPPfEO+xHci7pWoS0NnEKKd+12kneObi4doQp0vqqAG+PS3oNtBRGy1nLglf8BTpCex8Q=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -94956,7 +94996,7 @@ in sources."boxen-5.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { @@ -94966,7 +95006,7 @@ in }) sources."call-bind-1.0.2" sources."camel-case-4.1.2" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."caniuse-lite-1.0.30001280" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -95072,7 +95112,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -95144,13 +95184,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.1.2" - (sources."gatsby-recipes-1.1.2" // { + sources."gatsby-core-utils-3.1.3" + (sources."gatsby-recipes-1.1.3" // { dependencies = [ sources."strip-ansi-6.0.1" ]; }) - (sources."gatsby-telemetry-3.1.2" // { + (sources."gatsby-telemetry-3.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -95447,7 +95487,7 @@ in sources."regenerator-runtime-0.13.9" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."remark-mdx-2.0.0-rc.1" + sources."remark-mdx-2.0.0-rc.2" (sources."remark-mdxjs-2.0.0-next.8" // { dependencies = [ sources."@babel/core-7.10.5" @@ -95793,7 +95833,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.10" + sources."spdx-license-ids-3.0.11" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -96119,15 +96159,15 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "34.5.0"; + version = "34.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-34.5.0.tgz"; - sha512 = "lOagLq2JwEbAnppLKWZlh1wfZv2r+FJfIvOgxtf+sy+t+CtQNIXuyPzBhzqgEKhpDDKqfSF7L9diEXVPXsISEA=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-34.6.0.tgz"; + sha512 = "CztjBIMUgD/2RbcHjDDDqKfduBARokquYnF6pUql/9v1iodq5ch4DdBqVJuLbXehyOE/UkF/RsAtnAiKy0qbxQ=="; }; dependencies = [ - sources."@gitbeaker/core-34.5.0" - sources."@gitbeaker/node-34.5.0" - sources."@gitbeaker/requester-utils-34.5.0" + sources."@gitbeaker/core-34.6.0" + sources."@gitbeaker/node-34.6.0" + sources."@gitbeaker/requester-utils-34.6.0" sources."@sindresorhus/is-4.2.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" @@ -96183,6 +96223,7 @@ in sources."li-1.3.0" sources."log-symbols-5.0.0" sources."lowercase-keys-2.0.0" + sources."mime-3.0.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" @@ -96265,7 +96306,7 @@ in sources."bl-4.1.0" (sources."boxen-5.1.2" // { dependencies = [ - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."type-fest-0.20.2" ]; }) @@ -96526,7 +96567,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.10" + sources."spdx-license-ids-3.0.11" sources."statuses-1.5.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -98956,7 +98997,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1028.0" + sources."aws-sdk-2.1029.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -99151,10 +99192,10 @@ in ijavascript = nodeEnv.buildNodePackage { name = "ijavascript"; packageName = "ijavascript"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ijavascript/-/ijavascript-5.2.0.tgz"; - sha512 = "MIV3R9d2o9uucTmNH5IU5bvXcevljsOrsH7Sv3rmf/uoXjl/iXb8hx4ZnymBpdt48f7U2m0iKmpWlQzxjthtjw=="; + url = "https://registry.npmjs.org/ijavascript/-/ijavascript-5.2.1.tgz"; + sha512 = "kH7hudp+S+8++ngjUXbiyHOhp3qa4oDVUkmf6p7+7s15PIBDv5zx878pxNRdGcWhYGy5TT683EOqeKMQw8jrFA=="; }; dependencies = [ sources."jmp-2.0.0" @@ -100486,7 +100527,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1028.0" // { + (sources."aws-sdk-2.1029.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -100729,7 +100770,7 @@ in sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" - sources."http-errors-1.8.0" + sources."http-errors-1.8.1" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" @@ -101002,7 +101043,7 @@ in ]; }) sources."requires-port-1.0.0" - sources."reselect-4.1.2" + sources."reselect-4.1.3" sources."resolve-url-0.2.1" sources."retry-0.10.1" sources."rimraf-2.7.1" @@ -101106,7 +101147,7 @@ in ]; }) sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tough-cookie-3.0.1" sources."tr46-1.0.1" sources."tree-kit-0.7.4" @@ -101467,7 +101508,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."chalk-4.1.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -102799,7 +102840,7 @@ in sources."brace-expansion-1.1.11" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-from-1.1.2" sources."bytes-3.1.0" sources."bytesish-0.4.4" @@ -102855,7 +102896,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -105690,7 +105731,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -105829,7 +105870,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -107649,7 +107690,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -109107,7 +109148,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."chalk-4.1.2" // { dependencies = [ sources."has-flag-4.0.0" @@ -109289,7 +109330,7 @@ in sources."balanced-match-1.0.2" (sources."boxen-5.1.2" // { dependencies = [ - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."type-fest-0.20.2" sources."wrap-ansi-7.0.0" ]; @@ -109842,7 +109883,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."chalk-4.1.2" sources."chownr-2.0.0" sources."ci-info-2.0.0" @@ -110560,7 +110601,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -110714,7 +110755,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.896" + sources."electron-to-chromium-1.3.899" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110824,7 +110865,7 @@ in sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."source-map-0.7.3" - sources."terser-5.9.0" + sources."terser-5.10.0" ]; }) (sources."htmlparser2-6.1.0" // { @@ -112227,9 +112268,10 @@ in sources."ms-2.0.0" (sources."multiparty-4.2.2" // { dependencies = [ - sources."http-errors-1.8.0" + sources."http-errors-1.8.1" sources."safe-buffer-5.2.1" sources."setprototypeof-1.2.0" + sources."toidentifier-1.0.1" ]; }) sources."negotiator-0.6.2" @@ -112813,10 +112855,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.21.1"; + version = "6.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.21.1.tgz"; - sha512 = "cekH8bFgZbHerGsmW4JYY5bi0jYyi/K7WZpSf8TQFlP3Kxc50KhCwNWPUzgLVImYyX8SCJcVhyNOoYQKDnmYCw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.22.2.tgz"; + sha512 = "8umiz8XtgauWmPzOrb0CvCCwyb4IkJiavnxMDvNEbDpTb/6FZh3SLVVR2WNb07obGVKY6USpo159o5zd3RHD9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -114330,7 +114372,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -114588,7 +114630,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -115978,7 +116020,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.4" - sources."@redocly/openapi-core-1.0.0-beta.67" + sources."@redocly/openapi-core-1.0.0-beta.68" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" sources."@types/node-14.17.33" @@ -116144,7 +116186,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."object-assign-4.1.1" - sources."openapi-sampler-1.1.0" + sources."openapi-sampler-1.1.1" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" @@ -116465,7 +116507,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."chalk-4.1.2" sources."chokidar-3.5.2" sources."ci-info-2.0.0" @@ -116829,7 +116871,7 @@ in sources."buffers-0.1.1" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."chainsaw-0.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -117410,7 +117452,7 @@ in }) sources."brace-expansion-1.1.11" sources."bytes-3.0.0" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" (sources."chalk-2.4.1" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -117602,7 +117644,7 @@ in sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/lodash-4.14.176" + sources."@types/lodash-4.14.177" sources."@types/long-4.0.1" sources."@types/node-16.11.7" sources."@types/request-2.48.7" @@ -117664,7 +117706,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1028.0" // { + (sources."aws-sdk-2.1029.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -117724,7 +117766,7 @@ in ]; }) sources."cachedir-2.3.0" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."caseless-0.12.0" (sources."chainsaw-0.1.0" // { dependencies = [ @@ -119028,10 +119070,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.760.0"; + version = "1.763.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.760.0.tgz"; - sha512 = "pVH3AbY30zNerW+F+okULIRYVj0r8Ksvd8WW+beMddghOH31ZePpAWjK5F+D6d3Dy3WJ3n/JyAywxiTS+2d6kQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.763.0.tgz"; + sha512 = "nZbLVKzj3P8cPImwCkdC2m9OmghiCBmEWoXQRlDtNDnRZ/jiLZtBJcJEku8DZoJUA+P+7HJGu1TxvmKz5DLadQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -120303,7 +120345,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1028.0" // { + (sources."aws-sdk-2.1029.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -121290,10 +121332,10 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.2.8"; + version = "2.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.8.tgz"; - sha512 = "y8BmSf3v+jOoVwKY0K3wAiIt3hupLiUS4HYqXSZPXJZrChKddp+N8fyNeClsDChLt2sLUo6sOAhlnok/RJ+iIw=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.9.tgz"; + sha512 = "au77iP0v2f8F0gWu5Nk3dPkASk4H6DyLQEDQrQR6a7BWJaTnGEZKFhe5EsD8f9tHLyA4awPBi+D56hVuRsbgNA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -121377,10 +121419,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.11"; + version = "0.14.12"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.11.tgz"; - sha512 = "vocQDpxGkhAmzwMuXtEmfaj+O7jWhaw2S7NOZNBTqxG0OG5FzlpHmScJ3g6MonKcY3bv3IzFTIiGIXFdTXZ9+Q=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.12.tgz"; + sha512 = "CrkiGvu88SK9zn+yJrjw8l00N3je/WHpsZLCfR9zQDNFAdKJHsCwmq/ExCHjU32wsRIfX0oIGx+TW6fF0wtzxA=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" @@ -121419,8 +121461,8 @@ in sources."normalize-path-3.0.0" sources."pascal-case-3.1.2" sources."picomatch-2.3.0" - sources."prettier-2.3.2" - sources."prettier-plugin-svelte-2.4.0" + sources."prettier-2.4.1" + sources."prettier-plugin-svelte-2.5.0" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reusify-1.0.4" @@ -121429,13 +121471,17 @@ in sources."strip-indent-3.0.0" sources."svelte-3.38.3" sources."svelte-preprocess-4.7.4" - sources."svelte2tsx-0.4.8" + sources."svelte2tsx-0.4.9" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" sources."typescript-4.4.4" - sources."vscode-css-languageservice-5.0.0" - sources."vscode-emmet-helper-2.1.2" - sources."vscode-html-languageservice-4.0.0" + sources."vscode-css-languageservice-5.1.8" + (sources."vscode-emmet-helper-2.6.4" // { + dependencies = [ + sources."vscode-uri-2.1.2" + ]; + }) + sources."vscode-html-languageservice-4.1.1" sources."vscode-jsonrpc-6.1.0-next.2" sources."vscode-languageserver-7.1.0-next.4" (sources."vscode-languageserver-protocol-3.17.0-next.5" // { @@ -121446,7 +121492,7 @@ in sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" - sources."vscode-uri-2.1.2" + sources."vscode-uri-3.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -122338,10 +122384,10 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.9.0"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz"; - sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; + url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; + sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; }; dependencies = [ sources."buffer-from-1.1.2" @@ -125696,7 +125742,7 @@ in src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ sources."@discoveryjs/json-ext-0.5.5" - sources."@types/eslint-7.28.2" + sources."@types/eslint-7.29.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" @@ -125742,11 +125788,11 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" - sources."camelcase-6.2.0" + sources."camelcase-6.2.1" sources."caniuse-lite-1.0.30001280" (sources."chalk-4.1.2" // { dependencies = [ @@ -125787,7 +125833,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.2" sources."domutils-2.8.0" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.3" @@ -125953,7 +125999,7 @@ in sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" sources."tapable-2.2.1" - (sources."terser-5.9.0" // { + (sources."terser-5.10.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.7.3" @@ -125996,14 +126042,14 @@ in sources."vscode-debugadapter-testsupport-1.50.0" sources."vscode-debugprotocol-1.50.1" sources."watchpack-2.2.0" - sources."webpack-5.64.0" + sources."webpack-5.64.1" (sources."webpack-cli-4.9.1" // { dependencies = [ sources."commander-7.2.0" ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-3.2.1" + sources."webpack-sources-3.2.2" sources."which-2.0.2" sources."wide-align-1.1.3" sources."wildcard-2.0.0" @@ -128092,13 +128138,13 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.64.0"; + version = "5.64.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.64.0.tgz"; - sha512 = "UclnN24m054HaPC45nmDEosX6yXWD+UGC12YtUs5i356DleAUGMDC9LBAw37xRRfgPKYIdCYjGA7RZ1AA+ZnGg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.64.1.tgz"; + sha512 = "b4FHmRgaaAjP+aVOVz41a9Qa5SmkUPQ+u8FntTQ1roPHahSComB6rXnLwc976VhUY4CqTaLu5mCswuHiNhOfVw=="; }; dependencies = [ - sources."@types/eslint-7.28.2" + sources."@types/eslint-7.29.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" @@ -128124,12 +128170,12 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.18.0" + sources."browserslist-4.18.1" sources."buffer-from-1.1.2" sources."caniuse-lite-1.0.30001280" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.896" + sources."electron-to-chromium-1.3.899" sources."enhanced-resolve-5.8.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -128165,7 +128211,7 @@ in sources."source-map-support-0.5.20" sources."supports-color-8.1.1" sources."tapable-2.2.1" - (sources."terser-5.9.0" // { + (sources."terser-5.10.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -128173,7 +128219,7 @@ in sources."terser-webpack-plugin-5.2.5" sources."uri-js-4.4.1" sources."watchpack-2.2.0" - sources."webpack-sources-3.2.1" + sources."webpack-sources-3.2.2" ]; buildInputs = globalBuildInputs; meta = { From 527ebd85304e7b0bf99e54e846db7870959c8ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Nov 2021 20:07:34 +0100 Subject: [PATCH 247/359] linuxPackages.bcc: 0.22.0 -> 0.23.0 --- pkgs/os-specific/linux/bcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 5ed8f496fc9c..91e53d686a1b 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -6,7 +6,7 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.22.0"; + version = "0.23.0"; disabled = !stdenv.isLinux; @@ -14,7 +14,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256-7FQz02APzjCjxCaw+e3H2GWz+UKsH0Dzgk9LoDgwDpU="; + sha256 = "sha256-4zfjr3VLg26uZ4xNKA1wayti7f2tqGvYSbwoZnr+Ygk="; fetchSubmodules = true; }; format = "other"; From 6abc7cd907ea06424e7963e949cf554a6b3914c2 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 14 Nov 2021 12:54:50 +0100 Subject: [PATCH 248/359] bluez: 5.61 -> 5.62 Fixes CVE-2021-43400. http://www.bluez.org/release-of-bluez-5-62/ https://github.com/bluez/bluez/blob/5.62/ChangeLog --- pkgs/os-specific/linux/bluez/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 3d345e68f3c3..2c05a4aa271e 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -21,11 +21,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.61"; + version = "5.62"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-g6/WxSF5VUv+q7y1OP7C62vpCorDxAhxtJ162LScQjs="; + sha256 = "sha256-OAkKW3UOF/wI0+UheO2NMlTF9L0sSIMNXBlVuI47wMI="; }; buildInputs = [ From f27f14bd7a42e6e38ca14a81be52094d8cf23c6d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 9 Nov 2021 17:43:15 +0100 Subject: [PATCH 249/359] ocamlPackages.ppx_python: init at 0.14.0 --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 13 +++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 116349746bf3..2e5a54ccad60 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -1,4 +1,5 @@ { self +, fetchpatch , lib , openssl , zstd @@ -578,6 +579,18 @@ with self; propagatedBuildInputs = [ ppxlib ]; }; + ppx_python = janePackage { + pname = "ppx_python"; + hash = "0gk4nqz4i9v3hwjg5mvgpgwj0dfcgpyc7ikba93cafyhn6fy83zk"; + meta.description = "A [@@deriving] plugin to generate Python conversion functions "; + # Compatibility with ppxlib 0.23 + patches = fetchpatch { + url = "https://github.com/janestreet/ppx_python/commit/b2fe0040cc39fa6164de868f8a20edb38d81170e.patch"; + sha256 = "sha256:1mrdwp0zw3dqavzx3ffrmzq5cdlninyf67ksavfzxb8gb16w6zpz"; + }; + propagatedBuildInputs = [ ppx_base ppxlib pyml ]; + }; + ppx_sexp_conv = janePackage { pname = "ppx_sexp_conv"; version = "0.14.3"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 74691f1df2d2..b2d2d2415e24 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1459,7 +1459,7 @@ let if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { inherit self; - inherit (pkgs) lib openssl zstd; + inherit (pkgs) fetchpatch lib openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { From 714665cf9548bfb4f4dfcf3baa274ea78e6d7138 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 9 Nov 2021 17:43:19 +0100 Subject: [PATCH 250/359] ocamlPackages.pythonlib: init at 0.14.0 --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 2e5a54ccad60..d22a87a92f3f 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -660,6 +660,13 @@ with self; propagatedBuildInputs = [ core_kernel ]; }; + pythonlib = janePackage { + pname = "pythonlib"; + hash = "0qr0mh9jiv1ham5zlz9i4im23a1vh6x1yp6dp2db2s4icmfph639"; + meta.description = "A library to help writing wrappers around ocaml code for python"; + propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ]; + }; + re2 = janePackage { pname = "re2"; hash = "1j7dizls6lkz3i9dgf8nq2fm382mfbrmz72ci066zl3hkgdq8xwc"; From 659392fe20a5582cc118b0072099a95a7f0689c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 12:10:19 +0100 Subject: [PATCH 251/359] python3Packages.ntc-templates: switch to use pythonOlder --- pkgs/development/python-modules/ntc-templates/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 9e8601dfd069..28125e54edbf 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , poetry-core , textfsm , pytestCheckHook @@ -13,7 +13,8 @@ buildPythonPackage rec { pname = "ntc-templates"; version = "3.0.0"; format = "pyproject"; - disabled = isPy27; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "networktocode"; From c0066eb9cd2bdd3acbaba230b20d936ccb82918b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 12:14:54 +0100 Subject: [PATCH 252/359] python3Packages.pyp: add pythonImportsCheck --- pkgs/development/python-modules/pyp/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyp/default.nix b/pkgs/development/python-modules/pyp/default.nix index 0b2ff25444a0..1eeeb83a9dce 100644 --- a/pkgs/development/python-modules/pyp/default.nix +++ b/pkgs/development/python-modules/pyp/default.nix @@ -12,6 +12,9 @@ buildPythonPackage rec { pname = "pyp"; version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "hauntsaninja"; @@ -27,6 +30,7 @@ buildPythonPackage rec { preCheck = '' export PATH=$out/bin:$PATH ''; + checkInputs = [ pytestCheckHook coreutils @@ -34,8 +38,12 @@ buildPythonPackage rec { bc ]; + pythonImportsCheck = [ + "pyp" + ]; + meta = with lib; { - description = "Easily run Python at the shell! Magical, but never mysterious."; + description = "Easily run Python at the shell! Magical, but never mysterious"; homepage = "https://github.com/hauntsaninja/pyp"; license = licenses.mit; maintainers = with maintainers; [ rmcgibbo ]; From 883553209927dcc88158e810e9adc3dfeb0195bd Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Tue, 16 Nov 2021 11:21:42 +0000 Subject: [PATCH 253/359] exploitdb: 2021-11-13 -> 2021-11-16 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 06c6d0bac26c..f35eecca05a9 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-11-13"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-0/ZKki+QJpBL+K3zQ0H5d5cfan+pKEYHwr6y4U+FKzM="; + sha256 = "sha256-xsTmZdEee/lrRYPemny7lUy13xXVVDrb7w1NBnkzmJM="; }; nativeBuildInputs = [ makeWrapper ]; From 916b25435fb22be405f25b20b793f1b2ac57a390 Mon Sep 17 00:00:00 2001 From: endorama <526307+endorama@users.noreply.github.com> Date: Wed, 3 Nov 2021 18:18:48 +0100 Subject: [PATCH 254/359] docopts: 0.6.3 -> 0.6.4 Version 0.6.3 was affected by a bug (https://github.com/docopt/docopts/issues/47) that has been resolved in 0.6.4. Signed-off-by: Edoardo Tenani --- pkgs/development/tools/misc/docopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix index 74450bdfe737..7a3202df40f3 100644 --- a/pkgs/development/tools/misc/docopts/default.nix +++ b/pkgs/development/tools/misc/docopts/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "docopts"; - version = "0.6.3-rc2"; + version = "0.6.4-with-no-mangle-double-dash"; src = fetchFromGitHub { owner = "docopt"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PmsTkPT/sf70MKYLhHvjCDb2o3VQ1k7d++RUW7rcoAg="; + sha256 = "0zxax0kl8wqpkzmw9ij4qgfhjbk4r7996pjyp9xf5icyk8knp00q"; }; goPackagePath = "github.com/docopt/${pname}"; From 41c57447daf586f843ba90743ce73c1d2b455a3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 13:06:16 +0100 Subject: [PATCH 255/359] python3Packages.tailscale: init at 0.1.2 --- .../python-modules/tailscale/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/tailscale/default.nix diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix new file mode 100644 index 000000000000..a2e58322cea3 --- /dev/null +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "tailscale"; + version = "0.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-tailscale"; + rev = "v${version}"; + sha256 = "1jqx2i8rghfxlb1c76f37viz9fc1vq95xb2jm3bpnx5yy4n5dly1"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pydantic + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + pythonImportsCheck = [ + "tailscale" + ]; + + meta = with lib; { + description = "Python client for the Tailscale API"; + homepage = "https://github.com/frenck/python-wled"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c63a35749259..1381f6efd8f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9090,6 +9090,8 @@ in { tailer = callPackage ../development/python-modules/tailer { }; + tailscale = callPackage ../development/python-modules/tailscale { }; + tappy = callPackage ../development/python-modules/tappy { }; tasklib = callPackage ../development/python-modules/tasklib { }; From cd548bdc6a7dd1f8701bdf5350e1292445dc6396 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 29 Oct 2021 00:57:16 +0200 Subject: [PATCH 256/359] meshcentral: add updateScript to expression --- pkgs/tools/admin/meshcentral/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 070d6ef8c211..60fab2bc8aa8 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -28,6 +28,8 @@ yarn2nix-moretea.mkYarnPackage rec { publishBinsFor = [ ]; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Computer management web app"; homepage = "https://meshcentral.com/info/"; From c7d9f452b8a271dc8684bbe5dff3cd98b3191fe4 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 29 Oct 2021 00:57:01 +0200 Subject: [PATCH 257/359] meshcentral: 0.8.98 -> 0.9.50 --- pkgs/tools/admin/meshcentral/default.nix | 4 +- pkgs/tools/admin/meshcentral/package.json | 23 +- pkgs/tools/admin/meshcentral/yarn.lock | 1225 +++++++++++++------- pkgs/tools/admin/meshcentral/yarn.nix | 1232 ++++++++++++++------- 4 files changed, 1634 insertions(+), 850 deletions(-) diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 60fab2bc8aa8..b149c1441395 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,11 +1,11 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage rec { - version = "0.8.98"; + version = "0.9.50"; src = fetchzip { url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz"; - sha256 = "0120csvak07mkgaiq4sxyslcipgfgal0mhd8gwywcij2s71a3n26"; + sha256 = "0igkl2ip2mas3djg1rmw209xar1kfiqy277r2lzi5zcnn4hh820m"; }; packageJSON = ./package.json; diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 99125c15e10a..119a3f2b5d17 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.8.98", + "version": "0.9.50", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -39,19 +39,21 @@ "body-parser": "^1.19.0", "cbor": "~5.2.0", "compression": "^1.7.4", - "cookie-session": "^2.0.0-beta.3", + "cookie-session": "^1.4.0", "express": "^4.17.0", "express-handlebars": "^3.1.0", "express-ws": "^4.0.0", "ipcheck": "^0.1.0", - "minimist": "^1.2.0", + "minimist": "^1.2.5", "multiparty": "^4.2.1", - "nedb": "^1.8.0", + "@yetzt/nedb": "^1.8.0", "node-forge": "^0.10.0", "ws": "^5.2.3", - "xmldom": "^0.5.0", "yauzl": "^2.10.0" }, + "engines": { + "node": ">=10.0.0" + }, "repository": { "type": "git", "url": "https://github.com/Ylianst/MeshCentral.git" @@ -68,10 +70,9 @@ "passport-saml": "*", "ws": "5.2.3", "cbor": "5.2.0", - "nedb": "*", + "@yetzt/nedb": "*", "https": "*", "yauzl": "*", - "xmldom": "*", "ipcheck": "*", "express": "*", "archiver": "4.0.2", @@ -80,9 +81,9 @@ "express-ws": "4.0.0", "compression": "*", "body-parser": "*", - "cookie-session": "*", + "cookie-session": "1.4.0", "express-handlebars": "*", - "node-windows": "*", + "node-windows": "0.1.4", "loadavg-windows": "*", "node-sspi": "*", "ldapauth-fork": "*", @@ -93,8 +94,10 @@ "aedes": "0.39.0", "mysql": "*", "@mysql/xdevapi": "*", - "mongodb": "*", + "mongodb": "4.1.0", "saslprep": "*", + "pg": "8.7.1", + "pgtools": "0.3.2", "mariadb": "*", "node-vault": "*", "semver": "*", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index 6d00c730024e..cba8028834b9 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -2,138 +2,138 @@ # yarn lockfile v1 -"@babel/code-frame@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" - integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== +"@babel/code-frame@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== dependencies: - "@babel/highlight" "^7.14.5" + "@babel/highlight" "^7.16.0" -"@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== +"@babel/generator@^7.16.0", "@babel/generator@^7.4.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2" + integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew== dependencies: - "@babel/types" "^7.15.0" + "@babel/types" "^7.16.0" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-function-name@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" - integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== +"@babel/helper-function-name@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" + integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog== dependencies: - "@babel/helper-get-function-arity" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/helper-get-function-arity" "^7.16.0" + "@babel/template" "^7.16.0" + "@babel/types" "^7.16.0" -"@babel/helper-get-function-arity@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" - integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== +"@babel/helper-get-function-arity@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" + integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.0" -"@babel/helper-hoist-variables@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" - integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== +"@babel/helper-hoist-variables@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" + integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" - integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== +"@babel/helper-split-export-declaration@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" + integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.0" -"@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/helper-validator-identifier@^7.15.7": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== -"@babel/highlight@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" - integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== +"@babel/highlight@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== dependencies: - "@babel/helper-validator-identifier" "^7.14.5" + "@babel/helper-validator-identifier" "^7.15.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@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/parser@^7.16.0", "@babel/parser@^7.16.3", "@babel/parser@^7.4.3": + version "7.16.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.3.tgz#271bafcb811080905a119222edbc17909c82261d" + integrity sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw== -"@babel/template@^7.14.5", "@babel/template@^7.4.0": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" - integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== +"@babel/template@^7.16.0", "@babel/template@^7.4.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" + integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A== dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/parser" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/code-frame" "^7.16.0" + "@babel/parser" "^7.16.0" + "@babel/types" "^7.16.0" "@babel/traverse@^7.4.3": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98" - integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw== + version "7.16.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" + integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag== dependencies: - "@babel/code-frame" "^7.14.5" - "@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.15.0" - "@babel/types" "^7.15.0" + "@babel/code-frame" "^7.16.0" + "@babel/generator" "^7.16.0" + "@babel/helper-function-name" "^7.16.0" + "@babel/helper-hoist-variables" "^7.16.0" + "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/parser" "^7.16.3" + "@babel/types" "^7.16.0" debug "^4.1.0" globals "^11.1.0" -"@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== +"@babel/types@^7.16.0", "@babel/types@^7.4.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" + integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== dependencies: - "@babel/helper-validator-identifier" "^7.14.9" + "@babel/helper-validator-identifier" "^7.15.7" to-fast-properties "^2.0.0" "@mysql/xdevapi@*": - version "8.0.26" - resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.26.tgz#bdf5752553c53c32d665bfa3034f21fbfa989611" - integrity sha512-YiBW91Z4igfUil6y6+kWV2BNlD3JQvBgVjwIfpbuPdOGiPwh/eb6zc1fyFSxa5sY3PmMKc/7v4nhdauwPLyUwA== + version "8.0.27" + resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.27.tgz#1e19335dee89d413c7ffbfd29340a92930d2e9c6" + integrity sha512-8CVaCDxqXp6qDizxlO/GYPWv2NsYnXXPQygDHFH2rkow2Pi6zlYF7k+mIeRkH4KLZZQ+HZCfjJQkKB1kN5zTzg== dependencies: google-protobuf "3.14.0" parsimmon "1.16.0" -"@sendgrid/client@^7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.4.3.tgz#bc71aae05de2cd9aa607f4eb1d886711d09f9595" - integrity sha512-tTaHx893w5iqG0sVtUnMyRchuwYF95k4UOkmov1MouMIeMUbNvbalITo7cG7YSXUTY9rT2t4eBY6HcEBCVeqfg== +"@sendgrid/client@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.0.tgz#f90cb8759c96e1d90224f29ad98f8fdc2be287f3" + integrity sha512-cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA== dependencies: - "@sendgrid/helpers" "^7.4.3" - axios "^0.21.1" + "@sendgrid/helpers" "^7.6.0" + axios "^0.21.4" -"@sendgrid/helpers@^7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.4.3.tgz#231a4405266cfa291054df8b668fe3a4dc9387aa" - integrity sha512-Wt+68g1sVEM5UspJh34O/cxtv6BBbtAIk7U9B3PB2ySOtPs9e6hI1QkgYVwpNmkt7k2p86muUNyma/Aig25agg== +"@sendgrid/helpers@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.6.0.tgz#b381bfab391bcd66c771811b22bb6bb2d5c1dfc6" + integrity sha512-0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA== dependencies: deepmerge "^4.2.2" "@sendgrid/mail@*": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.4.5.tgz#22cef36e793134833b36aff5d3f4f53e8f81dd52" - integrity sha512-adXMvrTUOlYr7+UTigZRGSYR9vheBv1y4fF2mugn29NBdQMfcQPGLQ5vIHgSAfcboBFCagZdamZqM5FeSGU0Hw== + version "7.6.0" + resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.0.tgz#e74ee30110527feab5d3b83d68af0cd94537f6d2" + integrity sha512-0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw== dependencies: - "@sendgrid/client" "^7.4.3" - "@sendgrid/helpers" "^7.4.3" + "@sendgrid/client" "^7.6.0" + "@sendgrid/helpers" "^7.6.0" -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== "@types/geojson@^7946.0.7": version "7946.0.8" @@ -148,14 +148,14 @@ "@types/node" "*" "@types/node@*": - version "16.4.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz#7dfd9c14661edc65cccd43a29eb454174642370d" - integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg== + version "16.11.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" + integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== "@types/node@^14.14.14", "@types/node@^14.14.28": - version "14.17.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.9.tgz#b97c057e6138adb7b720df2bd0264b03c9f504fd" - integrity sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g== + version "14.17.33" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.33.tgz#011ee28e38dc7aee1be032ceadf6332a0ab15b12" + integrity sha512-noEeJ06zbn3lOh4gqe2v7NMGS33jrulfNqYFDjjEbhpDEHR5VTxgYNQSBqBlJIsBJW3uEYDgD6kvMnrrhGzq8g== "@types/webidl-conversions@*": version "6.1.1" @@ -170,6 +170,11 @@ "@types/node" "*" "@types/webidl-conversions" "*" +"@xmldom/xmldom@^0.7.0", "@xmldom/xmldom@^0.7.5": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d" + integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A== + "@xmpp/base64@^0.9.0": version "0.9.0" resolved "https://registry.yarnpkg.com/@xmpp/base64/-/base64-0.9.0.tgz#f5914c2b7228d833020af991a2a207267fc8fcf4" @@ -380,6 +385,22 @@ dependencies: ltx "^2.8.1" +"@yetzt/binary-search-tree@^0.2.6": + version "0.2.6" + resolved "https://registry.yarnpkg.com/@yetzt/binary-search-tree/-/binary-search-tree-0.2.6.tgz#91b2d861c089da0bfbeceb5deeca57b81c4210ec" + integrity sha512-e/8wt8AAumI8VK5sv09b3IgWuRoblXJ5z0SQYfrL2nap89oKihvVaP1zy3FzD5NaeRi1X0gdXZA9lB3QAZILBg== + +"@yetzt/nedb@^1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@yetzt/nedb/-/nedb-1.8.0.tgz#c0e03bfd5f9e76045d4e4baacbebd271cb221258" + integrity sha512-1hUV/eIPSCRb4Vs9dgLekBCCawWNtf29immIF9kvzxnnnEoWgyFSDZgFvlFCiQ3Bzo8ifXn92HDS3l9fNvmtzA== + dependencies: + "@yetzt/binary-search-tree" "^0.2.6" + async "^3.2.0" + localforage "^1.9.0" + mkdirp "^1.0.4" + underscore "^1.13.1" + abab@^2.0.3, abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" @@ -451,10 +472,10 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4: - version "8.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" - integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== +acorn@^8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" + integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== aedes-packet@^1.0.0: version "1.0.0" @@ -766,9 +787,9 @@ asn1.js@^5.3.0: safer-buffer "^2.1.0" asn1@^0.2.4, asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + version "0.2.6" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" + integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ== dependencies: safer-buffer "~2.1.0" @@ -792,11 +813,6 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async@0.2.10: - version "0.2.10" - resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" - integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E= - async@^2.0.1: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" @@ -805,9 +821,9 @@ async@^2.0.1: lodash "^4.17.14" async@^3.2.0, async@~3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" - integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== + version "3.2.2" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd" + integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g== asynckit@^0.4.0: version "0.4.0" @@ -829,13 +845,20 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -axios@0.21.1, axios@^0.21.1: +axios@0.21.1: version "0.21.1" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== dependencies: follow-redirects "^1.10.0" +axios@^0.21.1, axios@^0.21.4: + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== + dependencies: + follow-redirects "^1.14.0" + babel-cli@^6.16.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" @@ -1387,13 +1410,6 @@ binary-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== -binary-search-tree@0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/binary-search-tree/-/binary-search-tree-0.2.5.tgz#7dbb3b210fdca082450dad2334c304af39bdc784" - integrity sha1-fbs7IQ/coIJFDa0jNMMErzm9x4Q= - dependencies: - underscore "~1.4.4" - binary-search@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/binary-search/-/binary-search-1.3.6.tgz#e32426016a0c5092f0f3598836a1c7da3560565c" @@ -1428,7 +1444,7 @@ bl@^4.0.2, bl@^4.0.3: inherits "^2.0.4" readable-stream "^3.4.0" -bluebird@^3.5.0: +bluebird@^3.3.5, bluebird@^3.5.0: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -1510,9 +1526,9 @@ bson@^1.1.4: integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg== bson@^4.4.0: - version "4.4.1" - resolved "https://registry.yarnpkg.com/bson/-/bson-4.4.1.tgz#682c3cb8b90b222414ce14ef8398154ba2cc21bc" - integrity sha512-Uu4OCZa0jouQJCKOk1EmmyqtdWAP5HVLru4lQxTwzJzxT+sJ13lVpEZU/MATDxtHiekWMAL84oQY3Xn1LpJVSg== + version "4.5.4" + resolved "https://registry.yarnpkg.com/bson/-/bson-4.5.4.tgz#5f74f1e11f743ea8aec30b5e24bfddae82846873" + integrity sha512-wIt0bPACnx8Ju9r6IsS2wVtGDHBr9Dxb+U29A1YED2pu8XOhS8aKjOnLZ8sxyXkPwanoK7iWWVhS1+coxde6xA== dependencies: buffer "^5.6.0" @@ -1526,6 +1542,11 @@ buffer-equal-constant-time@1.0.1: resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= +buffer-writer@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" + integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw== + buffer@^5.1.0, buffer@^5.5.0, buffer@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" @@ -1624,6 +1645,11 @@ camelcase@^1.0.2: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk= +camelcase@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" + integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= + camelcase@^5.0.0: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" @@ -1725,9 +1751,9 @@ class-utils@^0.3.5: static-extend "^0.1.1" clean-css@^4.2.1: - version "4.2.3" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" - integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== + version "4.2.4" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178" + integrity sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A== dependencies: source-map "~0.6.0" @@ -1750,6 +1776,15 @@ cliui@^2.1.0: right-align "^0.1.1" wordwrap "0.0.2" +cliui@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi "^2.0.0" + cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" @@ -1759,6 +1794,11 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + collect-all@^1.0.2, collect-all@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/collect-all/-/collect-all-1.0.4.tgz#50cd7119ac24b8e12a661f0f8c3aa0ea7222ddfc" @@ -2011,15 +2051,14 @@ convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0: dependencies: safe-buffer "~5.1.1" -cookie-session@^2.0.0-beta.3: - version "2.0.0-rc.1" - resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.0.0-rc.1.tgz#66fa03f26e5873d681d70f14bff5e48a94c53d37" - integrity sha512-zg80EsLe7S1J4y0XxV7SZ8Fbi90ZZoampuX2bfYDOvJfc//98sSlZC41YDzTTjtVbeU1VlVdBbldXOOyi5xzEw== +cookie-session@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-1.4.0.tgz#c325aea685ceb9c8e4fd00b0313a46d547747380" + integrity sha512-0hhwD+BUIwMXQraiZP/J7VP2YFzqo6g4WqZlWHtEHQ22t0MeZZrNBSCxC1zcaLAs8ApT3BzAKizx9gW/AP9vNA== dependencies: cookies "0.8.0" - debug "3.2.6" + debug "2.6.9" on-headers "~1.0.2" - safe-buffer "5.2.0" cookie-signature@1.0.6: version "1.0.6" @@ -2049,11 +2088,16 @@ core-js@^2.0.1, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-util-is@1.0.2, core-util-is@~1.0.0: +core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + cp-file@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d" @@ -2139,10 +2183,10 @@ crypt@0.0.2: resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs= -cssom@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== +cssom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" + integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== cssom@~0.3.6: version "0.3.8" @@ -2163,14 +2207,14 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -data-urls@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" - integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== +data-urls@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.1.tgz#597fc2ae30f8bc4dbcf731fcd1b1954353afc6f8" + integrity sha512-Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw== dependencies: abab "^2.0.3" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^10.0.0" dateformat@~3.0.3: version "3.0.3" @@ -2178,9 +2222,9 @@ dateformat@~3.0.3: integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== dayjs@^1.8.29: - version "1.10.6" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63" - integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw== + version "1.10.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" + integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== ddata@~0.1.25: version "0.1.28" @@ -2210,26 +2254,19 @@ debug@3.1.0: dependencies: ms "2.0.0" -debug@3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== - dependencies: - ms "^2.1.1" - -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== dependencies: ms "2.1.2" -decamelize@^1.0.0, decamelize@^1.2.0: +decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decimal.js@^10.2.1: +decimal.js@^10.3.1: version "10.3.1" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== @@ -2245,9 +2282,9 @@ deep-extend@~0.4.1: integrity sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8= deep-is@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: version "4.2.2" @@ -2301,9 +2338,9 @@ delayed-stream@~1.0.0: integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= denque@^1.4.1, denque@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de" - integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ== + version "1.5.1" + resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf" + integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw== depd@~1.1.2: version "1.1.2" @@ -2363,12 +2400,12 @@ dmd@^1.4.1: string-tools "^1.0.0" walk-back "^2.0.1" -domexception@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" - integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== +domexception@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" + integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== dependencies: - webidl-conversions "^5.0.0" + webidl-conversions "^7.0.0" dtrace-provider@~0.8: version "0.8.8" @@ -2419,7 +2456,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -error-ex@^1.3.1: +error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== @@ -2467,9 +2504,9 @@ esprima@*, esprima@^4.0.0, esprima@^4.0.1: integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== esutils@^2.0.2: version "2.0.3" @@ -2641,9 +2678,9 @@ extsprintf@1.3.0: integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== fast-deep-equal@^3.1.1: version "3.1.3" @@ -2666,9 +2703,11 @@ fast-text-encoding@^1.0.0: integrity sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig== fast-xml-parser@^3.19.0: - version "3.19.0" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01" - integrity sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg== + version "3.21.1" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz#152a1d51d445380f7046b304672dd55d15c9e736" + integrity sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg== + dependencies: + strnum "^1.0.4" fastfall@^1.5.1: version "1.5.1" @@ -2678,9 +2717,9 @@ fastfall@^1.5.1: reusify "^1.0.0" fastparallel@^2.3.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/fastparallel/-/fastparallel-2.4.0.tgz#65fbec1a5e5902494be772cf5765cbaaece08688" - integrity sha512-sacwQ7wwKlQXsa7TN24UvMBLZNLmVcPhmxccC9riFqb3N+fSczJL8eWdnZodZ/KijGVgNBBfvF/NeXER08uXnQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/fastparallel/-/fastparallel-2.4.1.tgz#0d984a5813ffa67f30b4a5cb4cb8cbe61c7ee5a5" + integrity sha512-qUmhxPgNHmvRjZKBFUNI0oZuuH9OlSIOXmJ98lhKPxMZZ7zS/Fi0wRHOihDSz0R1YiIOjxzOY4bq65YTcdBi2Q== dependencies: reusify "^1.0.4" xtend "^4.0.2" @@ -2798,6 +2837,14 @@ find-replace@^1, find-replace@^1.0.2: array-back "^1.0.4" test-value "^2.1.0" +find-up@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= + dependencies: + path-exists "^2.0.0" + pinkie-promise "^2.0.0" + find-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -2838,10 +2885,10 @@ flagged-respawn@^1.0.1: resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== -follow-redirects@^1.10.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" - integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== +follow-redirects@^1.10.0, follow-redirects@^1.14.0: + version "1.14.5" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" + integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -2875,15 +2922,6 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -2963,24 +3001,29 @@ function-bind@^1.1.1: integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== gaxios@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.0.tgz#ad4814d89061f85b97ef52aed888c5dbec32f774" - integrity sha512-pHplNbslpwCLMyII/lHPWFQbJWOX0B3R1hwBEOvzYi1GmdKZruuEHK4N9V6f7tf1EaPYyF80mui1+344p6SmLg== + version "4.3.2" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.2.tgz#845827c2dc25a0213c8ab4155c7a28910f5be83f" + integrity sha512-T+ap6GM6UZ0c4E6yb1y/hy2UB6hTrqhglp3XfmU9qbLCGRYhLVV5aRPpC4EmoG8N8zOnkYCgoBz+ScvGAARY6Q== dependencies: abort-controller "^3.0.0" extend "^3.0.2" https-proxy-agent "^5.0.0" is-stream "^2.0.0" - node-fetch "^2.3.0" + node-fetch "^2.6.1" gcp-metadata@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.0.tgz#0423d06becdbfb9cbb8762eaacf14d5324997900" - integrity sha512-L9XQUpvKJCM76YRSmcxrR4mFPzPGsgZUH+GgHMxAET8qc6+BhRJq63RLhWakgEO2KKVgeSDVfyiNjkGSADwNTA== + version "4.3.1" + resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.1.tgz#fb205fe6a90fef2fd9c85e6ba06e5559ee1eefa9" + integrity sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A== dependencies: gaxios "^4.0.0" json-bigint "^1.0.0" +get-caller-file@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" + integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== + get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -3001,9 +3044,9 @@ get-value@^2.0.3, get-value@^2.0.6: integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= getobject@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.0.1.tgz#17d86a05913c15d173a5bcf8662dc7c7ac5ce147" - integrity sha512-tj18lLe+917AACr6BdVoUuHnBPTVd9BEJp1vxnMZ58ztNvuxz9Ufa+wf3g37tlGITH35jggwZ2d9lcgHJJgXfQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.0.2.tgz#25ec87a50370f6dcc3c6ba7ef43c4c16215c4c89" + integrity sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg== getpass@^0.1.1: version "0.1.7" @@ -3048,10 +3091,10 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.6: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== +glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -3071,6 +3114,18 @@ glob@~5.0.0: once "^1.3.0" path-is-absolute "^1.0.0" +glob@~7.1.6: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + global-modules@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" @@ -3102,9 +3157,9 @@ globals@^9.18.0: integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== google-auth-library@^7.0.2: - 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== + version "7.10.2" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.2.tgz#7e48176f50e725e1d65b6a838ec9e9464e6ba689" + integrity sha512-M37o9Kxa/TLvOLgF71SXvLeVEP5sbSTmKl1zlIgl72SFy5PtsU3pOdu8G8MIHHpQ3/NZabDI8rQkA9DvQVKkPA== dependencies: arrify "^2.0.0" base64-js "^1.3.0" @@ -3117,9 +3172,9 @@ google-auth-library@^7.0.2: lru-cache "^6.0.0" google-p12-pem@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.1.tgz#98fb717b722d12196a3e5b550c44517562269859" - integrity sha512-e9CwdD2QYkpvJsktki3Bm8P8FSGIneF+/42a9F9QHcQvJ73C2RoYZdrwRl6BhwksWtzl65gT4OnBROhUIFw95Q== + version "3.1.2" + resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.2.tgz#c3d61c2da8e10843ff830fdb0d2059046238c1d4" + integrity sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A== dependencies: node-forge "^0.10.0" @@ -3129,9 +3184,9 @@ google-protobuf@3.14.0: integrity sha512-bwa8dBuMpOxg7COyqkW6muQuvNnWgVN8TX/epDRGW5m0jcrmq2QJyCyiV8ZE2/6LaIIqJtiv9bYokFhfpy/o6w== googleapis-common@^5.0.2: - 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== + version "5.0.5" + resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.5.tgz#4c7160be1ed7e4cc8cdbcdb6eac8a4b3a61dd782" + integrity sha512-o2dgoW4x4fLIAN+IVAOccz3mEH8Lj1LP9c9BSSvkNJEn+U7UZh0WSr4fdH08x5VH7+sstIpd1lOYFZD0g7j4pw== dependencies: extend "^3.0.2" gaxios "^4.0.0" @@ -3141,9 +3196,9 @@ googleapis-common@^5.0.2: uuid "^8.0.0" googleapis@*: - version "83.0.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-83.0.0.tgz#045399fe8403d8516add6aa90802dda604fcfe20" - integrity sha512-/xzWnSPfZC6jwoq4bY8gMauGHF2kIbWZJ6bPgMUzI4zUGAhGD7YttHtbZX6Vz/eYIviYaQtL7HIvw5Jnei/TzA== + version "91.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-91.0.0.tgz#c5e51ca568ed687f0694a082237c7b7b96a19b3b" + integrity sha512-iHqXZwgYam0g8n0Yyi+YHx8kgwT+H5O4k3fe0LB1JhWRp1dSKYu+ShY4PQbW584zLOE4kK3LHf2B+x1THx+ZPQ== dependencies: google-auth-library "^7.0.2" googleapis-common "^5.0.2" @@ -3229,9 +3284,9 @@ grunt@^1.0.1: rimraf "~3.0.2" gtoken@^5.0.4: - version "5.3.0" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.0.tgz#6536eb2880d9829f0b9d78f756795d4d9064b217" - integrity sha512-mCcISYiaRZrJpfqOs0QWa6lfEM/C1V9ASkzFmuz43XBb5s1Vynh+CZy1ECeeJXVGx2PRByjYzb4Y4/zr1byr0w== + version "5.3.1" + resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.1.tgz#c1c2598a826f2b5df7c6bb53d7be6cf6d50c3c78" + integrity sha512-yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ== dependencies: gaxios "^4.0.0" google-p12-pem "^3.0.3" @@ -3427,12 +3482,12 @@ hot-patcher@^0.5.0: resolved "https://registry.yarnpkg.com/hot-patcher/-/hot-patcher-0.5.0.tgz#9d401424585aaf3a91646b816ceff40eb6a916b9" integrity sha512-2Uu2W0s8+dnqXzdlg0MRsRzPoDCs1wVjOGSyMRRaMzLDX4bgHw6xDYKccsWafXPPxQpkQfEjgW6+17pwcg60bw== -html-encoding-sniffer@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" - integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== +html-encoding-sniffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" + integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== dependencies: - whatwg-encoding "^1.0.5" + whatwg-encoding "^2.0.0" html-escaper@^2.0.0: version "2.0.2" @@ -3475,22 +3530,22 @@ http-errors@~1.7.2: toidentifier "1.0.0" http-errors@~1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507" - integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A== + version "1.8.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== dependencies: depd "~1.1.2" inherits "2.0.4" setprototypeof "1.2.0" statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" + toidentifier "1.0.1" -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== dependencies: - "@tootallnate/once" "1" + "@tootallnate/once" "2" agent-base "6" debug "4" @@ -3530,7 +3585,7 @@ iconv-lite@0.4.24, iconv-lite@~0.4.13: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.6.3: +iconv-lite@0.6.3, iconv-lite@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -3594,6 +3649,11 @@ invariant@^2.2.2: dependencies: loose-envify "^1.0.0" +invert-kv@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -3644,9 +3704,9 @@ is-buffer@^1.1.5, is-buffer@~1.1.6: integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== is-core-module@^2.2.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491" - integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg== + version "2.8.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== dependencies: has "^1.0.3" @@ -3721,6 +3781,13 @@ is-finite@^1.0.0: resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -3734,9 +3801,9 @@ is-glob@^2.0.0, is-glob@^2.0.1: is-extglob "^1.0.0" is-glob@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" @@ -3815,6 +3882,11 @@ is-unc-path@^1.0.0: dependencies: unc-path-regex "^0.1.2" +is-utf8@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= + is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -4005,22 +4077,22 @@ jsdoc2md-stats@^1.0.3: feature-detect-es6 "^1.3.1" jsdom@*: - version "16.7.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" - integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== + version "18.1.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-18.1.0.tgz#43e88a0e4d6d2aeeec0a18810c0934c02b2ae3e4" + integrity sha512-q6QFAfSGLEUqRJ+GCV6vn6ItZCMARWh1d33wiJZPxc+wMNw7HK71JPmQ4C2lIZAsBH8TiJu4uplach/UcrC6bQ== dependencies: abab "^2.0.5" - acorn "^8.2.4" + acorn "^8.5.0" acorn-globals "^6.0.0" - cssom "^0.4.4" + cssom "^0.5.0" cssstyle "^2.3.0" - data-urls "^2.0.0" - decimal.js "^10.2.1" - domexception "^2.0.1" + data-urls "^3.0.1" + decimal.js "^10.3.1" + domexception "^4.0.0" escodegen "^2.0.0" - form-data "^3.0.0" - html-encoding-sniffer "^2.0.1" - http-proxy-agent "^4.0.1" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" is-potential-custom-element-name "^1.0.1" nwsapi "^2.2.0" @@ -4029,13 +4101,13 @@ jsdom@*: symbol-tree "^3.2.4" tough-cookie "^4.0.0" w3c-hr-time "^1.0.2" - w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.1.0" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.5.0" - ws "^7.4.6" - xml-name-validator "^3.0.0" + w3c-xmlserializer "^3.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^10.0.0" + ws "^8.2.3" + xml-name-validator "^4.0.0" jsesc@^1.3.0: version "1.3.0" @@ -4203,12 +4275,19 @@ lazy-cache@^1.0.3: integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4= lazystream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" - integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ= + version "1.0.1" + resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638" + integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw== dependencies: readable-stream "^2.0.5" +lcid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= + dependencies: + invert-kv "^1.0.0" + ldap-filter@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/ldap-filter/-/ldap-filter-0.3.3.tgz#2b14c68a2a9d4104dbdbc910a1ca85fd189e9797" @@ -4269,6 +4348,17 @@ liftup@~3.0.1: rechoir "^0.7.0" resolve "^1.19.0" +load-json-file@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" + integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + pinkie-promise "^2.0.0" + strip-bom "^2.0.0" + load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" @@ -4286,10 +4376,10 @@ loadavg-windows@*: dependencies: weak-daemon "1.0.3" -localforage@^1.3.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz#f3e4d32a8300b362b4634cc4e066d9d00d2f09d1" - integrity sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g== +localforage@^1.9.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4" + integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg== dependencies: lie "3.1.1" @@ -4301,6 +4391,11 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +lodash.assign@^4.1.0, lodash.assign@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" + integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= + lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -4443,9 +4538,9 @@ map-visit@^1.0.0: object-visit "^1.0.0" mariadb@*: - version "2.5.4" - resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.4.tgz#c66daa35e2768b8c714c758453531c06ae4927f4" - integrity sha512-4vQgMRyBIN9EwSQG0vzjR9D8bscPH0dGPJt67qVlOkHSiSm0xUatg1Pft4o1LzORgeOW4PheiY/HBE9bYYmNCA== + version "2.5.5" + resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.5.tgz#a9aff9f1e57231a415a21254489439beb501c803" + integrity sha512-6dklvcKWuuaV1JjAwnE2ezR+jTt7JrZHftgeHHBmjB0wgfaUpdxol1DPWclwMcCrsO9yoM0FuCOiCcCgXc//9Q== dependencies: "@types/geojson" "^7946.0.7" "@types/node" "^14.14.28" @@ -4556,17 +4651,17 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.49.0, "mime-db@>= 1.43.0 < 2": - version "1.49.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" - integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== +mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": + version "1.51.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.32" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" - integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== + version "2.1.34" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: - mime-db "1.49.0" + mime-db "1.51.0" mime@1.6.0: version "1.6.0" @@ -4614,7 +4709,7 @@ minimatch@^2.0.1: dependencies: brace-expansion "^1.0.0" -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== @@ -4644,7 +4739,7 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: dependencies: minimist "^1.2.5" -mkdirp@~1.0.4: +mkdirp@^1.0.4, mkdirp@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -4657,9 +4752,9 @@ modern-syslog@*: nan "^2.13.2" moment-timezone@^0.5.33: - version "0.5.33" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c" - integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w== + version "0.5.34" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c" + integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg== dependencies: moment ">= 2.9.0" @@ -4669,14 +4764,14 @@ moment-timezone@^0.5.33: integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== mongodb-connection-string-url@^1.0.1: - 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== + version "1.1.2" + resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-1.1.2.tgz#a115902fee402b9b24a80c16ced94818daedad91" + integrity sha512-mp5lv4guWuykOpkwNNqQ0tKKytuJUjL/aC/bu/DqoJVWL5NSh4j/u+gJ+EiOdweLujHyq6JZZqcTVipHhL5xRg== dependencies: "@types/whatwg-url" "^8.0.0" whatwg-url "^8.4.0" -mongodb@*: +mongodb@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.1.0.tgz#f491de5d52003f41dffbc6ebfd8b95be21174d63" integrity sha512-Gx9U9MsFWgJ3E0v4oHAdWvYTGBznNYPCkhmD/3i/kPTY/URnPfHD5/6VoKUFrdgQTK3icFiM9976hVbqCRBO9Q== @@ -4688,14 +4783,14 @@ mongodb@*: saslprep "^1.0.0" mongodb@^3.3.2: - version "3.6.11" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.11.tgz#8a59a0491a92b00a8c925f72ed9d9a5b054aebb2" - integrity sha512-4Y4lTFHDHZZdgMaHmojtNAlqkvddX2QQBEN0K//GzxhGwlI9tZ9R0vhbjr1Decw+TF7qK0ZLjQT292XgHRRQgw== + version "3.7.3" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.7.3.tgz#b7949cfd0adc4cc7d32d3f2034214d4475f175a5" + integrity sha512-Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw== dependencies: bl "^2.2.1" bson "^1.1.4" denque "^1.4.1" - optional-require "^1.0.3" + optional-require "^1.1.8" safe-buffer "^5.1.2" optionalDependencies: saslprep "^1.0.0" @@ -4784,7 +4879,7 @@ mysql@*: safe-buffer "5.1.2" sqlstring "2.3.1" -nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.14.1, nan@^2.14.2: +nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.14.1, nan@^2.15.0: version "2.15.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== @@ -4816,17 +4911,6 @@ ncp@~2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= -nedb@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/nedb/-/nedb-1.8.0.tgz#0e3502cd82c004d5355a43c9e55577bd7bd91d88" - integrity sha1-DjUCzYLABNU1WkPJ5VV3vXvZHYg= - dependencies: - async "0.2.10" - binary-search-tree "0.2.5" - localforage "^1.3.0" - mkdirp "~0.5.1" - underscore "~1.4.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -4859,10 +4943,12 @@ node-addon-api@^1.7.1: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== -node-fetch@^2.3.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== +node-fetch@^2.3.0, node-fetch@^2.6.1: + version "2.6.6" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" + integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA== + dependencies: + whatwg-url "^5.0.0" node-forge@^0.10.0: version "0.10.0" @@ -4896,13 +4982,12 @@ node-vault@*: request-promise-native "1.0.7" tv4 "^1.2.7" -node-windows@*: - version "0.1.14" - resolved "https://registry.yarnpkg.com/node-windows/-/node-windows-0.1.14.tgz#31bb0503da3bc637f2bfaa8b266640a2e92d891f" - integrity sha1-MbsFA9o7xjfyv6qLJmZAouktiR8= +node-windows@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/node-windows/-/node-windows-0.1.4.tgz#23d5ee98b6b8290e0a3da9998ee638845fedcb1b" + integrity sha1-I9XumLa4KQ4KPamZjuY4hF/tyxs= dependencies: - optimist "~0.6.0" - xml "0.0.12" + optimist "~0.3.5" node-xcs@*: version "0.1.7" @@ -4913,9 +4998,9 @@ node-xcs@*: "@xmpp/debug" "^0.9.2" nodemailer@*: - version "6.6.3" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.3.tgz#31fb53dd4d8ae16fc088a65cb9ffa8d928a69b48" - integrity sha512-faZFufgTMrphYoDjvyVpbpJcYzwyFnbAMmQtj1lVBYAUSm3SOy2fIdd9+Mr4UxPosBa0JRw9bJoIwQn+nswiew== + version "6.7.1" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.1.tgz#09f72f8b375f7b259291757007bcd902c0174c6e" + integrity sha512-E1C8G3rnXrGjznwGP1k+OrW5k4rl0XtqTEB19f7vtJAMYwfxZVSsAu2iY5xJkrZsbVYr6PwwAwRmFlakPoFC0A== nofilter@^1.0.4: version "1.0.4" @@ -4959,6 +5044,11 @@ normalize-path@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + nwsapi@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" @@ -5127,7 +5217,7 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -optimist@^0.6.1, optimist@~0.6.0: +optimist@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY= @@ -5135,10 +5225,17 @@ optimist@^0.6.1, optimist@~0.6.0: minimist "~0.0.1" wordwrap "~0.0.2" -optional-require@^1.0.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.4.tgz#8af7da26b17da76abbf8a1c46e2e148a63813c0e" - integrity sha512-YIabCRxu1Qqlxowh5MBaT8vrvC5fa5QehT4iJw8OthkTC1ZXe7aMxtZHtwnNwJRfFgiqPof2RZeguXo4weS9mA== +optimist@~0.3.5: + version "0.3.7" + resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9" + integrity sha1-yQlBrVnkJzMokjB00s8ufLxuwNk= + dependencies: + wordwrap "~0.0.2" + +optional-require@^1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.8.tgz#16364d76261b75d964c482b2406cb824d8ec44b7" + integrity sha512-jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA== dependencies: require-at "^1.0.6" @@ -5159,6 +5256,13 @@ os-homedir@^1.0.0, os-homedir@^1.0.1: resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= +os-locale@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= + dependencies: + lcid "^1.0.0" + os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -5217,6 +5321,11 @@ package-hash@^3.0.0: lodash.flattendeep "^4.4.0" release-zalgo "^1.0.0" +packet-reader@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" + integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== + param-case@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" @@ -5243,6 +5352,13 @@ parse-glob@^3.0.4: is-extglob "^1.0.0" is-glob "^2.0.0" +parse-json@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= + dependencies: + error-ex "^1.2.0" + parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" @@ -5312,9 +5428,9 @@ passport-oauth1@1.x.x: utils-merge "1.x.x" passport-oauth2@1.x.x: - version "1.6.0" - resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.0.tgz#5f599735e0ea40ea3027643785f81a3a9b4feb50" - integrity sha512-emXPLqLcVEcLFR/QvQXZcwLmfK8e9CqvMgmOFJxcNT3okSFMtUbRRKpY20x5euD+01uHsjjCa07DYboEeLXYiw== + version "1.6.1" + resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" + integrity sha512-ZbV43Hq9d/SBSYQ22GOiglFsjsD1YY/qdiptA+8ej+9C1dL1TVB+mBE5kDH/D4AJo50+2i8f4bx0vg4/yDDZCQ== dependencies: base64url "3.x.x" oauth "0.9.x" @@ -5339,17 +5455,17 @@ passport-reddit@*: pkginfo "0.3.x" passport-saml@*: - version "3.1.1" - resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.1.tgz#257470003366e06ce3c5738aa64a1209a0f4d7e7" - integrity sha512-45YXn/BUdzMSx27lEmY0EMXck+qgR8jdnsdgNbnG5HNzwGbcSLcTkH5AoULW+6gd5fcG1rcMDtKyIJwTIMJA6A== + version "3.2.0" + resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.0.tgz#72ec8203df6dd872a205b8d5f578859a4e723e42" + integrity sha512-EUzL+Wk8ZVdvOYhCBTkUrR1fwuMwF9za1FinFabP5Tl9qeJktsJWfoiBz7Fk6jQvpLwfnfryGdvwcOlGVct41A== dependencies: - debug "^4.3.1" + "@xmldom/xmldom" "^0.7.5" + debug "^4.3.2" passport-strategy "^1.0.0" - xml-crypto "^2.1.2" - xml-encryption "^1.2.4" + xml-crypto "^2.1.3" + xml-encryption "^1.3.0" xml2js "^0.4.23" xmlbuilder "^15.1.1" - xmldom "^0.6.0" passport-strategy@1.x.x, passport-strategy@^1.0.0: version "1.0.0" @@ -5365,13 +5481,20 @@ passport-twitter@*: xtraverse "0.1.x" passport@*: - version "0.4.1" - resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270" - integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg== + version "0.5.0" + resolved "https://registry.yarnpkg.com/passport/-/passport-0.5.0.tgz#7914aaa55844f9dce8c3aa28f7d6b73647ee0169" + integrity sha512-ln+ue5YaNDS+fes6O5PCzXKSseY5u8MYhX9H5Co4s+HfYI5oqvnHKoOORLYDUPh+8tHvrxugF2GFcUA1Q1Gqfg== dependencies: passport-strategy "1.x.x" pause "0.0.1" +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= + dependencies: + pinkie-promise "^2.0.0" + path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -5409,6 +5532,15 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= +path-type@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= + dependencies: + graceful-fs "^4.1.2" + pify "^2.0.0" + pinkie-promise "^2.0.0" + path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -5431,11 +5563,77 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +pg-connection-string@^2.4.0, pg-connection-string@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" + integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== + +pg-int8@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" + integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== + +pg-pool@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c" + integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ== + +pg-protocol@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0" + integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ== + +pg-types@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3" + integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA== + dependencies: + pg-int8 "1.0.1" + postgres-array "~2.0.0" + postgres-bytea "~1.0.0" + postgres-date "~1.0.4" + postgres-interval "^1.1.0" + +pg@8.7.1, pg@^8.4.0: + version "8.7.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz#9ea9d1ec225980c36f94e181d009ab9f4ce4c471" + integrity sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA== + dependencies: + buffer-writer "2.0.0" + packet-reader "1.0.0" + pg-connection-string "^2.5.0" + pg-pool "^3.4.1" + pg-protocol "^1.5.0" + pg-types "^2.1.0" + pgpass "1.x" + +pgpass@1.x: + version "1.0.4" + resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz#85eb93a83800b20f8057a2b029bf05abaf94ea9c" + integrity sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w== + dependencies: + split2 "^3.1.1" + +pgtools@0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/pgtools/-/pgtools-0.3.2.tgz#df11d54057c889e27ba891664efda69de1b7a0fe" + integrity sha512-o9iI8CrJohpjt3hgoJuEC18oYrt/iLsc3BYtW6kP/0T7EyQ9T/WlnuzyKcC2GtfutREfXCmwaUcbqPrLw8sjng== + dependencies: + bluebird "^3.3.5" + pg "^8.4.0" + pg-connection-string "^2.4.0" + yargs "^5.0.0" + picomatch@^2.2.3: version "2.3.0" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== +pify@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + pify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" @@ -5446,6 +5644,18 @@ pify@^4.0.1: resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -5466,9 +5676,9 @@ please-upgrade-node@^3.2.0: semver-compare "^1.0.0" plivo@*: - version "4.20.1" - resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.20.1.tgz#032366930f930debab6497b2def2ab07e46361dc" - integrity sha512-0f3l/FBc00hz/BXF9Pyl1HgqWWI2XW9CLGlQN284YQqlt54T0vI5AaPd3GRlDxb6tI95u9UATTwbOgNKe5WJVQ== + version "4.23.1" + resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.23.1.tgz#bbc680db39a2c539288ae317fcb19dcdf00edcac" + integrity sha512-q8I3rcT7/4a+u650i6RzBYJ2v5uDFSfjnAd/FAJ6Wlj9guWA9zoJTdAsk4FhlKkkwvczxS6UigIqI3DORzM8OA== dependencies: "@types/node" "^14.14.14" axios "^0.21.1" @@ -5494,6 +5704,28 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= +postgres-array@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" + integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA== + +postgres-bytea@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" + integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU= + +postgres-date@~1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8" + integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q== + +postgres-interval@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695" + integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ== + dependencies: + xtend "^4.0.0" + precond@0.2: version "0.2.3" resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" @@ -5663,6 +5895,14 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" +read-pkg-up@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= + dependencies: + find-up "^1.0.0" + read-pkg "^1.0.0" + read-pkg-up@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" @@ -5671,6 +5911,15 @@ read-pkg-up@^4.0.0: find-up "^3.0.0" read-pkg "^3.0.0" +read-pkg@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" + integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= + dependencies: + load-json-file "^1.0.0" + normalize-package-data "^2.3.2" + path-type "^1.0.0" + read-pkg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" @@ -5680,7 +5929,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -5932,6 +6181,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-main-filename@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" + integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= + require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -6036,11 +6290,6 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" - integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== - safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -6213,9 +6462,9 @@ side-channel@^1.0.4: object-inspect "^1.9.0" signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + version "3.0.5" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" + integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== slash@^1.0.0: version "1.0.0" @@ -6342,9 +6591,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" - integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== + version "3.0.11" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" + integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -6353,6 +6602,13 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +split2@^3.1.1: + version "3.2.2" + resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" + integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== + dependencies: + readable-stream "^3.0.0" + sprintf-js@^1.0.3: version "1.1.2" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" @@ -6369,15 +6625,15 @@ sqlstring@2.3.1: integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= ssh2@*: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.2.0.tgz#177a46bb12b7ef2b7bce28bdcbd7eae3cbc50045" - integrity sha512-vklfVRyylayGV/zMwVEkTC9kBhA3t264hoUHV/yGuunBJh6uBGP1VlzhOp8EsqxpKnG0xkLE1qHZlU0+t8Vh6Q== + version "1.5.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.5.0.tgz#4dc559ba98a1cbb420e8d42998dfe35d0eda92bc" + integrity sha512-iUmRkhH9KGeszQwDW7YyyqjsMTf4z+0o48Cp4xOwlY5LjtbIAvyd3fwnsoUZW/hXmTCRA3yt7S/Jb9uVjErVlA== dependencies: asn1 "^0.2.4" bcrypt-pbkdf "^1.0.2" optionalDependencies: cpu-features "0.0.2" - nan "^2.14.2" + nan "^2.15.0" sshpk@^1.7.0: version "1.16.1" @@ -6447,6 +6703,15 @@ string-tools@^1.0.0: resolved "https://registry.yarnpkg.com/string-tools/-/string-tools-1.0.0.tgz#c69a9d5788858997da66f1d923ba7113ea466b5a" integrity sha1-xpqdV4iFiZfaZvHZI7pxE+pGa1o= +string-width@^1.0.1, string-width@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -6470,7 +6735,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0: +strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= @@ -6484,6 +6749,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-bom@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= + dependencies: + is-utf8 "^0.2.0" + strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" @@ -6494,6 +6766,11 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= +strnum@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.4.tgz#e97e36a7d6ba9f93d0d6b496b2ed0678d422832b" + integrity sha512-lMzNMfDpaQOLt4B2mEbfzYS0+T7dvCXeojnlGf6f1AygvWDMcWyXYaLbyICfjVu29sErR8fnRagQfBW/N/hGgw== + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -6666,6 +6943,11 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + tough-cookie@^2.3.3, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" @@ -6698,6 +6980,18 @@ tr46@^2.1.0: dependencies: punycode "^2.1.1" +tr46@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" + integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== + dependencies: + punycode "^2.1.1" + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" @@ -6726,11 +7020,11 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= twilio@*: - version "3.66.1" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.66.1.tgz#8435441ca45b0c7cb3761c4ba3011ca32e75ba69" - integrity sha512-BmIgfx2VuS7tj4IscBhyEj7CdmtfIaaJ1IuNeGoJFYBx5xikpuwkR0Ceo5CNtK5jnN3SCKmxHxToec/MYEXl0A== + version "3.71.1" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.71.1.tgz#15bbb4b51c75d91cc07a8149378c4af330e543cc" + integrity sha512-P/KFvm33UW15EnpHJKgdTxUa1u6MlR/u+sCVnL4ie2TDRv6t7kX+ieIGQMpH7bP/z7FXkTjEt0lz4M+XJ/XWOg== dependencies: - axios "^0.21.1" + axios "^0.21.4" dayjs "^1.8.29" https-proxy-agent "^5.0.0" jsonwebtoken "^8.5.1" @@ -6739,7 +7033,7 @@ twilio@*: qs "^6.9.4" rootpath "^0.1.2" scmp "^2.1.0" - url-parse "^1.5.0" + url-parse "^1.5.3" xmlbuilder "^13.0.2" type-check@~0.3.2: @@ -6773,9 +7067,9 @@ uglify-js@^2.6: uglify-to-browserify "~1.0.0" uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.1.tgz#e2cb9fe34db9cb4cf7e35d1d26dfea28e09a7d06" - integrity sha512-JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g== + version "3.14.3" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz#c0f25dfea1e8e5323eccf59610be08b6043c15cf" + integrity sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g== uglify-to-browserify@~1.0.0: version "1.0.2" @@ -6790,9 +7084,9 @@ uid-safe@2.1.5: random-bytes "~1.0.0" uid2@0.0.x: - version "0.0.3" - resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82" - integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I= + version "0.0.4" + resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44" + integrity sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA== unc-path-regex@^0.1.2: version "0.1.2" @@ -6807,10 +7101,10 @@ underscore.string@~3.3.5: sprintf-js "^1.0.3" util-deprecate "^1.0.2" -underscore@~1.4.4: - version "1.4.4" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604" - integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ= +underscore@^1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1" + integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g== underscore@~1.8.3: version "1.8.3" @@ -6872,7 +7166,7 @@ url-join@^4.0.1: resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== -url-parse@^1.5.0, url-parse@^1.5.1: +url-parse@^1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== @@ -6980,13 +7274,13 @@ vary@~1.1.2: integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= vasync@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/vasync/-/vasync-2.2.0.tgz#cfde751860a15822db3b132bc59b116a4adaf01b" - integrity sha1-z951GGChWCLbOxMrxZsRakra8Bs= + version "2.2.1" + resolved "https://registry.yarnpkg.com/vasync/-/vasync-2.2.1.tgz#d881379ff3685e4affa8e775cf0fd369262a201b" + integrity sha512-Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ== dependencies: verror "1.10.0" -verror@1.10.0, verror@^1.8.1: +verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= @@ -6995,6 +7289,15 @@ verror@1.10.0, verror@^1.8.1: core-util-is "1.0.2" extsprintf "^1.2.0" +verror@^1.8.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" + integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -7002,12 +7305,12 @@ w3c-hr-time@^1.0.2: dependencies: browser-process-hrtime "^1.0.0" -w3c-xmlserializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" - integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== +w3c-xmlserializer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923" + integrity sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg== dependencies: - xml-name-validator "^3.0.0" + xml-name-validator "^4.0.0" walk-back@^2.0.1: version "2.0.1" @@ -7037,9 +7340,9 @@ web-push@*: urlsafe-base64 "^1.0.0" webdav@*: - version "4.6.0" - resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.6.0.tgz#b12d3631562ed4a7d665dd1757349682dfc8f441" - integrity sha512-amL/NeZ73xe8cNC+uqAF3mOC/j5dNoNWlZswYCd7DKxhnZM7dViAVSv6gdCYeGAETjPEZVubcKDDRwGKz9ShQQ== + version "4.7.0" + resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.7.0.tgz#3964c72c1d5dc9854c0031b43e464f260f22476e" + integrity sha512-R1WZl/JeFPAmSEn1EPCmxSdPY8IxS/P0qnxAzBeRqEewpxVJ/UiCMJwXHLpyVsKYA1PIb1dYv+UTQsbNaQnLBw== dependencies: axios "^0.21.1" base-64 "^1.0.0" @@ -7052,31 +7355,52 @@ webdav@*: nested-property "^4.0.0" path-posix "^1.0.0" url-join "^4.0.1" - url-parse "^1.5.1" + url-parse "^1.5.3" -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= webidl-conversions@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== -whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + +whatwg-encoding@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" + integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== dependencies: - iconv-lite "0.4.24" + iconv-lite "0.6.3" -whatwg-mimetype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== -whatwg-url@^8.0.0, whatwg-url@^8.4.0, whatwg-url@^8.5.0: +whatwg-url@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz#37264f720b575b4a311bd4094ed8c760caaa05da" + integrity sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w== + dependencies: + tr46 "^3.0.0" + webidl-conversions "^7.0.0" + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +whatwg-url@^8.4.0: version "8.7.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== @@ -7085,6 +7409,11 @@ whatwg-url@^8.0.0, whatwg-url@^8.4.0, whatwg-url@^8.5.0: tr46 "^2.1.0" webidl-conversions "^6.1.0" +which-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" + integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= + which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" @@ -7116,6 +7445,11 @@ window-size@0.1.0: resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0= +window-size@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" + integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU= + word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" @@ -7154,6 +7488,14 @@ wordwrapjs@^2.0.0-0: reduce-flatten "^1.0.1" typical "^2.6.0" +wrap-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" @@ -7184,33 +7526,38 @@ ws@5.2.3, ws@^5.2.0: dependencies: async-limiter "~1.0.0" -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== +ws@^7.0.0: + version "7.5.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" + integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== -xml-crypto@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.2.tgz#501506d42e466f6cd908c5a03182217231b4e4b8" - integrity sha512-DBhZXtBjENtLwJmeJhLUBwUm9YWNjCRvAx6ESP4VJyM9PDuKqZu2Fp5Y5HKqcdJT7vV7eI25Z4UBMezji6QloQ== +ws@^8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" + integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== + +xml-crypto@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.3.tgz#6a7272b610ea3e4ea7f13e9e4876f1b20cbc32c8" + integrity sha512-MpXZwnn9JK0mNPZ5mnFIbNnQa+8lMGK4NtnX2FlJMfMWR60sJdFO9X72yO6ji068pxixzk53O7x0/iSKh6IhyQ== dependencies: - xmldom "^0.6.0" + "@xmldom/xmldom" "^0.7.0" xpath "0.0.32" -xml-encryption@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.2.4.tgz#767d13f9ff2f979ff5657b93bd72aa729d34b66c" - integrity sha512-+4aSBIv/lwmv5PntfYsZyelOnCcyDmCt/MNxXUukRGlcWW8DObJ26obbVX3iXYRdqkLqbv3AKk8ntNCGKIq/UQ== +xml-encryption@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.3.0.tgz#4cad44a59bf8bdec76d7865ce0b89e13c09962f4" + integrity sha512-3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA== dependencies: + "@xmldom/xmldom" "^0.7.0" escape-html "^1.0.3" node-forge "^0.10.0" - xmldom "~0.6.0" xpath "0.0.32" -xml-name-validator@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" - integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== +xml-name-validator@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" + integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== xml2js@^0.4.19, xml2js@^0.4.23: version "0.4.23" @@ -7220,11 +7567,6 @@ xml2js@^0.4.19, xml2js@^0.4.23: sax ">=0.6.0" xmlbuilder "~11.0.0" -xml@0.0.12: - version "0.0.12" - resolved "https://registry.yarnpkg.com/xml/-/xml-0.0.12.tgz#f08b347109912be00285785f46f15ad8e50a5f67" - integrity sha1-8Is0cQmRK+AChXhfRvFa2OUKX2c= - xmlbuilder@^13.0.2: version "13.0.2" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-13.0.2.tgz#02ae33614b6a047d1c32b5389c1fdacb2bce47a7" @@ -7255,16 +7597,6 @@ xmldom@0.1.x: resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff" integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== -xmldom@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" - integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== - -xmldom@^0.6.0, xmldom@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" - integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== - xpath@0.0.32: version "0.0.32" resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af" @@ -7282,6 +7614,11 @@ xtraverse@0.1.x: dependencies: xmldom "0.1.x" +y18n@^3.2.1: + version "3.2.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== + y18n@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" @@ -7305,6 +7642,14 @@ yargs-parser@^13.0.0, yargs-parser@^13.1.2: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-3.2.0.tgz#5081355d19d9d0c8c5d81ada908cb4e6d186664f" + integrity sha1-UIE1XRnZ0MjF2BrakIy05tGGZk8= + dependencies: + camelcase "^3.0.0" + lodash.assign "^4.1.0" + yargs@^13.2.2: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" @@ -7321,6 +7666,26 @@ yargs@^13.2.2: y18n "^4.0.0" yargs-parser "^13.1.2" +yargs@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-5.0.0.tgz#3355144977d05757dbb86d6e38ec056123b3a66e" + integrity sha1-M1UUSXfQV1fbuG1uOOwFYSOzpm4= + dependencies: + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + lodash.assign "^4.2.0" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" + window-size "^0.2.0" + y18n "^3.2.1" + yargs-parser "^3.2.0" + yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix index 2fd6d9007521..171abf0fd254 100644 --- a/pkgs/tools/admin/meshcentral/yarn.nix +++ b/pkgs/tools/admin/meshcentral/yarn.nix @@ -2,139 +2,139 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.14.5.tgz"; + name = "_babel_code_frame___code_frame_7.16.0.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; - sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; + name = "_babel_code_frame___code_frame_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz"; + sha1 = "0dfc80309beec8411e65e706461c408b0bb9b431"; }; } { - name = "_babel_generator___generator_7.15.0.tgz"; + name = "_babel_generator___generator_7.16.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.15.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz"; - sha1 = "a7d0c172e0d814974bad5aa77ace543b97917f15"; + name = "_babel_generator___generator_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz"; + sha1 = "d40f3d1d5075e62d3500bccb67f3daa8a95265b2"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; - sha1 = "89e2c474972f15d8e233b52ee8c480e2cfcd50c4"; + name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"; + sha1 = "b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; - sha1 = "25fbfa579b0937eee1f3b805ece4ce398c431815"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"; + sha1 = "0088c7486b29a9cb5d948b1a1de46db66e089cfa"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; - sha1 = "e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"; + sha1 = "4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; - sha1 = "22b23a54ef51c2b7605d851930c1976dd0bc693a"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"; + sha1 = "29672f43663e936df370aaeb22beddb3baec7438"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; path = fetchurl { - 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"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; + sha1 = "220df993bfe904a4a6b02ab4f3385a5ebf6e2389"; }; } { - name = "_babel_highlight___highlight_7.14.5.tgz"; + name = "_babel_highlight___highlight_7.16.0.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; - sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + name = "_babel_highlight___highlight_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz"; + sha1 = "6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"; }; } { - name = "_babel_parser___parser_7.15.0.tgz"; + name = "_babel_parser___parser_7.16.3.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.15.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.0.tgz"; - sha1 = "b6d6e29058ca369127b0eeca2a1c4b5794f1b6b9"; + name = "_babel_parser___parser_7.16.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.3.tgz"; + sha1 = "271bafcb811080905a119222edbc17909c82261d"; }; } { - name = "_babel_template___template_7.14.5.tgz"; + name = "_babel_template___template_7.16.0.tgz"; path = fetchurl { - name = "_babel_template___template_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz"; - sha1 = "a9bc9d8b33354ff6e55a9c60d1109200a68974f4"; + name = "_babel_template___template_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz"; + sha1 = "d16a35ebf4cd74e202083356fab21dd89363ddd6"; }; } { - name = "_babel_traverse___traverse_7.15.0.tgz"; + name = "_babel_traverse___traverse_7.16.3.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.15.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz"; - sha1 = "4cca838fd1b2a03283c1f38e141f639d60b3fc98"; + name = "_babel_traverse___traverse_7.16.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz"; + sha1 = "f63e8a938cc1b780f66d9ed3c54f532ca2d14787"; }; } { - name = "_babel_types___types_7.15.0.tgz"; + name = "_babel_types___types_7.16.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.15.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz"; - sha1 = "61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"; + name = "_babel_types___types_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz"; + sha1 = "db3b313804f96aadd0b776c4823e127ad67289ba"; }; } { - name = "_mysql_xdevapi___xdevapi_8.0.26.tgz"; + name = "_mysql_xdevapi___xdevapi_8.0.27.tgz"; path = fetchurl { - name = "_mysql_xdevapi___xdevapi_8.0.26.tgz"; - url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.26.tgz"; - sha1 = "bdf5752553c53c32d665bfa3034f21fbfa989611"; + name = "_mysql_xdevapi___xdevapi_8.0.27.tgz"; + url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.27.tgz"; + sha1 = "1e19335dee89d413c7ffbfd29340a92930d2e9c6"; }; } { - name = "_sendgrid_client___client_7.4.3.tgz"; + name = "_sendgrid_client___client_7.6.0.tgz"; path = fetchurl { - name = "_sendgrid_client___client_7.4.3.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.4.3.tgz"; - sha1 = "bc71aae05de2cd9aa607f4eb1d886711d09f9595"; + name = "_sendgrid_client___client_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.0.tgz"; + sha1 = "f90cb8759c96e1d90224f29ad98f8fdc2be287f3"; }; } { - name = "_sendgrid_helpers___helpers_7.4.3.tgz"; + name = "_sendgrid_helpers___helpers_7.6.0.tgz"; path = fetchurl { - name = "_sendgrid_helpers___helpers_7.4.3.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.4.3.tgz"; - sha1 = "231a4405266cfa291054df8b668fe3a4dc9387aa"; + name = "_sendgrid_helpers___helpers_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.6.0.tgz"; + sha1 = "b381bfab391bcd66c771811b22bb6bb2d5c1dfc6"; }; } { - name = "_sendgrid_mail___mail_7.4.5.tgz"; + name = "_sendgrid_mail___mail_7.6.0.tgz"; path = fetchurl { - name = "_sendgrid_mail___mail_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.4.5.tgz"; - sha1 = "22cef36e793134833b36aff5d3f4f53e8f81dd52"; + name = "_sendgrid_mail___mail_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.0.tgz"; + sha1 = "e74ee30110527feab5d3b83d68af0cd94537f6d2"; }; } { - name = "_tootallnate_once___once_1.1.2.tgz"; + name = "_tootallnate_once___once_2.0.0.tgz"; path = fetchurl { - name = "_tootallnate_once___once_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; - sha1 = "ccb91445360179a04e7fe6aff78c00ffc1eeaf82"; + name = "_tootallnate_once___once_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz"; + sha1 = "f544a148d3ab35801c1f633a7441fd87c2e484bf"; }; } { @@ -154,19 +154,19 @@ }; } { - name = "_types_node___node_16.4.13.tgz"; + name = "_types_node___node_16.11.7.tgz"; path = fetchurl { - 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_16.11.7.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz"; + sha1 = "36820945061326978c42a01e56b61cd223dfdc42"; }; } { - name = "_types_node___node_14.17.9.tgz"; + name = "_types_node___node_14.17.33.tgz"; path = fetchurl { - name = "_types_node___node_14.17.9.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.9.tgz"; - sha1 = "b97c057e6138adb7b720df2bd0264b03c9f504fd"; + name = "_types_node___node_14.17.33.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.33.tgz"; + sha1 = "011ee28e38dc7aee1be032ceadf6332a0ab15b12"; }; } { @@ -185,6 +185,14 @@ sha1 = "f1aac222dab7c59e011663a0cb0a3117b2ef05d4"; }; } + { + name = "_xmldom_xmldom___xmldom_0.7.5.tgz"; + path = fetchurl { + name = "_xmldom_xmldom___xmldom_0.7.5.tgz"; + url = "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz"; + sha1 = "09fa51e356d07d0be200642b0e4f91d8e6dd408d"; + }; + } { name = "_xmpp_base64___base64_0.9.0.tgz"; path = fetchurl { @@ -393,6 +401,22 @@ sha1 = "7d02ba15820b81853833a86531abe3e0d1f9abd5"; }; } + { + name = "_yetzt_binary_search_tree___binary_search_tree_0.2.6.tgz"; + path = fetchurl { + name = "_yetzt_binary_search_tree___binary_search_tree_0.2.6.tgz"; + url = "https://registry.yarnpkg.com/@yetzt/binary-search-tree/-/binary-search-tree-0.2.6.tgz"; + sha1 = "91b2d861c089da0bfbeceb5deeca57b81c4210ec"; + }; + } + { + name = "_yetzt_nedb___nedb_1.8.0.tgz"; + path = fetchurl { + name = "_yetzt_nedb___nedb_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/@yetzt/nedb/-/nedb-1.8.0.tgz"; + sha1 = "c0e03bfd5f9e76045d4e4baacbebd271cb221258"; + }; + } { name = "abab___abab_2.0.5.tgz"; path = fetchurl { @@ -482,11 +506,11 @@ }; } { - name = "acorn___acorn_8.4.1.tgz"; + name = "acorn___acorn_8.5.0.tgz"; path = fetchurl { - name = "acorn___acorn_8.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; - sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; + name = "acorn___acorn_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz"; + sha1 = "4512ccb99b3698c752591e9bb4472e38ad43cee2"; }; } { @@ -802,11 +826,11 @@ }; } { - name = "asn1___asn1_0.2.4.tgz"; + name = "asn1___asn1_0.2.6.tgz"; path = fetchurl { - name = "asn1___asn1_0.2.4.tgz"; - url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; - sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + name = "asn1___asn1_0.2.6.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz"; + sha1 = "0d3a7bb6e64e02a90c0303b31f292868ea09a08d"; }; } { @@ -841,14 +865,6 @@ sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; }; } - { - name = "async___async_0.2.10.tgz"; - path = fetchurl { - name = "async___async_0.2.10.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - } { name = "async___async_2.6.3.tgz"; path = fetchurl { @@ -858,11 +874,11 @@ }; } { - name = "async___async_3.2.1.tgz"; + name = "async___async_3.2.2.tgz"; path = fetchurl { - name = "async___async_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz"; - sha1 = "d3274ec66d107a47476a4c49136aacdb00665fc8"; + name = "async___async_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz"; + sha1 = "2eb7671034bb2194d45d30e31e24ec7e7f9670cd"; }; } { @@ -905,6 +921,14 @@ sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; }; } + { + name = "axios___axios_0.21.4.tgz"; + path = fetchurl { + name = "axios___axios_0.21.4.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; + sha1 = "c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"; + }; + } { name = "babel_cli___babel_cli_6.26.0.tgz"; path = fetchurl { @@ -1385,14 +1409,6 @@ sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; }; } - { - name = "binary_search_tree___binary_search_tree_0.2.5.tgz"; - path = fetchurl { - name = "binary_search_tree___binary_search_tree_0.2.5.tgz"; - url = "https://registry.yarnpkg.com/binary-search-tree/-/binary-search-tree-0.2.5.tgz"; - sha1 = "7dbb3b210fdca082450dad2334c304af39bdc784"; - }; - } { name = "binary_search___binary_search_1.3.6.tgz"; path = fetchurl { @@ -1514,11 +1530,11 @@ }; } { - name = "bson___bson_4.4.1.tgz"; + name = "bson___bson_4.5.4.tgz"; path = fetchurl { - name = "bson___bson_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/bson/-/bson-4.4.1.tgz"; - sha1 = "682c3cb8b90b222414ce14ef8398154ba2cc21bc"; + name = "bson___bson_4.5.4.tgz"; + url = "https://registry.yarnpkg.com/bson/-/bson-4.5.4.tgz"; + sha1 = "5f74f1e11f743ea8aec30b5e24bfddae82846873"; }; } { @@ -1537,6 +1553,14 @@ sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; }; } + { + name = "buffer_writer___buffer_writer_2.0.0.tgz"; + path = fetchurl { + name = "buffer_writer___buffer_writer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz"; + sha1 = "ce7eb81a38f7829db09c873f2fbb792c0c98ec04"; + }; + } { name = "buffer___buffer_5.7.1.tgz"; path = fetchurl { @@ -1633,6 +1657,14 @@ sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; }; } + { + name = "camelcase___camelcase_3.0.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + } { name = "camelcase___camelcase_5.3.1.tgz"; path = fetchurl { @@ -1730,11 +1762,11 @@ }; } { - name = "clean_css___clean_css_4.2.3.tgz"; + name = "clean_css___clean_css_4.2.4.tgz"; path = fetchurl { - name = "clean_css___clean_css_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; - sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; + name = "clean_css___clean_css_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz"; + sha1 = "733bf46eba4e607c6891ea57c24a989356831178"; }; } { @@ -1753,6 +1785,14 @@ sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; }; } + { + name = "cliui___cliui_3.2.0.tgz"; + path = fetchurl { + name = "cliui___cliui_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + } { name = "cliui___cliui_5.0.0.tgz"; path = fetchurl { @@ -1761,6 +1801,14 @@ sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; }; } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } { name = "collect_all___collect_all_1.0.4.tgz"; path = fetchurl { @@ -2010,11 +2058,11 @@ }; } { - name = "cookie_session___cookie_session_2.0.0_rc.1.tgz"; + name = "cookie_session___cookie_session_1.4.0.tgz"; path = fetchurl { - name = "cookie_session___cookie_session_2.0.0_rc.1.tgz"; - url = "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.0.0-rc.1.tgz"; - sha1 = "66fa03f26e5873d681d70f14bff5e48a94c53d37"; + name = "cookie_session___cookie_session_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie-session/-/cookie-session-1.4.0.tgz"; + sha1 = "c325aea685ceb9c8e4fd00b0313a46d547747380"; }; } { @@ -2065,6 +2113,14 @@ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; } + { + name = "core_util_is___core_util_is_1.0.3.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; + sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; + }; + } { name = "cp_file___cp_file_6.2.0.tgz"; path = fetchurl { @@ -2146,11 +2202,11 @@ }; } { - name = "cssom___cssom_0.4.4.tgz"; + name = "cssom___cssom_0.5.0.tgz"; path = fetchurl { - name = "cssom___cssom_0.4.4.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; - sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"; + name = "cssom___cssom_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz"; + sha1 = "d254fa92cd8b6fbd83811b9fbaed34663cc17c36"; }; } { @@ -2178,11 +2234,11 @@ }; } { - name = "data_urls___data_urls_2.0.0.tgz"; + name = "data_urls___data_urls_3.0.1.tgz"; path = fetchurl { - name = "data_urls___data_urls_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; - sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b"; + name = "data_urls___data_urls_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.1.tgz"; + sha1 = "597fc2ae30f8bc4dbcf731fcd1b1954353afc6f8"; }; } { @@ -2194,11 +2250,11 @@ }; } { - name = "dayjs___dayjs_1.10.6.tgz"; + name = "dayjs___dayjs_1.10.7.tgz"; path = fetchurl { - name = "dayjs___dayjs_1.10.6.tgz"; - url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz"; - sha1 = "288b2aa82f2d8418a6c9d4df5898c0737ad02a63"; + name = "dayjs___dayjs_1.10.7.tgz"; + url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz"; + sha1 = "2cf5f91add28116748440866a0a1d26f3a6ce468"; }; } { @@ -2225,14 +2281,6 @@ sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; }; } - { - name = "debug___debug_3.2.6.tgz"; - path = fetchurl { - name = "debug___debug_3.2.6.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; - sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; - }; - } { name = "debug___debug_4.3.2.tgz"; path = fetchurl { @@ -2274,11 +2322,11 @@ }; } { - name = "deep_is___deep_is_0.1.3.tgz"; + name = "deep_is___deep_is_0.1.4.tgz"; path = fetchurl { - name = "deep_is___deep_is_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + name = "deep_is___deep_is_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; + sha1 = "a6f2dce612fadd2ef1f519b73551f17e85199831"; }; } { @@ -2346,11 +2394,11 @@ }; } { - name = "denque___denque_1.5.0.tgz"; + name = "denque___denque_1.5.1.tgz"; path = fetchurl { - name = "denque___denque_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz"; - sha1 = "773de0686ff2d8ec2ff92914316a47b73b1c73de"; + name = "denque___denque_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz"; + sha1 = "07f670e29c9a78f8faecb2566a1e2c11929c5cbf"; }; } { @@ -2410,11 +2458,11 @@ }; } { - name = "domexception___domexception_2.0.1.tgz"; + name = "domexception___domexception_4.0.0.tgz"; path = fetchurl { - name = "domexception___domexception_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; - sha1 = "fb44aefba793e1574b0af6aed2801d057529f304"; + name = "domexception___domexception_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz"; + sha1 = "4ad1be56ccadc86fc76d033353999a8037d03673"; }; } { @@ -2538,11 +2586,11 @@ }; } { - name = "estraverse___estraverse_5.2.0.tgz"; + name = "estraverse___estraverse_5.3.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; - sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + name = "estraverse___estraverse_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz"; + sha1 = "2eea5290702f26ab8fe5370370ff86c965d21123"; }; } { @@ -2706,11 +2754,11 @@ }; } { - name = "extsprintf___extsprintf_1.4.0.tgz"; + name = "extsprintf___extsprintf_1.4.1.tgz"; path = fetchurl { - name = "extsprintf___extsprintf_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + name = "extsprintf___extsprintf_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; + sha1 = "8d172c064867f235c0c84a596806d279bf4bcc07"; }; } { @@ -2746,11 +2794,11 @@ }; } { - name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; path = fetchurl { - name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; - url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz"; - sha1 = "cb637ec3f3999f51406dd8ff0e6fc4d83e520d01"; + name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz"; + sha1 = "152a1d51d445380f7046b304672dd55d15c9e736"; }; } { @@ -2762,11 +2810,11 @@ }; } { - name = "fastparallel___fastparallel_2.4.0.tgz"; + name = "fastparallel___fastparallel_2.4.1.tgz"; path = fetchurl { - name = "fastparallel___fastparallel_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/fastparallel/-/fastparallel-2.4.0.tgz"; - sha1 = "65fbec1a5e5902494be772cf5765cbaaece08688"; + name = "fastparallel___fastparallel_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/fastparallel/-/fastparallel-2.4.1.tgz"; + sha1 = "0d984a5813ffa67f30b4a5cb4cb8cbe61c7ee5a5"; }; } { @@ -2881,6 +2929,14 @@ sha1 = "b88e7364d2d9c959559f388c66670d6130441fa0"; }; } + { + name = "find_up___find_up_1.1.2.tgz"; + path = fetchurl { + name = "find_up___find_up_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + } { name = "find_up___find_up_3.0.0.tgz"; path = fetchurl { @@ -2922,11 +2978,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.1.tgz"; + name = "follow_redirects___follow_redirects_1.14.5.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz"; - sha1 = "d9114ded0a1cfdd334e164e6662ad02bfd91ff43"; + name = "follow_redirects___follow_redirects_1.14.5.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz"; + sha1 = "f09a5848981d3c772b5392309778523f8d85c381"; }; } { @@ -2969,14 +3025,6 @@ sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; } - { - name = "form_data___form_data_3.0.1.tgz"; - path = fetchurl { - name = "form_data___form_data_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz"; - sha1 = "ebd53791b78356a99af9a300d4282c4d5eb9755f"; - }; - } { name = "form_data___form_data_4.0.0.tgz"; path = fetchurl { @@ -3074,19 +3122,27 @@ }; } { - name = "gaxios___gaxios_4.3.0.tgz"; + name = "gaxios___gaxios_4.3.2.tgz"; path = fetchurl { - name = "gaxios___gaxios_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.0.tgz"; - sha1 = "ad4814d89061f85b97ef52aed888c5dbec32f774"; + name = "gaxios___gaxios_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.2.tgz"; + sha1 = "845827c2dc25a0213c8ab4155c7a28910f5be83f"; }; } { - name = "gcp_metadata___gcp_metadata_4.3.0.tgz"; + name = "gcp_metadata___gcp_metadata_4.3.1.tgz"; path = fetchurl { - name = "gcp_metadata___gcp_metadata_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.0.tgz"; - sha1 = "0423d06becdbfb9cbb8762eaacf14d5324997900"; + name = "gcp_metadata___gcp_metadata_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.1.tgz"; + sha1 = "fb205fe6a90fef2fd9c85e6ba06e5559ee1eefa9"; + }; + } + { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; }; } { @@ -3114,11 +3170,11 @@ }; } { - name = "getobject___getobject_1.0.1.tgz"; + name = "getobject___getobject_1.0.2.tgz"; path = fetchurl { - name = "getobject___getobject_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/getobject/-/getobject-1.0.1.tgz"; - sha1 = "17d86a05913c15d173a5bcf8662dc7c7ac5ce147"; + name = "getobject___getobject_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/getobject/-/getobject-1.0.2.tgz"; + sha1 = "25ec87a50370f6dcc3c6ba7ef43c4c16215c4c89"; }; } { @@ -3162,11 +3218,11 @@ }; } { - name = "glob___glob_7.1.7.tgz"; + name = "glob___glob_7.2.0.tgz"; path = fetchurl { - name = "glob___glob_7.1.7.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; - sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + name = "glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; + sha1 = "d15535af7732e02e948f4c41628bd910293f6023"; }; } { @@ -3177,6 +3233,14 @@ sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; }; } + { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } { name = "global_modules___global_modules_1.0.0.tgz"; path = fetchurl { @@ -3210,19 +3274,19 @@ }; } { - name = "google_auth_library___google_auth_library_7.5.0.tgz"; + name = "google_auth_library___google_auth_library_7.10.2.tgz"; path = fetchurl { - 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"; + name = "google_auth_library___google_auth_library_7.10.2.tgz"; + url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.2.tgz"; + sha1 = "7e48176f50e725e1d65b6a838ec9e9464e6ba689"; }; } { - name = "google_p12_pem___google_p12_pem_3.1.1.tgz"; + name = "google_p12_pem___google_p12_pem_3.1.2.tgz"; path = fetchurl { - name = "google_p12_pem___google_p12_pem_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.1.tgz"; - sha1 = "98fb717b722d12196a3e5b550c44517562269859"; + name = "google_p12_pem___google_p12_pem_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.2.tgz"; + sha1 = "c3d61c2da8e10843ff830fdb0d2059046238c1d4"; }; } { @@ -3234,19 +3298,19 @@ }; } { - name = "googleapis_common___googleapis_common_5.0.4.tgz"; + name = "googleapis_common___googleapis_common_5.0.5.tgz"; path = fetchurl { - 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_common___googleapis_common_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.5.tgz"; + sha1 = "4c7160be1ed7e4cc8cdbcdb6eac8a4b3a61dd782"; }; } { - name = "googleapis___googleapis_83.0.0.tgz"; + name = "googleapis___googleapis_91.0.0.tgz"; path = fetchurl { - name = "googleapis___googleapis_83.0.0.tgz"; - url = "https://registry.yarnpkg.com/googleapis/-/googleapis-83.0.0.tgz"; - sha1 = "045399fe8403d8516add6aa90802dda604fcfe20"; + name = "googleapis___googleapis_91.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-91.0.0.tgz"; + sha1 = "c5e51ca568ed687f0694a082237c7b7b96a19b3b"; }; } { @@ -3314,11 +3378,11 @@ }; } { - name = "gtoken___gtoken_5.3.0.tgz"; + name = "gtoken___gtoken_5.3.1.tgz"; path = fetchurl { - name = "gtoken___gtoken_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.0.tgz"; - sha1 = "6536eb2880d9829f0b9d78f756795d4d9064b217"; + name = "gtoken___gtoken_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.1.tgz"; + sha1 = "c1c2598a826f2b5df7c6bb53d7be6cf6d50c3c78"; }; } { @@ -3546,11 +3610,11 @@ }; } { - name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + name = "html_encoding_sniffer___html_encoding_sniffer_3.0.0.tgz"; path = fetchurl { - name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; - sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3"; + name = "html_encoding_sniffer___html_encoding_sniffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz"; + sha1 = "2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"; }; } { @@ -3586,19 +3650,19 @@ }; } { - name = "http_errors___http_errors_1.8.0.tgz"; + name = "http_errors___http_errors_1.8.1.tgz"; path = fetchurl { - name = "http_errors___http_errors_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz"; - sha1 = "75d1bbe497e1044f51e4ee9e704a62f28d336507"; + name = "http_errors___http_errors_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz"; + sha1 = "7c3f28577cbc8a207388455dbd62295ed07bd68c"; }; } { - name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; path = fetchurl { - name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; - sha1 = "8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"; + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; + sha1 = "5129800203520d434f142bc78ff3c170800f2b43"; }; } { @@ -3729,6 +3793,14 @@ sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; }; } + { + name = "invert_kv___invert_kv_1.0.0.tgz"; + path = fetchurl { + name = "invert_kv___invert_kv_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + } { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; path = fetchurl { @@ -3794,11 +3866,11 @@ }; } { - name = "is_core_module___is_core_module_2.5.0.tgz"; + name = "is_core_module___is_core_module_2.8.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz"; - sha1 = "f754843617c70bfd29b7bd87327400cda5c18491"; + name = "is_core_module___is_core_module_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz"; + sha1 = "0321336c3d0925e497fd97f5d95cb114a5ccd548"; }; } { @@ -3889,6 +3961,14 @@ sha1 = "904135c77fb42c0641d6aa1bcdbc4daa8da082f3"; }; } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } { name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; path = fetchurl { @@ -3906,11 +3986,11 @@ }; } { - name = "is_glob___is_glob_4.0.1.tgz"; + name = "is_glob___is_glob_4.0.3.tgz"; path = fetchurl { - name = "is_glob___is_glob_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; - sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + name = "is_glob___is_glob_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz"; + sha1 = "64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"; }; } { @@ -4017,6 +4097,14 @@ sha1 = "d731e8898ed090a12c352ad2eaed5095ad322c9d"; }; } + { + name = "is_utf8___is_utf8_0.2.1.tgz"; + path = fetchurl { + name = "is_utf8___is_utf8_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + } { name = "is_windows___is_windows_1.0.2.tgz"; path = fetchurl { @@ -4194,11 +4282,11 @@ }; } { - name = "jsdom___jsdom_16.7.0.tgz"; + name = "jsdom___jsdom_18.1.0.tgz"; path = fetchurl { - name = "jsdom___jsdom_16.7.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz"; - sha1 = "918ae71965424b197c819f8183a754e18977b710"; + name = "jsdom___jsdom_18.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-18.1.0.tgz"; + sha1 = "43e88a0e4d6d2aeeec0a18810c0934c02b2ae3e4"; }; } { @@ -4402,11 +4490,19 @@ }; } { - name = "lazystream___lazystream_1.0.0.tgz"; + name = "lazystream___lazystream_1.0.1.tgz"; path = fetchurl { - name = "lazystream___lazystream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz"; - sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + name = "lazystream___lazystream_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz"; + sha1 = "494c831062f1f9408251ec44db1cba29242a2638"; + }; + } + { + name = "lcid___lcid_1.0.0.tgz"; + path = fetchurl { + name = "lcid___lcid_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; } { @@ -4457,6 +4553,14 @@ sha1 = "1cb81aff0f368464ed3a5f1a7286372d6b1a60ce"; }; } + { + name = "load_json_file___load_json_file_1.1.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + } { name = "load_json_file___load_json_file_4.0.0.tgz"; path = fetchurl { @@ -4474,11 +4578,11 @@ }; } { - name = "localforage___localforage_1.9.0.tgz"; + name = "localforage___localforage_1.10.0.tgz"; path = fetchurl { - name = "localforage___localforage_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz"; - sha1 = "f3e4d32a8300b362b4634cc4e066d9d00d2f09d1"; + name = "localforage___localforage_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz"; + sha1 = "5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"; }; } { @@ -4489,6 +4593,14 @@ sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; }; } + { + name = "lodash.assign___lodash.assign_4.2.0.tgz"; + path = fetchurl { + name = "lodash.assign___lodash.assign_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + } { name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; path = fetchurl { @@ -4690,11 +4802,11 @@ }; } { - name = "mariadb___mariadb_2.5.4.tgz"; + name = "mariadb___mariadb_2.5.5.tgz"; path = fetchurl { - name = "mariadb___mariadb_2.5.4.tgz"; - url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.4.tgz"; - sha1 = "c66daa35e2768b8c714c758453531c06ae4927f4"; + name = "mariadb___mariadb_2.5.5.tgz"; + url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.5.tgz"; + sha1 = "a9aff9f1e57231a415a21254489439beb501c803"; }; } { @@ -4794,19 +4906,19 @@ }; } { - name = "mime_db___mime_db_1.49.0.tgz"; + name = "mime_db___mime_db_1.51.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.49.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz"; - sha1 = "f3dfde60c99e9cf3bc9701d687778f537001cbed"; + name = "mime_db___mime_db_1.51.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; + sha1 = "d9ff62451859b18342d960850dc3cfb77e63fb0c"; }; } { - name = "mime_types___mime_types_2.1.32.tgz"; + name = "mime_types___mime_types_2.1.34.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.32.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz"; - sha1 = "1d00e89e7de7fe02008db61001d9e02852670fd5"; + name = "mime_types___mime_types_2.1.34.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; + sha1 = "5a712f9ec1503511a945803640fafe09d3793c24"; }; } { @@ -4914,11 +5026,11 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.33.tgz"; + name = "moment_timezone___moment_timezone_0.5.34.tgz"; path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.33.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz"; - sha1 = "b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"; + name = "moment_timezone___moment_timezone_0.5.34.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz"; + sha1 = "a75938f7476b88f155d3504a9343f7519d9a405c"; }; } { @@ -4930,11 +5042,11 @@ }; } { - name = "mongodb_connection_string_url___mongodb_connection_string_url_1.1.0.tgz"; + name = "mongodb_connection_string_url___mongodb_connection_string_url_1.1.2.tgz"; path = fetchurl { - 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_connection_string_url___mongodb_connection_string_url_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-1.1.2.tgz"; + sha1 = "a115902fee402b9b24a80c16ced94818daedad91"; }; } { @@ -4946,11 +5058,11 @@ }; } { - name = "mongodb___mongodb_3.6.11.tgz"; + name = "mongodb___mongodb_3.7.3.tgz"; path = fetchurl { - name = "mongodb___mongodb_3.6.11.tgz"; - url = "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.11.tgz"; - sha1 = "8a59a0491a92b00a8c925f72ed9d9a5b054aebb2"; + name = "mongodb___mongodb_3.7.3.tgz"; + url = "https://registry.yarnpkg.com/mongodb/-/mongodb-3.7.3.tgz"; + sha1 = "b7949cfd0adc4cc7d32d3f2034214d4475f175a5"; }; } { @@ -5073,14 +5185,6 @@ sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; }; } - { - name = "nedb___nedb_1.8.0.tgz"; - path = fetchurl { - name = "nedb___nedb_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/nedb/-/nedb-1.8.0.tgz"; - sha1 = "0e3502cd82c004d5355a43c9e55577bd7bd91d88"; - }; - } { name = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { @@ -5130,11 +5234,11 @@ }; } { - name = "node_fetch___node_fetch_2.6.1.tgz"; + name = "node_fetch___node_fetch_2.6.6.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; - sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + name = "node_fetch___node_fetch_2.6.6.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz"; + sha1 = "1751a7c01834e8e1697758732e9efb6eeadfaf89"; }; } { @@ -5170,11 +5274,11 @@ }; } { - name = "node_windows___node_windows_0.1.14.tgz"; + name = "node_windows___node_windows_0.1.4.tgz"; path = fetchurl { - name = "node_windows___node_windows_0.1.14.tgz"; - url = "https://registry.yarnpkg.com/node-windows/-/node-windows-0.1.14.tgz"; - sha1 = "31bb0503da3bc637f2bfaa8b266640a2e92d891f"; + name = "node_windows___node_windows_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/node-windows/-/node-windows-0.1.4.tgz"; + sha1 = "23d5ee98b6b8290e0a3da9998ee638845fedcb1b"; }; } { @@ -5186,11 +5290,11 @@ }; } { - name = "nodemailer___nodemailer_6.6.3.tgz"; + name = "nodemailer___nodemailer_6.7.1.tgz"; path = fetchurl { - name = "nodemailer___nodemailer_6.6.3.tgz"; - url = "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.3.tgz"; - sha1 = "31fb53dd4d8ae16fc088a65cb9ffa8d928a69b48"; + name = "nodemailer___nodemailer_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.1.tgz"; + sha1 = "09f72f8b375f7b259291757007bcd902c0174c6e"; }; } { @@ -5241,6 +5345,14 @@ sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; }; } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } { name = "nwsapi___nwsapi_2.2.0.tgz"; path = fetchurl { @@ -5418,11 +5530,19 @@ }; } { - name = "optional_require___optional_require_1.1.4.tgz"; + name = "optimist___optimist_0.3.7.tgz"; path = fetchurl { - name = "optional_require___optional_require_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.4.tgz"; - sha1 = "8af7da26b17da76abbf8a1c46e2e148a63813c0e"; + name = "optimist___optimist_0.3.7.tgz"; + url = "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + } + { + name = "optional_require___optional_require_1.1.8.tgz"; + path = fetchurl { + name = "optional_require___optional_require_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.8.tgz"; + sha1 = "16364d76261b75d964c482b2406cb824d8ec44b7"; }; } { @@ -5441,6 +5561,14 @@ sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; } + { + name = "os_locale___os_locale_1.4.0.tgz"; + path = fetchurl { + name = "os_locale___os_locale_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + } { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; path = fetchurl { @@ -5505,6 +5633,14 @@ sha1 = "50183f2d36c9e3e528ea0a8605dff57ce976f88e"; }; } + { + name = "packet_reader___packet_reader_1.0.0.tgz"; + path = fetchurl { + name = "packet_reader___packet_reader_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz"; + sha1 = "9238e5480dedabacfe1fe3f2771063f164157d74"; + }; + } { name = "param_case___param_case_2.1.1.tgz"; path = fetchurl { @@ -5529,6 +5665,14 @@ sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; }; } + { + name = "parse_json___parse_json_2.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + } { name = "parse_json___parse_json_4.0.0.tgz"; path = fetchurl { @@ -5618,11 +5762,11 @@ }; } { - name = "passport_oauth2___passport_oauth2_1.6.0.tgz"; + name = "passport_oauth2___passport_oauth2_1.6.1.tgz"; path = fetchurl { - name = "passport_oauth2___passport_oauth2_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.0.tgz"; - sha1 = "5f599735e0ea40ea3027643785f81a3a9b4feb50"; + name = "passport_oauth2___passport_oauth2_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz"; + sha1 = "c5aee8f849ce8bd436c7f81d904a3cd1666f181b"; }; } { @@ -5642,11 +5786,11 @@ }; } { - name = "passport_saml___passport_saml_3.1.1.tgz"; + name = "passport_saml___passport_saml_3.2.0.tgz"; path = fetchurl { - name = "passport_saml___passport_saml_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.1.tgz"; - sha1 = "257470003366e06ce3c5738aa64a1209a0f4d7e7"; + name = "passport_saml___passport_saml_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.0.tgz"; + sha1 = "72ec8203df6dd872a205b8d5f578859a4e723e42"; }; } { @@ -5666,11 +5810,19 @@ }; } { - name = "passport___passport_0.4.1.tgz"; + name = "passport___passport_0.5.0.tgz"; path = fetchurl { - name = "passport___passport_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz"; - sha1 = "941446a21cb92fc688d97a0861c38ce9f738f270"; + name = "passport___passport_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/passport/-/passport-0.5.0.tgz"; + sha1 = "7914aaa55844f9dce8c3aa28f7d6b73647ee0169"; + }; + } + { + name = "path_exists___path_exists_2.1.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; }; } { @@ -5729,6 +5881,14 @@ sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; } + { + name = "path_type___path_type_1.1.0.tgz"; + path = fetchurl { + name = "path_type___path_type_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + } { name = "path_type___path_type_3.0.0.tgz"; path = fetchurl { @@ -5761,6 +5921,70 @@ sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; } + { + name = "pg_connection_string___pg_connection_string_2.5.0.tgz"; + path = fetchurl { + name = "pg_connection_string___pg_connection_string_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz"; + sha1 = "538cadd0f7e603fc09a12590f3b8a452c2c0cf34"; + }; + } + { + name = "pg_int8___pg_int8_1.0.1.tgz"; + path = fetchurl { + name = "pg_int8___pg_int8_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz"; + sha1 = "943bd463bf5b71b4170115f80f8efc9a0c0eb78c"; + }; + } + { + name = "pg_pool___pg_pool_3.4.1.tgz"; + path = fetchurl { + name = "pg_pool___pg_pool_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz"; + sha1 = "0e71ce2c67b442a5e862a9c182172c37eda71e9c"; + }; + } + { + name = "pg_protocol___pg_protocol_1.5.0.tgz"; + path = fetchurl { + name = "pg_protocol___pg_protocol_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz"; + sha1 = "b5dd452257314565e2d54ab3c132adc46565a6a0"; + }; + } + { + name = "pg_types___pg_types_2.2.0.tgz"; + path = fetchurl { + name = "pg_types___pg_types_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz"; + sha1 = "2d0250d636454f7cfa3b6ae0382fdfa8063254a3"; + }; + } + { + name = "pg___pg_8.7.1.tgz"; + path = fetchurl { + name = "pg___pg_8.7.1.tgz"; + url = "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz"; + sha1 = "9ea9d1ec225980c36f94e181d009ab9f4ce4c471"; + }; + } + { + name = "pgpass___pgpass_1.0.4.tgz"; + path = fetchurl { + name = "pgpass___pgpass_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz"; + sha1 = "85eb93a83800b20f8057a2b029bf05abaf94ea9c"; + }; + } + { + name = "pgtools___pgtools_0.3.2.tgz"; + path = fetchurl { + name = "pgtools___pgtools_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/pgtools/-/pgtools-0.3.2.tgz"; + sha1 = "df11d54057c889e27ba891664efda69de1b7a0fe"; + }; + } { name = "picomatch___picomatch_2.3.0.tgz"; path = fetchurl { @@ -5769,6 +5993,14 @@ sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; }; } + { + name = "pify___pify_2.3.0.tgz"; + path = fetchurl { + name = "pify___pify_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + } { name = "pify___pify_3.0.0.tgz"; path = fetchurl { @@ -5785,6 +6017,22 @@ sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231"; }; } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + } { name = "pkg_dir___pkg_dir_3.0.0.tgz"; path = fetchurl { @@ -5810,11 +6058,11 @@ }; } { - name = "plivo___plivo_4.20.1.tgz"; + name = "plivo___plivo_4.23.1.tgz"; path = fetchurl { - name = "plivo___plivo_4.20.1.tgz"; - url = "https://registry.yarnpkg.com/plivo/-/plivo-4.20.1.tgz"; - sha1 = "032366930f930debab6497b2def2ab07e46361dc"; + name = "plivo___plivo_4.23.1.tgz"; + url = "https://registry.yarnpkg.com/plivo/-/plivo-4.23.1.tgz"; + sha1 = "bbc680db39a2c539288ae317fcb19dcdf00edcac"; }; } { @@ -5833,6 +6081,38 @@ sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; } + { + name = "postgres_array___postgres_array_2.0.0.tgz"; + path = fetchurl { + name = "postgres_array___postgres_array_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz"; + sha1 = "48f8fce054fbc69671999329b8834b772652d82e"; + }; + } + { + name = "postgres_bytea___postgres_bytea_1.0.0.tgz"; + path = fetchurl { + name = "postgres_bytea___postgres_bytea_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; + sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; + }; + } + { + name = "postgres_date___postgres_date_1.0.7.tgz"; + path = fetchurl { + name = "postgres_date___postgres_date_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz"; + sha1 = "51bc086006005e5061c591cee727f2531bf641a8"; + }; + } + { + name = "postgres_interval___postgres_interval_1.2.0.tgz"; + path = fetchurl { + name = "postgres_interval___postgres_interval_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz"; + sha1 = "b460c82cb1587507788819a06aa0fffdb3544695"; + }; + } { name = "precond___precond_0.2.3.tgz"; path = fetchurl { @@ -6057,6 +6337,14 @@ sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; }; } + { + name = "read_pkg_up___read_pkg_up_1.0.1.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + } { name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; path = fetchurl { @@ -6065,6 +6353,14 @@ sha1 = "1b221c6088ba7799601c808f91161c66e58f8978"; }; } + { + name = "read_pkg___read_pkg_1.1.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + } { name = "read_pkg___read_pkg_3.0.0.tgz"; path = fetchurl { @@ -6321,6 +6617,14 @@ sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; } + { + name = "require_main_filename___require_main_filename_1.0.1.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + } { name = "require_main_filename___require_main_filename_2.0.0.tgz"; path = fetchurl { @@ -6457,14 +6761,6 @@ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; }; } - { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; - }; - } { name = "safe_buffer___safe_buffer_5.2.1.tgz"; path = fetchurl { @@ -6666,11 +6962,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.3.tgz"; + name = "signal_exit___signal_exit_3.0.5.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; - sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + name = "signal_exit___signal_exit_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz"; + sha1 = "9e3e8cc0c75a99472b44321033a7702e7738252f"; }; } { @@ -6802,11 +7098,11 @@ }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; - sha1 = "8a595135def9592bda69709474f1cbeea7c2467f"; + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha1 = "50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"; }; } { @@ -6817,6 +7113,14 @@ sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; }; } + { + name = "split2___split2_3.2.2.tgz"; + path = fetchurl { + name = "split2___split2_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz"; + sha1 = "bf2cf2a37d838312c249c89206fd7a17dd12365f"; + }; + } { name = "sprintf_js___sprintf_js_1.1.2.tgz"; path = fetchurl { @@ -6842,11 +7146,11 @@ }; } { - name = "ssh2___ssh2_1.2.0.tgz"; + name = "ssh2___ssh2_1.5.0.tgz"; path = fetchurl { - name = "ssh2___ssh2_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.2.0.tgz"; - sha1 = "177a46bb12b7ef2b7bce28bdcbd7eae3cbc50045"; + name = "ssh2___ssh2_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.5.0.tgz"; + sha1 = "4dc559ba98a1cbb420e8d42998dfe35d0eda92bc"; }; } { @@ -6929,6 +7233,14 @@ sha1 = "c69a9d5788858997da66f1d923ba7113ea466b5a"; }; } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } { name = "string_width___string_width_3.1.0.tgz"; path = fetchurl { @@ -6969,6 +7281,14 @@ sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; }; } + { + name = "strip_bom___strip_bom_2.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + } { name = "strip_bom___strip_bom_3.0.0.tgz"; path = fetchurl { @@ -6985,6 +7305,14 @@ sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; } + { + name = "strnum___strnum_1.0.4.tgz"; + path = fetchurl { + name = "strnum___strnum_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/strnum/-/strnum-1.0.4.tgz"; + sha1 = "e97e36a7d6ba9f93d0d6b496b2ed0678d422832b"; + }; + } { name = "supports_color___supports_color_2.0.0.tgz"; path = fetchurl { @@ -7185,6 +7513,14 @@ sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; }; } + { + name = "toidentifier___toidentifier_1.0.1.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz"; + sha1 = "3be34321a88a820ed1bd80dfaa33e479fbb8dd35"; + }; + } { name = "tough_cookie___tough_cookie_2.5.0.tgz"; path = fetchurl { @@ -7217,6 +7553,22 @@ sha1 = "fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"; }; } + { + name = "tr46___tr46_3.0.0.tgz"; + path = fetchurl { + name = "tr46___tr46_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz"; + sha1 = "555c4e297a950617e8eeddef633c87d4d9d6cbf9"; + }; + } + { + name = "tr46___tr46_0.0.3.tgz"; + path = fetchurl { + name = "tr46___tr46_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; + sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + }; + } { name = "trim_right___trim_right_1.0.1.tgz"; path = fetchurl { @@ -7258,11 +7610,11 @@ }; } { - name = "twilio___twilio_3.66.1.tgz"; + name = "twilio___twilio_3.71.1.tgz"; path = fetchurl { - name = "twilio___twilio_3.66.1.tgz"; - url = "https://registry.yarnpkg.com/twilio/-/twilio-3.66.1.tgz"; - sha1 = "8435441ca45b0c7cb3761c4ba3011ca32e75ba69"; + name = "twilio___twilio_3.71.1.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-3.71.1.tgz"; + sha1 = "15bbb4b51c75d91cc07a8149378c4af330e543cc"; }; } { @@ -7298,11 +7650,11 @@ }; } { - name = "uglify_js___uglify_js_3.14.1.tgz"; + name = "uglify_js___uglify_js_3.14.3.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.14.1.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.1.tgz"; - sha1 = "e2cb9fe34db9cb4cf7e35d1d26dfea28e09a7d06"; + name = "uglify_js___uglify_js_3.14.3.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz"; + sha1 = "c0f25dfea1e8e5323eccf59610be08b6043c15cf"; }; } { @@ -7322,11 +7674,11 @@ }; } { - name = "uid2___uid2_0.0.3.tgz"; + name = "uid2___uid2_0.0.4.tgz"; path = fetchurl { - name = "uid2___uid2_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz"; - sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + name = "uid2___uid2_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz"; + sha1 = "033f3b1d5d32505f5ce5f888b9f3b667123c0a44"; }; } { @@ -7346,11 +7698,11 @@ }; } { - name = "underscore___underscore_1.4.4.tgz"; + name = "underscore___underscore_1.13.1.tgz"; path = fetchurl { - name = "underscore___underscore_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + name = "underscore___underscore_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz"; + sha1 = "0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"; }; } { @@ -7570,11 +7922,11 @@ }; } { - name = "vasync___vasync_2.2.0.tgz"; + name = "vasync___vasync_2.2.1.tgz"; path = fetchurl { - name = "vasync___vasync_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/vasync/-/vasync-2.2.0.tgz"; - sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; + name = "vasync___vasync_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/vasync/-/vasync-2.2.1.tgz"; + sha1 = "d881379ff3685e4affa8e775cf0fd369262a201b"; }; } { @@ -7585,6 +7937,14 @@ sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; } + { + name = "verror___verror_1.10.1.tgz"; + path = fetchurl { + name = "verror___verror_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; + sha1 = "4bf09eeccf4563b109ed4b3d458380c972b0cdeb"; + }; + } { name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { @@ -7594,11 +7954,11 @@ }; } { - name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + name = "w3c_xmlserializer___w3c_xmlserializer_3.0.0.tgz"; path = fetchurl { - name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; - sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a"; + name = "w3c_xmlserializer___w3c_xmlserializer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz"; + sha1 = "06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923"; }; } { @@ -7634,19 +7994,19 @@ }; } { - name = "webdav___webdav_4.6.0.tgz"; + name = "webdav___webdav_4.7.0.tgz"; path = fetchurl { - name = "webdav___webdav_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/webdav/-/webdav-4.6.0.tgz"; - sha1 = "b12d3631562ed4a7d665dd1757349682dfc8f441"; + name = "webdav___webdav_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/webdav/-/webdav-4.7.0.tgz"; + sha1 = "3964c72c1d5dc9854c0031b43e464f260f22476e"; }; } { - name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; path = fetchurl { - name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; - sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff"; + name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; }; } { @@ -7658,19 +8018,43 @@ }; } { - name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + name = "webidl_conversions___webidl_conversions_7.0.0.tgz"; path = fetchurl { - name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; - sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0"; + name = "webidl_conversions___webidl_conversions_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; + sha1 = "256b4e1882be7debbf01d05f0aa2039778ea080a"; }; } { - name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + name = "whatwg_encoding___whatwg_encoding_2.0.0.tgz"; path = fetchurl { - name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; - sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf"; + name = "whatwg_encoding___whatwg_encoding_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz"; + sha1 = "e7635f597fd87020858626805a2729fa7698ac53"; + }; + } + { + name = "whatwg_mimetype___whatwg_mimetype_3.0.0.tgz"; + path = fetchurl { + name = "whatwg_mimetype___whatwg_mimetype_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz"; + sha1 = "5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"; + }; + } + { + name = "whatwg_url___whatwg_url_10.0.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz"; + sha1 = "37264f720b575b4a311bd4094ed8c760caaa05da"; + }; + } + { + name = "whatwg_url___whatwg_url_5.0.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; }; } { @@ -7681,6 +8065,14 @@ sha1 = "656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"; }; } + { + name = "which_module___which_module_1.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + } { name = "which_module___which_module_2.0.0.tgz"; path = fetchurl { @@ -7721,6 +8113,14 @@ sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; }; } + { + name = "window_size___window_size_0.2.0.tgz"; + path = fetchurl { + name = "window_size___window_size_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz"; + sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; + }; + } { name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { @@ -7769,6 +8169,14 @@ sha1 = "ab55f695e6118da93858fdd70c053d1c5e01ac20"; }; } + { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + } { name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; path = fetchurl { @@ -7802,35 +8210,43 @@ }; } { - name = "ws___ws_7.5.3.tgz"; + name = "ws___ws_7.5.5.tgz"; path = fetchurl { - name = "ws___ws_7.5.3.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz"; - sha1 = "160835b63c7d97bfab418fc1b8a9fced2ac01a74"; + name = "ws___ws_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz"; + sha1 = "8b4bc4af518cfabd0473ae4f99144287b33eb881"; }; } { - name = "xml_crypto___xml_crypto_2.1.2.tgz"; + name = "ws___ws_8.2.3.tgz"; path = fetchurl { - name = "xml_crypto___xml_crypto_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.2.tgz"; - sha1 = "501506d42e466f6cd908c5a03182217231b4e4b8"; + name = "ws___ws_8.2.3.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz"; + sha1 = "63a56456db1b04367d0b721a0b80cae6d8becbba"; }; } { - name = "xml_encryption___xml_encryption_1.2.4.tgz"; + name = "xml_crypto___xml_crypto_2.1.3.tgz"; path = fetchurl { - name = "xml_encryption___xml_encryption_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.2.4.tgz"; - sha1 = "767d13f9ff2f979ff5657b93bd72aa729d34b66c"; + name = "xml_crypto___xml_crypto_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.3.tgz"; + sha1 = "6a7272b610ea3e4ea7f13e9e4876f1b20cbc32c8"; }; } { - name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + name = "xml_encryption___xml_encryption_1.3.0.tgz"; path = fetchurl { - name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; - sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"; + name = "xml_encryption___xml_encryption_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.3.0.tgz"; + sha1 = "4cad44a59bf8bdec76d7865ce0b89e13c09962f4"; + }; + } + { + name = "xml_name_validator___xml_name_validator_4.0.0.tgz"; + path = fetchurl { + name = "xml_name_validator___xml_name_validator_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz"; + sha1 = "79a006e2e63149a8600f15430f0a4725d1524835"; }; } { @@ -7841,14 +8257,6 @@ sha1 = "a0c69516752421eb2ac758ee4d4ccf58843eac66"; }; } - { - name = "xml___xml_0.0.12.tgz"; - path = fetchurl { - name = "xml___xml_0.0.12.tgz"; - url = "https://registry.yarnpkg.com/xml/-/xml-0.0.12.tgz"; - sha1 = "f08b347109912be00285785f46f15ad8e50a5f67"; - }; - } { name = "xmlbuilder___xmlbuilder_13.0.2.tgz"; path = fetchurl { @@ -7897,22 +8305,6 @@ sha1 = "b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"; }; } - { - name = "xmldom___xmldom_0.5.0.tgz"; - path = fetchurl { - name = "xmldom___xmldom_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; - sha1 = "193cb96b84aa3486127ea6272c4596354cb4962e"; - }; - } - { - name = "xmldom___xmldom_0.6.0.tgz"; - path = fetchurl { - name = "xmldom___xmldom_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz"; - sha1 = "43a96ecb8beece991cef382c08397d82d4d0c46f"; - }; - } { name = "xpath___xpath_0.0.32.tgz"; path = fetchurl { @@ -7937,6 +8329,14 @@ sha1 = "b741bad018ef78d8a9d2e83ade007b3f7959c732"; }; } + { + name = "y18n___y18n_3.2.2.tgz"; + path = fetchurl { + name = "y18n___y18n_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz"; + sha1 = "85c901bd6470ce71fc4bb723ad209b70f7f28696"; + }; + } { name = "y18n___y18n_4.0.3.tgz"; path = fetchurl { @@ -7969,6 +8369,14 @@ sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } + { + name = "yargs_parser___yargs_parser_3.2.0.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-3.2.0.tgz"; + sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + }; + } { name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { @@ -7977,6 +8385,14 @@ sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; }; } + { + name = "yargs___yargs_5.0.0.tgz"; + path = fetchurl { + name = "yargs___yargs_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-5.0.0.tgz"; + sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + }; + } { name = "yargs___yargs_3.10.0.tgz"; path = fetchurl { From eb97241d7cd5c4a590b36171e0eaeff5ef63799e Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 18:47:13 -0500 Subject: [PATCH 258/359] pijul: use buildFeatures --- pkgs/applications/version-management/pijul/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 32126c7ce663..f558eab6b61f 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -22,8 +22,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-j9xf97qPdhtakIwhAql0/Go5fPxlyWKAVLk5CMBfAbs="; - cargoBuildFlags = lib.optional gitImportSupport "--features=git"; - doCheck = false; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libsodium xxHash zstd ] @@ -32,6 +30,8 @@ rustPlatform.buildRustPackage rec { CoreServices Security SystemConfiguration ])); + buildFeatures = lib.optional gitImportSupport "git"; + meta = with lib; { description = "A distributed version control system"; homepage = "https://pijul.org"; From ebe494df9dcffe2a3ab5d8b8572af6c981bf71be Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 18:48:05 -0500 Subject: [PATCH 259/359] clipcat: use buildFeatures --- pkgs/applications/misc/clipcat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index b28b33d56c91..38c0c103943a 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ xorg.libxcb ]; - cargoBuildFlags = [ "--features=all" ]; + buildFeatures = [ "all" ]; postInstall = '' installShellCompletion --bash completions/bash-completion/completions/* From 2d358196f06cf7cb1cfe403be2f3320dcde94931 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 18:48:55 -0500 Subject: [PATCH 260/359] todiff: use checkFeatures --- pkgs/applications/misc/todiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 752ab35461ea..14f03cdc8cef 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0vrn1vc3rwabv6l2r1qb7mkcxbp75q79bfl3rxhyi51ra3ij507r"; - checkPhase = "cargo test --features=integration_tests"; + checkFeatures = [ "integration_tests" ]; meta = with lib; { description = "Human-readable diff for todo.txt files"; From eaeed5920f8ccaeddbabe6b828f32fa662531f64 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 18:50:01 -0500 Subject: [PATCH 261/359] meli: use buildFeatures --- pkgs/applications/networking/mailreaders/meli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index d0575b60653b..d4076c88bb8f 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -25,14 +25,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ZE653OtXyZ9454bKPApmuL2kVko/hGBWEAya1L1KIoc="; - cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; - nativeBuildInputs = [ pkg-config gzip makeWrapper ]; buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; checkInputs = [ file ]; + buildFeatures = lib.optional withNotmuch [ "notmuch" ]; + postInstall = '' mkdir -p $out/share/man/man1 gzip < docs/meli.1 > $out/share/man/man1/meli.1.gz From 08e50b55cbf966d0f254d08ddfd726f2f457c640 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 18:51:22 -0500 Subject: [PATCH 262/359] routinator: use buildFeatures --- pkgs/servers/routinator/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index edff95d2e11b..cb2c68d6c2d7 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -20,9 +20,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoBuildFlags = [ "--no-default-features" "--features=socks" ]; - - cargoTestFlags = cargoBuildFlags; + buildNoDefaultFeatures = true; + buildFeatures = [ "socks" ]; meta = with lib; { description = "An RPKI Validator written in Rust"; From 59a143e206296f241556984f7070d6aee320cbc2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 18:52:16 -0500 Subject: [PATCH 263/359] zenith: use buildFeatures --- pkgs/tools/system/zenith/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 1e36614c4274..3705c9cad90c 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -18,12 +18,13 @@ rustPlatform.buildRustPackage rec { sha256 = "1bn364rmp0q86rd7vgv4n7x09cdf9m4njcaq92jnk85ni6h147ax"; }; - cargoBuildFlags = lib.optionals nvidiaSupport [ "--features" "nvidia" ]; cargoSha256 = "0c2mk2bcz4qjyqmf11yqhnhy4pqxr77b3c1gvr5jfmjshx4ff7v2"; nativeBuildInputs = lib.optional nvidiaSupport makeWrapper; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + buildFeatures = lib.optional nvidiaSupport "nvidia"; + postInstall = lib.optionalString nvidiaSupport '' wrapProgram $out/bin/zenith \ --suffix LD_LIBRARY_PATH : "/run/opengl-driver/lib" From 4b8d8fc923512256f83f72f9f76c1a688c0acb57 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 18:52:56 -0500 Subject: [PATCH 264/359] ripgrep: use buildFeatures --- pkgs/tools/text/ripgrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 3fa202135f51..022f8bd25bb7 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -22,13 +22,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1kfdgh8dra4jxgcdb0lln5wwrimz0dpp33bq3h7jgs8ngaq2a9wp"; - cargoBuildFlags = lib.optional withPCRE2 "--features pcre2"; - nativeBuildInputs = [ asciidoctor installShellFiles ] ++ lib.optional withPCRE2 pkg-config; buildInputs = lib.optional withPCRE2 pcre2 ++ lib.optional stdenv.isDarwin Security; + buildFeatures = lib.optional withPCRE2 "pcre2"; + preFixup = '' installManPage $releaseDir/build/ripgrep-*/out/rg.1 From 3d8807a211f64a51b096b2b3e6bf20748da8bfa0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 18:54:12 -0500 Subject: [PATCH 265/359] termplay: use buildFeatures --- pkgs/tools/misc/termplay/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index 80c6341f0253..2d493b857fc1 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -11,7 +11,6 @@ rustPlatform.buildRustPackage rec { sha256 = "1w7hdqgqr1jgxid3k7f2j52wz31gv8bzr9rsm6xzp7nnihp6i45p"; }; - cargoBuildFlags = ["--features" "bin"]; cargoSha256 = "08ip6x4kink244majlk595yh551c2ap3ry58wly994mh8wf6ifwb"; nativeBuildInputs = [ makeWrapper ]; @@ -24,6 +23,8 @@ rustPlatform.buildRustPackage rec { libsixel ]; + buildFeatures = [ "bin" ]; + postInstall = '' wrapProgram $out/bin/termplay --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; From 94eee0a20b6bf04f93694cd196c8df4ebbf67812 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 18:58:52 -0500 Subject: [PATCH 266/359] vscode-extensions.vadimcn.vscode-lldb: use buildFeatures --- pkgs/misc/vscode-extensions/vscode-lldb/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 3a01058c99c2..2bc9321353d2 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -31,10 +31,11 @@ let buildAndTestSubdir = "adapter"; + buildFeatures = [ "weak-linkage" ]; + cargoBuildFlags = [ "--lib" "--bin=codelldb" - "--features=weak-linkage" ]; # Tests are linked to liblldb but it is not available here. From d05ccea21344b77c7e0dedeb3cd54023b626d8cc Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:00:06 -0500 Subject: [PATCH 267/359] tiny: use buildFeatures --- pkgs/applications/networking/irc/tiny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index fde521c53d58..e102b1077a38 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -21,11 +21,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1"; - cargoBuildFlags = lib.optionals stdenv.isLinux [ "--features=desktop-notifications" ]; - nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation; + buildFeatures = lib.optional stdenv.isLinux "desktop-notifications"; + meta = with lib; { description = "A console IRC client"; homepage = "https://github.com/osa1/tiny"; From bb6d379d80169c6777c015831b302a5f1b97daf0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:00:53 -0500 Subject: [PATCH 268/359] i3status-rust: use buildFeatures --- pkgs/applications/window-managers/i3/status-rust.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index defb44f0f35d..a285c4b5a54a 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -27,10 +27,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ dbus libpulseaudio notmuch openssl ]; - cargoBuildFlags = [ - "--features=notmuch" - "--features=maildir" - "--features=pulseaudio" + buildFeatures = [ + "notmuch" + "maildir" + "pulseaudio" ]; prePatch = '' From 8ec1bb1b463377e0bb6ee06fd14518df718daa89 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:01:57 -0500 Subject: [PATCH 269/359] wmfocus: use buildFeatures --- pkgs/applications/window-managers/i3/wmfocus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 6756afb4a5c5..9c33c555353c 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # For now, this is the only available featureset. This is also why the file is # in the i3 folder, even though it might be useful for more than just i3 # users. - cargoBuildFlags = [ "--features i3" ]; + buildFeatures = [ "i3" ]; meta = with lib; { description = "Visually focus windows by label"; From 7303def464d68215690639d9e880d1ad8b64815f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:03:01 -0500 Subject: [PATCH 270/359] eww: use buildFeatures --- pkgs/applications/window-managers/eww/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index c2cc2f23cdb8..a987c6c2e0e5 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 ] ++ lib.optional withWayland gtk-layer-shell; - cargoBuildFlags = [ "--bin" "eww" ] ++ lib.optionals withWayland [ - "--no-default-features" - "--features=wayland" - ]; + buildNoDefaultFeatures = withWayland; + buildFeatures = lib.optional withWayland "wayland"; + + cargoBuildFlags = [ "--bin" "eww" ]; cargoTestFlags = cargoBuildFlags; From 9ed4b5c96180ef34832c09085df16da3f3182340 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:05:26 -0500 Subject: [PATCH 271/359] spotifyd: use buildFeatures --- pkgs/applications/audio/spotifyd/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index e9de6cb3cf78..dacf91e56229 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -20,12 +20,6 @@ rustPackages.rustPlatform.buildRustPackage rec { cargoSha256 = "07dxfc0csrnfl01p9vdrqvca9f574svlf37dk3dz8p6q08ki0n1z"; - cargoBuildFlags = [ - "--no-default-features" - "--features" - "${lib.optionalString withALSA "alsa_backend,"}${lib.optionalString withPulseAudio "pulseaudio_backend,"}${lib.optionalString withPortAudio "portaudio_backend,"}${lib.optionalString withMpris "dbus_mpris,"}${lib.optionalString withKeyring "dbus_keyring,"}" - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] @@ -34,6 +28,13 @@ rustPackages.rustPlatform.buildRustPackage rec { ++ lib.optional withPortAudio portaudio ++ lib.optional (withMpris || withKeyring) dbus; + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withALSA "alsa_backend" + ++ lib.optional withPulseAudio "pulseaudio_backend" + ++ lib.optional withPortAudio "portaudio_backend" + ++ lib.optional withMpris "dbus_mpris" + ++ lib.optional withKeyring "dbus_keyring"; + doCheck = false; meta = with lib; { From ce0da1b87157e4488f9d8f0c1203b54441b3022a Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:06:51 -0500 Subject: [PATCH 272/359] librespot: use buildFeatures --- pkgs/applications/audio/librespot/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 7b7d811f5731..64d59516f87f 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -15,24 +15,18 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1sal85gsbnrabxi39298w9njdc08csnwl40akd6k9fsc0fmpn1b0"; - cargoBuildFlags = with lib; [ - "--no-default-features" - "--features" - (concatStringsSep "," (filter (x: x != "") [ - (optionalString withRodio "rodio-backend") - (optionalString withALSA "alsa-backend") - (optionalString withPulseAudio "pulseaudio-backend") - (optionalString withPortAudio "portaudio-backend") - - ])) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio; + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withRodio "rodio-backend" + ++ lib.optional withALSA "alsa-backend" + ++ lib.optional withPulseAudio "pulseaudio-backend" + ++ lib.optional withPortAudio "portaudio-backend"; + doCheck = false; meta = with lib; { From cc0e2338013dd21ff1a30a696df8f710b82247e2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:07:44 -0500 Subject: [PATCH 273/359] finalfusion-utils: use buildFeature --- .../machine-learning/finalfusion-utils/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index 77dbbd7cdd1e..19e6219fc04a 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -22,12 +22,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-/rLv2/bcVsmWw+ZfyumDcj0ptHPQBCCYR9O/lVlV+G0="; - # Enables build against a generic BLAS. - cargoBuildFlags = [ - "--features" - "netlib" - ]; - nativeBuildInputs = [ installShellFiles ]; buildInputs = [ @@ -38,6 +32,9 @@ rustPlatform.buildRustPackage rec { Security ]; + # Enables build against a generic BLAS. + buildFeatures = [ "netlib" ]; + postInstall = '' # Install shell completions for shell in bash fish zsh; do From 2448ef46307a8935dbe2d217b7d093a981aa8efe Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:08:39 -0500 Subject: [PATCH 274/359] elan: use buildFeatures --- pkgs/applications/science/logic/elan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index cc4f0680de3e..4326c5b0d6b9 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl zlib openssl ] ++ lib.optional stdenv.isDarwin libiconv; - cargoBuildFlags = [ "--features no-self-update" ]; + buildFeatures = [ "no-self-update" ]; patches = lib.optionals stdenv.isLinux [ # Run patchelf on the downloaded binaries. From ee8e2f886414ee8a897fe853e8ff8c47a04cf586 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:09:07 -0500 Subject: [PATCH 275/359] openethereum: use buildFeatures --- pkgs/applications/blockchains/openethereum/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 39f35f211f90..79ab37c7adb5 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isLinux [ systemd ] ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; - cargoBuildFlags = [ "--features final" ]; + buildFeatures = [ "final" ]; # Fix tests by preventing them from writing to /homeless-shelter. preCheck = '' From c07e2bf52e04b8d5b755eed68029d0885ff053a1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:10:25 -0500 Subject: [PATCH 276/359] alfis: use buildFeatures --- pkgs/applications/blockchains/alfis/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 0738661c0596..e1fd262eb772 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,12 +14,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1n7kb1lyghpkgdgd58pw8ldvfps30rnv5niwx35pkdg74h59hqgj"; - cargoBuildFlags = [ "--no-default-features" ] - ++ lib.optional withGui "--features webgui"; - - cargoTestFlags = [ "--no-default-features" ] - ++ lib.optional withGui "--features webgui"; - checkFlags = [ # these want internet access, disable them "--skip=dns::client::tests::test_tcp_client" @@ -30,6 +24,9 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional (withGui && stdenv.isLinux) webkitgtk ++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ]; + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withGui "webgui"; + postInstall = lib.optionalString (withGui && stdenv.isLinux) '' wrapProgram $out/bin/alfis \ --prefix PATH : ${lib.makeBinPath [ zenity ]} From 0b95da347434d04379cd9c70138518796bd2543b Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:12:23 -0500 Subject: [PATCH 277/359] xxv: use buildFeatures --- pkgs/tools/misc/xxv/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/tools/misc/xxv/default.nix index 99a8193c6ca7..e5852e5f51b0 100644 --- a/pkgs/tools/misc/xxv/default.nix +++ b/pkgs/tools/misc/xxv/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { # I'm picking pancurses for Windows simply because that's the example given in Cursive's # documentation for picking an alternative backend. We could just as easily pick crossterm. - cargoBuildFlags = lib.optionals (!useNcurses) [ "--no-default-features" "--features pancurses-backend" ]; + buildNoDefaultFeatures = !useNcurses; + buildFeatures = lib.optional (!useNcurses) "pancurses-backend"; meta = with lib; { description = "A visual hex viewer for the terminal"; From 1b7125db17fba70cec83289d0ef9dba6f9e27d9e Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:12:55 -0500 Subject: [PATCH 278/359] websocat: use buildFeatures --- pkgs/tools/misc/websocat/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 7ba2accc6787..ffbbc0ec8061 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -12,13 +12,14 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jwoWxK4phBqhIeo3+oRnpGsfvtn9gTR1ryd4N+0Lmbw="; }; - cargoBuildFlags = [ "--features=ssl" ]; cargoSha256 = "sha256-+3SG1maarY4DJ4+QiYGwltGLksOoOhKtcqstRwgzi2k="; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildFeatures = [ "ssl" ]; + # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR=1; From 5999944ad06c8015430fddaecee700fcfdb29148 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:19:01 -0500 Subject: [PATCH 279/359] vector: use buildFeatures, clean up --- pkgs/tools/misc/vector/default.nix | 36 +++++++++++++++++------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 495884194847..9f06c858b48a 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -22,8 +22,8 @@ , features ? ([ "sinks" "sources" "transforms" ] # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) - ++ (lib.optionals enableKafka [ "rdkafka-plain" "rdkafka/dynamic_linking" ]) - ++ (lib.optional stdenv.targetPlatform.isUnix "unix")) + ++ lib.optionals enableKafka [ "rdkafka-plain" "rdkafka/dynamic_linking" ] + ++ lib.optional stdenv.targetPlatform.isUnix "unix") }: let @@ -51,24 +51,28 @@ rustPlatform.buildRustPackage { RUSTONIG_SYSTEM_LIBONIG = true; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoBuildFlags = [ "--no-default-features" "--features" (lib.concatStringsSep "," features) ]; + TZDIR = "${tzdata}/share/zoneinfo"; + + buildNoDefaultFeatures = true; + buildFeatures = features; + # TODO investigate compilation failure for tests # dev dependency includes httpmock which depends on iashc which depends on curl-sys with http2 feature enabled # compilation fails because of a missing http2 include doCheck = !stdenv.isDarwin; - # healthcheck_grafana_cloud is trying to make a network access - # test_stream_errors is flaky on linux-aarch64 - # tcp_with_tls_intermediate_ca is flaky on linux-x86_64 - checkPhase = '' - TZDIR=${tzdata}/share/zoneinfo cargo test \ - --no-default-features \ - --features ${lib.concatStringsSep "," features} \ - -- --test-threads 1 \ - --skip=sinks::loki::tests::healthcheck_grafana_cloud \ - --skip=kubernetes::api_watcher::tests::test_stream_errors \ - --skip=sources::socket::test::tcp_with_tls_intermediate_ca \ - --skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics - ''; + + checkFlags = [ + # tries to make a network access + "--skip=sinks::loki::tests::healthcheck_grafana_cloud" + + # flaky on linux-aarch64 + "--skip=kubernetes::api_watcher::tests::test_stream_errors" + + # flaky on linux-x86_64 + "--skip=sources::socket::test::tcp_with_tls_intermediate_ca" + + "--skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics" + ]; # recent overhauls of DNS support in 0.9 mean that we try to resolve # vector.dev during the checkPhase, which obviously isn't going to work. From fb3de84fb3af6326d49a889490a9ef54f1e281fa Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:20:41 -0500 Subject: [PATCH 280/359] xidlehook: use buildFeatures --- pkgs/tools/X11/xidlehook/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index ac5d6fc964bb..a19de0530bd1 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -25,12 +25,14 @@ rustPlatform.buildRustPackage rec { sha256 = "1pl7f8fhxfcy0c6c08vkagp0x1ak96vc5wgamigrk1nkd6l371lb"; }; - cargoBuildFlags = lib.optionals (!stdenv.isLinux) [ "--no-default-features" "--features" "pulse" ]; cargoSha256 = "1y7m61j07gvqfqz97mda39nc602sv7a826c06m8l22i7z380xfms"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config patchelf python3 ]; + buildNoDefaultFeatures = !stdenv.isLinux; + buildFeatures = lib.optional (!stdenv.isLinux) "pulse"; + postFixup = lib.optionalString stdenv.isLinux '' RPATH="$(patchelf --print-rpath $out/bin/xidlehook)" patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook From 44c0a3a626dfed575b23ce1795ccdc42d8b0200e Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:26:03 -0500 Subject: [PATCH 281/359] ouch: use buildFeatures --- pkgs/tools/compression/ouch/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix index c9ffaef4b76c..3051c705c5fe 100644 --- a/pkgs/tools/compression/ouch/default.nix +++ b/pkgs/tools/compression/ouch/default.nix @@ -27,9 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 xz zlib zstd ]; - cargoBuildFlags = [ "--features" "zstd/pkg-config" ]; - - cargoTestFlags = cargoBuildFlags; + buildFeatures = [ "zstd/pkg-config" ]; postInstall = '' help2man $out/bin/ouch > ouch.1 From 43333d3c6e249e477ce898e6e8aa0e65cb53818e Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:36:07 -0500 Subject: [PATCH 282/359] wasmer: use buildFeatures and checkFeatures --- pkgs/development/interpreters/wasmer/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 4dcb70bd3ec7..6c714bc3de5f 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -22,20 +22,18 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config ]; + # cranelift+jit works everywhere, see: + # https://github.com/wasmerio/wasmer/blob/master/Makefile#L22 + buildFeatures = [ "cranelift" "jit" ]; cargoBuildFlags = [ - # cranelift+jit works everywhere, see: - # https://github.com/wasmerio/wasmer/blob/master/Makefile#L22 - "--features" "cranelift,jit" # must target manifest and desired output bin, otherwise output is empty "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ]; - cargoTestFlags = [ - "--features" "test-cranelift" - # Can't use test-jit : - # error: Package `wasmer-workspace v2.0.0 (/build/source)` does not have the feature `test-jit` - ]; + # Can't use test-jit: + # error: Package `wasmer-workspace v2.0.0 (/build/source)` does not have the feature `test-jit` + checkFeatures = [ "test-cranelift" ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; From da8702439abce2837a607a8e1cba284566b7ab52 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:36:40 -0500 Subject: [PATCH 283/359] cargo-audit: use buildFeatures --- pkgs/tools/package-management/cargo-audit/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index b871b4a53b21..232b6b4b0e83 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -32,8 +32,7 @@ rustPlatform.buildRustPackage rec { Security ]; - # enables `cargo audit fix` - cargoBuildFlags = [ "--features fix" ]; + buildFeatures = [ "fix" ]; # The tests require network access which is not available in sandboxed Nix builds. doCheck = false; From 938f7302c3a266ccd45173c881560523e4352f28 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:38:29 -0500 Subject: [PATCH 284/359] sheesy-cli: use buildFeatures --- pkgs/tools/security/sheesy-cli/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sheesy-cli/default.nix b/pkgs/tools/security/sheesy-cli/default.nix index ea71be7c9534..4be2189e2935 100644 --- a/pkgs/tools/security/sheesy-cli/default.nix +++ b/pkgs/tools/security/sheesy-cli/default.nix @@ -14,12 +14,16 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "159a5ph1gxwcgahyr8885lq3c1w76nxzfrfdpyqixqrr7jzx2rd3"; cargoDepsName = pname; - cargoBuildFlags = [ "--bin sy" "--features" "vault,extract,completions,substitute,process" ]; - nativeBuildInputs = [ libgpg-error gpgme gettext installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildFeatures = [ "vault" "extract" "completions" "substitute" "process" ]; + + checkFeatures = [ ]; + + cargoBuildFlags = [ "--bin" "sy" ]; + postInstall = '' installShellCompletion --cmd sy \ --bash <($out/bin/sy completions bash) \ From 64bbe7aa17e368f4082d85f8c721970bb194a41f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:39:14 -0500 Subject: [PATCH 285/359] statix: use buildFeatures --- pkgs/tools/nix/statix/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix index 3e56fa4fb608..bb17d8df275d 100644 --- a/pkgs/tools/nix/statix/default.nix +++ b/pkgs/tools/nix/statix/default.nix @@ -15,9 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-e20POz9ZvuT0S+YG+9x7hcudhXQpOR4rVSFJbz76OI0="; - cargoBuildFlags = lib.optionals withJson [ "--features" "json" ]; - - cargoCheckFlags = cargoBuildFlags; + buildFeatures = lib.optional withJson "json"; meta = with lib; { description = "Lints and suggestions for the nix programming language"; From b43d700922b7257cf87235a762f4a4b9cb023e1f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:39:41 -0500 Subject: [PATCH 286/359] cargo-embed: use buildFeatures --- pkgs/development/tools/rust/cargo-embed/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index 2af012956c1a..80a8195d77eb 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; - cargoBuildFlags = [ "--features=ftdi" ]; + buildFeatures = [ "ftdi" ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; From 5a1b5f86d5814d095d8dbc5f04ebbc1f133a9ab6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:40:33 -0500 Subject: [PATCH 287/359] sccache: use buildFeatures --- pkgs/development/tools/misc/sccache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index cbdee69ce2ce..d2833ce9da62 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1f42cqaqnjwi9k4ihqil6z2dqh5dnf76x54gk7mndzkrfg3rl573"; - cargoBuildFlags = lib.optionals (!stdenv.isDarwin) [ "--features=dist-client,dist-server" ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildFeatures = lib.optionals (!stdenv.isDarwin) [ "dist-client" "dist-server" ]; + # Tests fail because of client server setup which is not possible inside the pure environment, # see https://github.com/mozilla/sccache/issues/460 doCheck = false; From 231a2134c0ffb7c481c850a66418332b9231a290 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:41:17 -0500 Subject: [PATCH 288/359] stylua: use buildFeatures --- pkgs/development/tools/stylua/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index d0b7bbdca9db..8d0625d7bea1 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-/4ZW1FIfK51ak2EIV6dYY3XpucPPR+OZySPWwcKP4v0="; - cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] - ++ lib.optionals luauSupport [ "--features" "luau" ]; + buildFeatures = lib.optional lua52Support "lua52" + ++ lib.optional luauSupport "luau"; # test_standard fails on darwin doCheck = !stdenvNoCC.isDarwin; From b73c22c5372c89ab0763b251aa6f3e3561df5674 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:41:59 -0500 Subject: [PATCH 289/359] tokei: use buildFeatures --- pkgs/development/tools/misc/tokei/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index e87f07067561..a93eee5cb1d1 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ]; # enable all output formats - cargoBuildFlags = [ "--features" "all" ]; + buildFeatures = [ "all" ]; meta = with lib; { description = "A program that allows you to count your code, quickly"; From bd60edf470b4a759e530778072b198ed2e3eab58 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:42:23 -0500 Subject: [PATCH 290/359] regenkfs: use buildFeatures --- pkgs/development/tools/knightos/regenkfs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/knightos/regenkfs/default.nix b/pkgs/development/tools/knightos/regenkfs/default.nix index 8b80368cdaa8..c50b10527f52 100644 --- a/pkgs/development/tools/knightos/regenkfs/default.nix +++ b/pkgs/development/tools/knightos/regenkfs/default.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage { }; cargoSha256 = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ="; - cargoBuildFlags = [ "--features=c-undef" ]; + + buildFeatures = [ "c-undef" ]; meta = with lib; { description = "Reimplementation of genkfs in Rust"; From fdf41beab13b969e2feb18fd29a04bfa4c4f7a5f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:46:47 -0500 Subject: [PATCH 291/359] diesel-cli: use buildFeatures --- pkgs/development/tools/diesel-cli/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 211993d2d7e6..b964262f56c3 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -21,9 +21,6 @@ assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysq let inherit (lib) optional optionals optionalString; - features = optional sqliteSupport "sqlite" - ++ optional postgresqlSupport "postgres" - ++ optional mysqlSupport "mysql"; in rustPlatform.buildRustPackage rec { @@ -36,7 +33,6 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-mRdDc4fHMkwkszY+2l8z1RSNMEQnrWI5/Y0Y2W+guQE="; }; - cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; cargoSha256 = "sha256-sQ762Ss31sA5qALHzwkvwbfRXo00cCtqzQyoz3/zf6I="; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -48,6 +44,11 @@ rustPlatform.buildRustPackage rec { ++ optional postgresqlSupport postgresql ++ optionals mysqlSupport [ mariadb zlib ]; + buildNoDefaultFeatures = true; + buildFeatures = optional sqliteSupport "sqlite" + ++ optional postgresqlSupport "postgres" + ++ optional mysqlSupport "mysql"; + checkPhase = '' runHook preCheck '' + optionalString sqliteSupport '' From 314d6b8c35145945bf6055e43a0e73282141b381 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:47:36 -0500 Subject: [PATCH 292/359] rustup: use buildFeatures --- pkgs/development/tools/rust/rustup/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index f5e3b9ac4c2f..3d137f58414e 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -40,7 +40,9 @@ rustPlatform.buildRustPackage rec { zlib ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ]; - cargoBuildFlags = [ "--features no-self-update" ]; + buildFeatures = [ "no-self-update" ]; + + checkFeatures = [ ]; patches = lib.optionals stdenv.isLinux [ (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' From 009c1d5b6d8f88faded1d6962d9661dc67cee61c Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:48:32 -0500 Subject: [PATCH 293/359] nushell: use buildFeatures --- pkgs/shells/nushell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 7a07c4ffdc4d..ffc93bff6b73 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; - cargoBuildFlags = lib.optional withExtraFeatures "--features=extra"; + buildFeatures = lib.optional withExtraFeatures "extra"; # Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and # `parquet`, for dataframe support), which by default has an impure build From 478acf788b629118d1272e0da21888cfe6df96fa Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:49:31 -0500 Subject: [PATCH 294/359] rust-analyzer: use buildFeature --- pkgs/development/tools/rust/rust-analyzer/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 91eea15867e9..7e69f18e124f 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -56,9 +56,6 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "crates/rust-analyzer"; - cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; - cargoTestFlags = lib.optional useMimalloc "--features=mimalloc"; - nativeBuildInputs = lib.optional useMimalloc cmake; buildInputs = lib.optionals stdenv.isDarwin [ @@ -66,6 +63,8 @@ rustPlatform.buildRustPackage rec { libiconv ]; + buildFeatures = lib.optional useMimalloc "mimalloc"; + RUST_ANALYZER_REV = version; inherit doCheck; From 84361e0a989a23acc9a80fa0ef4b66558cdba02f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:50:50 -0500 Subject: [PATCH 295/359] bore: use checkFeatures --- pkgs/tools/networking/bore/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index b22cdb0c2ae4..cfe78590483f 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -15,7 +15,9 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = "-p ${pname}"; # FIXME can’t test --all-targets and --doc in a single invocation - cargoTestFlags = "--features std --all-targets --workspace"; + checkFeatures = [ "std" ]; + + cargoTestFlags = [ "--all-targets" "--workspace" ]; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isDarwin llvmPackages.libclang; From b356c37023a7015133fd0746f51b9b470338bc4b Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 16 Nov 2021 08:18:57 -0500 Subject: [PATCH 296/359] vaultwarden: use buildFeatures --- pkgs/tools/security/vaultwarden/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 6bdf428b199b..77ec5a1e8132 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -3,10 +3,7 @@ , libiconv, Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: -let - featuresFlag = "--features ${dbBackend}"; - -in rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "vaultwarden"; version = "1.23.0"; @@ -35,14 +32,7 @@ in rustPlatform.buildRustPackage rec { # This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed. RUSTC_BOOTSTRAP = 1; - cargoBuildFlags = [ featuresFlag ]; - - checkPhase = '' - runHook preCheck - echo "Running cargo cargo test ${featuresFlag} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" - cargo test ${featuresFlag} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} - runHook postCheck - ''; + buildFeatures = dbBackend; passthru.tests = nixosTests.vaultwarden; From b464f0573e4e67978ed00a4bbab567a9bd08fc3c Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 15 Nov 2021 18:58:50 -0800 Subject: [PATCH 297/359] ocamlPackages.sodium: build on later OCaml versions --- pkgs/development/ocaml-modules/sodium/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index dc090e91743f..cff3d6186d1a 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -1,9 +1,5 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }: -if lib.versionAtLeast ocaml.version "4.10" -then throw "sodium is not available for OCaml ${ocaml.version}" -else - stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-sodium"; version = "0.6.0"; From 6189ca3ad4bda88fbb392684f569c1b505a09de9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 16 Nov 2021 08:32:07 -0500 Subject: [PATCH 298/359] selene: use buildNoDefaultFeatures --- pkgs/development/tools/selene/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index 2f6e731ea332..dd936781d9d9 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -26,9 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional robloxSupport openssl ++ lib.optional (robloxSupport && stdenv.isDarwin) Security; - cargoBuildFlags = lib.optional (!robloxSupport) "--no-default-features"; - - cargoTestFlags = cargoBuildFlags; + buildNoDefaultFeatures = !robloxSupport; meta = with lib; { description = "A blazing-fast modern Lua linter written in Rust"; From 94e7e21452ca8138f21f28a54802ca0929742477 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 16 Nov 2021 08:34:11 -0500 Subject: [PATCH 299/359] lucky-commit: use buildNoDefaultFeatures --- .../version-management/git-and-tools/lucky-commit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix index b58e192e391e..7d91fb775425 100644 --- a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); - cargoBuildFlags = lib.optional (!withOpenCL) "--no-default-features"; + buildNoDefaultFeatures = !withOpenCL; # disable tests that require gpu checkNoDefaultFeatures = true; From 104fd24044e93a8b6dfd908efd14851c080ed524 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 16 Nov 2021 08:35:09 -0500 Subject: [PATCH 300/359] menyoki: use buildNoDefaultFeatures --- pkgs/applications/graphics/menyoki/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index c454fc2ad611..77d1fd230726 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ libX11 libXrandr ]; - cargoBuildFlags = lib.optional (!withSki) "--no-default-features"; + buildNoDefaultFeatures = !withSki; postInstall = '' installManPage man/* From 0e9320dc5f2cf9914711ff44f1251a4c7bd0d30b Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 16 Nov 2021 08:36:17 -0500 Subject: [PATCH 301/359] cargo-deny: use buildNoDefaultFeatures --- pkgs/development/tools/rust/cargo-deny/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 7fe476c842c5..39567600f7e9 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -28,9 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoBuildFlags = [ "--no-default-features" ]; - - cargoTestFlags = cargoBuildFlags; + buildNoDefaultFeatures = true; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; From 1b2a061c87fd079f57a05c5390a42dcc777498f0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Nov 2021 15:00:20 +0100 Subject: [PATCH 302/359] gnome.gedit: fix typelib path We patch gobject-introspection and meson to store absolute paths to libraries in typelibs but that requires the install_dir is an absolute path. --- .../gnome/apps/gedit/correct-gir-lib-path.patch | 13 +++++++++++++ pkgs/desktops/gnome/apps/gedit/default.nix | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch diff --git a/pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch b/pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch new file mode 100644 index 000000000000..b3689e420669 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch @@ -0,0 +1,13 @@ +diff --git a/gedit/meson.build b/gedit/meson.build +index a8683e61a..fc48669f7 100644 +--- a/gedit/meson.build ++++ b/gedit/meson.build +@@ -191,7 +191,7 @@ libgedit_shared_lib = shared_library( + c_args: libgedit_c_args, + link_args: libgedit_link_args, + install: true, +- install_dir: get_option('libdir') / 'gedit', ++ install_dir: get_option('prefix') / get_option('libdir') / 'gedit', + ) + + # GObject Introspection diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index a8479e9cdcad..a6748dfc4174 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"; }; + patches = [ + # We patch gobject-introspection and meson to store absolute paths to libraries in typelibs + # but that requires the install_dir is an absolute path. + ./correct-gir-lib-path.patch + ]; + nativeBuildInputs = [ desktop-file-utils itstool From 79dc6a56292eb20676a07980528969ffcffcf340 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Tue, 16 Nov 2021 22:15:46 +0800 Subject: [PATCH 303/359] nixos/hbase: use jre8 instead of latest. --- nixos/modules/services/databases/hbase.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 9132b7ed3569..ff01a1bcd98b 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -103,7 +103,8 @@ in { wantedBy = [ "multi-user.target" ]; environment = { - JAVA_HOME = "${pkgs.jre}"; + # JRE 15 removed option `UseConcMarkSweepGC` which is needed. + JAVA_HOME = "${pkgs.jre8}"; HBASE_LOG_DIR = cfg.logDir; }; From 826d4ab03aa6e6eded3160be800bb77d9053d00c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 16 Nov 2021 15:50:12 +0100 Subject: [PATCH 304/359] smack: remove builder.sh --- pkgs/development/libraries/java/smack/builder.sh | 7 ------- pkgs/development/libraries/java/smack/default.nix | 12 +++++++++++- 2 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 pkgs/development/libraries/java/smack/builder.sh diff --git a/pkgs/development/libraries/java/smack/builder.sh b/pkgs/development/libraries/java/smack/builder.sh deleted file mode 100644 index c97259e6a17e..000000000000 --- a/pkgs/development/libraries/java/smack/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir smack -cd smack -tar xfvz $src -mkdir -p $out/share/java -cp libs/smack-*.jar $out/share/java diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index f831bfc8b933..c5d6098a3cde 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -2,13 +2,23 @@ stdenv.mkDerivation { name = "smack-4.1.9"; - builder = ./builder.sh; src = fetchurl { url = "http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz"; sha256 = "009x0qcxd4dkvwcjz2nla470pwbabwvg37wc21pslpw42ldi0bzp"; }; + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java + cp libs/smack-*.jar $out/share/java + + runHook postInstall + ''; + meta = { description = "A XMPP (Jabber) client library for instant messaging and presence"; homepage = "http://www.igniterealtime.org/projects/smack/"; From 57ed744c0597e408f5ad8661dd06b8e436009511 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 9 Nov 2021 13:32:54 +0100 Subject: [PATCH 305/359] roslyn: Update dependencies and do not add nuget.build.tasks.pack ``` /build/source/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj : error NU1100: Unable to resolve nuget.build.tasks.pack (>= 5.10.0-preview.2.7169)' for '.NETCoreApp,Version=v3.1'. /build/source/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj : error NU1100: Unable to resolve 'nuget.build.tasks.pack (>= 5.10.0-preview.2.7169)' for '.NETFramework,Version=v4.7.2'. ``` --- pkgs/development/compilers/roslyn/default.nix | 3 --- pkgs/development/compilers/roslyn/deps.nix | 22 +++++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/development/compilers/roslyn/default.nix index f05b821676fc..df07eea54e2d 100644 --- a/pkgs/development/compilers/roslyn/default.nix +++ b/pkgs/development/compilers/roslyn/default.nix @@ -85,9 +85,6 @@ in stdenv.mkDerivation rec { rm NuGet.config install -m644 -D ${nuget-config} fake-home/.nuget/NuGet/NuGet.Config ln -s ${packages}/lib/dotnet fake-home/.nuget/packages - HOME=$(pwd)/fake-home dotnet add \ - src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj \ - package -n -v 5.10.0-preview.2.7169 nuget.build.tasks.pack HOME=$(pwd)/fake-home dotnet msbuild -r -v:m -t:pack \ -p:Configuration=Release \ -p:RepositoryUrl="${meta.homepage}" \ diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix index 0ddd7e7cbac4..b08bd0740a42 100644 --- a/pkgs/development/compilers/roslyn/deps.nix +++ b/pkgs/development/compilers/roslyn/deps.nix @@ -137,10 +137,18 @@ } { name = "microsoft.netcore.app.host.linux-x64"; - version = "3.1.19"; + version = "3.1.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.19/microsoft.netcore.app.host.linux-x64.3.1.19.nupkg"; - sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.21/microsoft.netcore.app.host.linux-x64.3.1.21.nupkg"; + sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; + }; + } + { + name = "microsoft.netcore.app.host.linux-arm64"; + version = "3.1.21"; + src = fetchurl { + url = "https://globalcdn.nuget.org/packages/microsoft.netcore.app.host.linux-arm64.3.1.21.nupkg"; + sha256 = "0mv79mv0g539437jy4cxvkic7iqgh2xs1nlpd8bzx7jha27g5mlr"; }; } { @@ -271,14 +279,6 @@ sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }; } - { - name = "nuget.build.tasks.pack"; - version = "5.10.0-preview.2.7169"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.build.tasks.pack/5.10.0-preview.2.7169/nuget.build.tasks.pack.5.10.0-preview.2.7169.nupkg"; - sha256 = "0siby8s8km50hfwvqx34nfnn9qwhygxlhw57wm1j5d22nf16kasb"; - }; - } { name = "richcodenav.envvardump"; version = "0.1.1643-alpha"; From f201ba1bbd57e84adda87477173181624fae3f5c Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 9 Nov 2021 13:41:01 +0100 Subject: [PATCH 306/359] osu-lazer: Update dependencies --- pkgs/games/osu-lazer/deps.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 165702e60621..f809793a7eac 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -65,7 +65,7 @@ (fetchNuGet { name = "Markdig"; version = "0.26.0"; sha256 = "1pg0yica8h1c2kx10pqzc5iclmlfll5wbw1bxa8l251w1qnfglv2"; }) (fetchNuGet { name = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) (fetchNuGet { name = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "5.0.11"; sha256 = "0x6c6m8s4mq1j21sys8j1xp8sqvy5n3shcpcm0yyx4r2ld2cpdkr"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.11"; sha256 = "1b60rhlbn8s4c39nl2kb1xfq0m3kzy407hdvz2s5r9qc8y9p55ps"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; version = "5.0.11"; sha256 = "1rq6lildicnz6ngrf1m46ynya0hbn0hzazdqp6c3lkmkw3pgd8wp"; }) @@ -124,7 +124,7 @@ (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.1"; sha256 = "01ar5ba2sal9wnpa1xnnikhgb37vzhg2cspz45wf760jflpai2vv"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) From b3d87e4b17ac98917383232d1885f5f6ab2599fa Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 9 Nov 2021 13:42:47 +0100 Subject: [PATCH 307/359] discordchatexporter-cli: Update dependencies --- pkgs/tools/backup/discordchatexporter-cli/deps.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index 7b34bccecb5c..62d0595b4564 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -3,7 +3,7 @@ (fetchNuGet { name = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) (fetchNuGet { name = "JsonExtensions"; version = "1.1.0"; sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.19"; sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) (fetchNuGet { name = "MiniRazor.CodeGen"; version = "2.1.4"; sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; }) (fetchNuGet { name = "MiniRazor.Runtime"; version = "2.1.4"; sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; }) From caea8212dacf8f670a945f45576227d05847139e Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 9 Nov 2021 14:15:49 +0100 Subject: [PATCH 308/359] wasabibackend: Use nixpkgs-fmt instead of nixfmt --- pkgs/applications/blockchains/wasabibackend/create_deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/wasabibackend/create_deps.sh b/pkgs/applications/blockchains/wasabibackend/create_deps.sh index 79bc88ca8996..764bf2106ef9 100755 --- a/pkgs/applications/blockchains/wasabibackend/create_deps.sh +++ b/pkgs/applications/blockchains/wasabibackend/create_deps.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p dotnet-sdk_3 jq xmlstarlet curl nixfmt +#! nix-shell -i bash -p dotnet-sdk_3 jq xmlstarlet curl nixpkgs-fmt set -euo pipefail # Run this script to generate deps.nix @@ -95,4 +95,4 @@ echo $DEPS_FOOTER >&6 exec 6>&- -nixfmt "$deps_file" +nixpkgs-fmt "$deps_file" From 8f256170e4fc9688d6cf7a1bbceb547344a3bba0 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 9 Nov 2021 14:17:13 +0100 Subject: [PATCH 309/359] wasabibackend: Update dependencies --- .../blockchains/wasabibackend/deps.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix index 47ee3f9bfe59..d558fa871537 100644 --- a/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -1,17 +1,14 @@ { fetchurl }: let nugetUrlBase = "https://www.nuget.org/api/v2/package"; - fetchNuGet = { name, version, sha256 }: - fetchurl { - inherit sha256; - url = "${nugetUrlBase}/${name}/${version}"; - }; -in [ + fetchNuGet = { name, version, sha256 }: fetchurl { inherit sha256; url = "${nugetUrlBase}/${name}/${version}"; }; +in +[ (fetchNuGet { name = "microsoft.aspnetcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; + version = "3.1.21"; + sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) (fetchNuGet { name = "microsoft.aspnetcore.jsonpatch"; @@ -95,8 +92,8 @@ in [ }) (fetchNuGet { name = "microsoft.netcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; + version = "3.1.21"; + sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) (fetchNuGet { name = "microsoft.netcore.dotnetapphost"; From be738c1590c44dfd5b7ade05384126fc69884ef0 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 10 Nov 2021 08:45:27 +0100 Subject: [PATCH 310/359] python-language-server: Update dependencies --- .../dotnet-modules/python-language-server/deps.nix | 8 ++++---- .../dotnet-modules/python-language-server/manual_deps.txt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix index 9ebbaceae502..7a15a5f384fd 100644 --- a/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -48,8 +48,8 @@ in [ (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.19"; - sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; + version = "3.1.21"; + sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) (fetchNuGet { @@ -78,8 +78,8 @@ in [ (fetchNuGet { name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.19"; - sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; + version = "3.1.21"; + sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) (fetchNuGet { diff --git a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt index 541bedcbe566..35afa4da80ae 100644 --- a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt +++ b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt @@ -1,2 +1,2 @@ -Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.19 -Microsoft.NetCore.App.Runtime.linux-x64 3.1.19 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.21 +Microsoft.NetCore.App.Runtime.linux-x64 3.1.21 From 80cf9cd7eebe29b8ff6edc6ba3f92d0a926b2050 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 10 Nov 2021 09:22:40 +0100 Subject: [PATCH 311/359] eventstore: Fix create-deps.sh script and update dependencies The old version of the script tried to parse the output of the dotnet tool, but apparently, that output changed and thus the list of dependencies was empty. --- pkgs/servers/nosql/eventstore/create-deps.sh | 116 ++- pkgs/servers/nosql/eventstore/deps.nix | 873 +++++++++++-------- 2 files changed, 577 insertions(+), 412 deletions(-) mode change 100644 => 100755 pkgs/servers/nosql/eventstore/create-deps.sh diff --git a/pkgs/servers/nosql/eventstore/create-deps.sh b/pkgs/servers/nosql/eventstore/create-deps.sh old mode 100644 new mode 100755 index da73bcf1e3b6..7b1acd5ab26f --- a/pkgs/servers/nosql/eventstore/create-deps.sh +++ b/pkgs/servers/nosql/eventstore/create-deps.sh @@ -1,34 +1,98 @@ -# 1. create a log with `dotnet restore -v m MyPackage.sln > mypackage-restore.log -# 2. then call ./create-deps.sh mypackage-restore.log +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p dotnet-sdk_5 jq xmlstarlet curl nixpkgs-fmt +set -euo pipefail -urlbase="https://www.nuget.org/api/v2/package" -cat << EOL -{ fetchurl }: let +# Run this script to generate deps.nix +# TODO: consolidate with other dotnet deps generation scripts by which +# this script is inspired: +# - pkgs/servers/nosql/eventstore/create-deps.sh +# - pkgs/development/dotnet-modules/python-language-server/create_deps.sh +# - pkgs/misc/emulators/ryujinx/updater.sh + +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +exec 2>&1 6> "$deps_file" + +store_src="$( nix-build ../../../.. -A eventstore.src --no-out-link )" +src="$(mktemp -d)" +cp -rT "$store_src" "$src" +chmod -R +w "$src" +pushd "$src" + +URLBASE="https://www.nuget.org/api/v2/package" + +DEPS_HEADER=" +{ fetchurl }: +let + nugetUrlBase = \"$URLBASE\"; fetchNuGet = { name, version, sha256 }: fetchurl { inherit sha256; - url = "$urlbase/\${name}/\${version}"; + url = \"\${nugetUrlBase}/\${name}/\${version}\"; }; +in [" -in [ -EOL -IFS='' -while read line; do - if echo $line | grep -q "Installing "; then - name=$(echo $line | sed -r 's/ Installing ([^ ]+) (.+)./\1/') - version=$(echo $line | sed -r 's/ Installing ([^ ]+) (.+)./\2/') - sha256=$(nix-prefetch-url "$urlbase/$name/$version" 2>/dev/null) - cat << EOL +DEPS_FOOTER="]" - (fetchNuGet { - name = "$name"; - version = "$version"; - sha256 = "$sha256"; - }) -EOL - fi -done < $1 -cat << EOL +DEPS_TEMPLATE=" +(fetchNuGet { + name = \"%s\"; + version = \"%s\"; + sha256 = \"%s\"; +})" -] -EOL +tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root +trap 'rm -rf "$tmpdir"' EXIT + +HOME="$tmpdir" dotnet restore --packages "$tmpdir"/.nuget/packages \ + --no-cache --force --runtime linux-x64 \ + src/EventStore.sln >&2 + +mapfile -t repos < <( + xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config "$tmpdir"/.nuget/NuGet/NuGet.Config | + while IFS= read index + do + curl --compressed -fsL "$index" | \ + jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"' + done +) + +echo $DEPS_HEADER >&6 + +cd "$tmpdir/.nuget/packages" +for package in * +do + cd "$package" + for version in * + do + found=false + for repo in "${repos[@]}" + do + url="$repo$package/$version/$package.$version.nupkg" + if curl -fsL "$url" -o /dev/null + then + found=true + break + fi + done + + if ! $found + then + echo "couldn't find $package $version" >&2 + exit 1 + fi + + sha256=$(nix-prefetch-url "$url" 2>/dev/null) + + printf "$DEPS_TEMPLATE" $package $version $sha256 >&6 + done + cd .. +done + +echo $DEPS_FOOTER >&6 + +exec 6>&- + +nixpkgs-fmt "$deps_file" diff --git a/pkgs/servers/nosql/eventstore/deps.nix b/pkgs/servers/nosql/eventstore/deps.nix index 937bd8181441..7f61169276fd 100644 --- a/pkgs/servers/nosql/eventstore/deps.nix +++ b/pkgs/servers/nosql/eventstore/deps.nix @@ -1,532 +1,633 @@ -{ fetchurl }: let - - fetchNuGet = { name, version, sha256 }: fetchurl { - inherit sha256; - url = "https://www.nuget.org/api/v2/package/${name}/${version}"; - }; - -in [ +{ fetchurl }: +let + nugetUrlBase = "https://www.nuget.org/api/v2/package"; + fetchNuGet = { name, version, sha256 }: fetchurl { inherit sha256; url = "${nugetUrlBase}/${name}/${version}"; }; +in +[ (fetchNuGet { - name = "YamlDotNet"; - version = "5.2.1"; - sha256 = "0nb34qcdhs5qn4783idg28f2kr89vaiyjn4v2barhv7i75zhym6y"; + name = "hdrhistogram"; + version = "2.5.0"; + sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; }) - (fetchNuGet { - name = "NLog"; - version = "4.5.10"; - sha256 = "0d4yqxrhqn2k36h3v1f5pn6qqlagbzg67v6gvxqhz3s4zyc3b8rg"; + name = "microsoft.build.tasks.git"; + version = "1.0.0-beta-63127-02"; + sha256 = "10avjhp4vjbmix4rwacbw6cim2d4kbmz64q4n7r6zz94395l61b6"; }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "11.0.2"; - sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; - }) - - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - - (fetchNuGet { - name = "Microsoft.CodeCoverage"; + name = "microsoft.codecoverage"; version = "15.9.0"; sha256 = "10v5xrdilnm362g9545qxvlrbwc9vn65jhpb1i0jlhyqsj6bfwzg"; }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + name = "microsoft.netcore.platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "1.1.1"; + sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; + }) + (fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "2.1.0"; + sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; + }) + (fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "microsoft.netframework.referenceassemblies"; + version = "1.0.0"; + sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; + }) + (fetchNuGet { + name = "microsoft.netframework.referenceassemblies.net452"; + version = "1.0.0"; + sha256 = "1f0vqrnkggnn4fgfbb2wp4hg9b1n1zvcknvgpphl5dfrk4b0zag8"; + }) + (fetchNuGet { + name = "microsoft.netframework.referenceassemblies.net46"; + version = "1.0.0"; + sha256 = "1yl609ilni8adiyryn9rm967sjm499pkx4xj06gpb16dm8d9jkji"; + }) + (fetchNuGet { + name = "microsoft.netframework.referenceassemblies.net471"; + version = "1.0.0"; + sha256 = "101incszmaxdhrfzqbfya04fqivi81xvazdfc5l0hr7hm42r6k2m"; + }) + (fetchNuGet { + name = "microsoft.net.test.sdk"; + version = "15.9.0"; + sha256 = "0g7wjgiigs4v8qa32g9ysqgx8bx55dzmbxfkc4ic95mpd1vkjqxw"; + }) + (fetchNuGet { + name = "microsoft.sourcelink.common"; + version = "1.0.0-beta-63127-02"; + sha256 = "0y29xx3x9nd14n1sr8ycxhf6y1a83pv3sayfxjib8wi6s866lagb"; + }) + (fetchNuGet { + name = "microsoft.sourcelink.github"; + version = "1.0.0-beta-63127-02"; + sha256 = "1096d5n7mfvgm1apdmafjkxkqray6r2cw6zjhhxj2zn98836w1n2"; + }) + (fetchNuGet { + name = "microsoft.win32.primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "netstandard.library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }) + (fetchNuGet { + name = "newtonsoft.json"; + version = "11.0.2"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; + }) + (fetchNuGet { + name = "nlog"; + version = "4.5.10"; + sha256 = "0d4yqxrhqn2k36h3v1f5pn6qqlagbzg67v6gvxqhz3s4zyc3b8rg"; + }) + (fetchNuGet { + name = "nunit"; + version = "3.11.0"; + sha256 = "0mmc8snwjjmbkhk6cv5c0ha77czzy9bca4q59244rxciw9sxk1cz"; + }) + (fetchNuGet { + name = "nunit3testadapter"; + version = "3.10.0"; + sha256 = "0ahzfk9y2dq0wl91ll5hss89hqw7la85ndll5030nslizsgm5q2i"; }) - (fetchNuGet { name = "protobuf-net"; version = "2.4.0"; sha256 = "106lxm9afga7ihlknyy7mlfplyq40mrndksqrsn8ia2a47fbqqld"; }) - (fetchNuGet { - name = "NUnit3TestAdapter"; - version = "3.10.0"; - sha256 = "0ahzfk9y2dq0wl91ll5hss89hqw7la85ndll5030nslizsgm5q2i"; - }) - - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.5.0"; - sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; - }) - - (fetchNuGet { - name = "NUnit"; - version = "3.11.0"; - sha256 = "0mmc8snwjjmbkhk6cv5c0ha77czzy9bca4q59244rxciw9sxk1cz"; - }) - - (fetchNuGet { - name = "System.Reflection.DispatchProxy"; - version = "4.5.0"; - sha256 = "0v9sg38h91aljvjyc77m1y5v34p50hjdbxvvxwa1whlajhafadcn"; - }) - - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "15.9.0"; - sha256 = "0g7wjgiigs4v8qa32g9ysqgx8bx55dzmbxfkc4ic95mpd1vkjqxw"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.1.0"; - sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; - }) - - (fetchNuGet { - name = "HdrHistogram"; - version = "2.5.0"; - sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + name = "runtime.any.system.collections"; version = "4.3.0"; - sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; + name = "runtime.any.system.diagnostics.tracing"; version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; + name = "runtime.any.system.globalization"; version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; + name = "runtime.any.system.globalization.calendars"; version = "4.3.0"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { - name = "System.Reflection.Extensions"; + name = "runtime.any.system.io"; version = "4.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { - name = "System.Private.ServiceModel"; - version = "4.5.3"; - sha256 = "0nyw9m9dj327hn0qb0jmgwpch0f40jv301fk4mrchga8g99xbpng"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; + name = "runtime.any.system.reflection"; version = "4.3.0"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; + name = "runtime.any.system.reflection.extensions"; version = "4.3.0"; - sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; + name = "runtime.any.system.reflection.primitives"; version = "4.3.0"; - sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { - name = "System.Globalization.Calendars"; + name = "runtime.any.system.resources.resourcemanager"; version = "4.3.0"; - sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { - name = "System.Linq"; + name = "runtime.any.system.runtime"; version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { - name = "Microsoft.Build.Tasks.Git"; - version = "1.0.0-beta-63127-02"; - sha256 = "10avjhp4vjbmix4rwacbw6cim2d4kbmz64q4n7r6zz94395l61b6"; - }) - - (fetchNuGet { - name = "Microsoft.SourceLink.Common"; - version = "1.0.0-beta-63127-02"; - sha256 = "0y29xx3x9nd14n1sr8ycxhf6y1a83pv3sayfxjib8wi6s866lagb"; - }) - - (fetchNuGet { - name = "Microsoft.SourceLink.GitHub"; - version = "1.0.0-beta-63127-02"; - sha256 = "1096d5n7mfvgm1apdmafjkxkqray6r2cw6zjhhxj2zn98836w1n2"; - }) - - (fetchNuGet { - name = "System.Runtime.Numerics"; + name = "runtime.any.system.runtime.handles"; version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; + name = "runtime.any.system.runtime.interopservices"; version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { - name = "System.Reflection.Primitives"; + name = "runtime.any.system.text.encoding"; version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "runtime.any.system.text.encoding.extensions"; version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; - }) - - (fetchNuGet { - name = "System.Net.Requests"; + name = "runtime.any.system.threading.tasks"; version = "4.3.0"; - sha256 = "0pcznmwqqk0qzp0gf4g4xw7arhb0q8v9cbzh3v8h8qp6rjcr339a"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; + name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; - }) - - (fetchNuGet { - name = "System.Net.Http"; - version = "4.3.4"; - sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; - }) - - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; - }) - - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; - }) - - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; - }) - - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; - }) - - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; - }) - - (fetchNuGet { - name = "System.Net.Security"; - version = "4.3.2"; - sha256 = "1aw1ca1vssqrillrh4qkarx0lxwc8wcaqdkfdima8376wb98j2q8"; - }) - - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - - (fetchNuGet { - name = "System.Reflection"; + name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { - name = "System.Collections"; + name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; - }) - - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.3.0"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; - }) - - (fetchNuGet { - name = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - - (fetchNuGet { - name = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) - - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; - }) - - (fetchNuGet { - name = "System.Net.WebHeaderCollection"; - version = "4.3.0"; - sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; - }) - - (fetchNuGet { - name = "System.Security.Claims"; - version = "4.3.0"; - sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; - }) - - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.3.0"; - sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; - }) - - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.1"; - sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; - }) - - (fetchNuGet { - name = "runtime.native.System"; + name = "runtime.native.system"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; + name = "runtime.native.system.net.http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { - name = "runtime.native.System.Net.Security"; + name = "runtime.native.system.net.security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; + name = "runtime.native.system.security.cryptography.apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + name = "runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.native.system.security.cryptography.openssl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; + name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; + name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.2"; + sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; + }) + (fetchNuGet { + name = "runtime.unix.microsoft.win32.primitives"; + version = "4.3.0"; + sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; + }) + (fetchNuGet { + name = "runtime.unix.system.diagnostics.debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + (fetchNuGet { + name = "runtime.unix.system.io.filesystem"; + version = "4.3.0"; + sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; + }) + (fetchNuGet { + name = "runtime.unix.system.net.primitives"; + version = "4.3.0"; + sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; + }) + (fetchNuGet { + name = "runtime.unix.system.private.uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + (fetchNuGet { + name = "runtime.unix.system.runtime.extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; + }) + (fetchNuGet { + name = "system.buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "system.collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "system.collections.concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + name = "system.diagnostics.debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "system.diagnostics.diagnosticsource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { - name = "System.Xml.XmlSerializer"; + name = "system.diagnostics.tracing"; version = "4.3.0"; - sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { - name = "System.Globalization.Extensions"; + name = "system.globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "system.globalization.calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + name = "system.globalization.extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { - name = "System.IO.FileSystem"; + name = "system.io"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "system.io.filesystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { - name = "System.Runtime.Extensions"; + name = "system.io.filesystem.primitives"; version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { - name = "System.Runtime.Handles"; + name = "system.linq"; version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; + name = "system.net.http"; + version = "4.3.4"; + sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; + }) + (fetchNuGet { + name = "system.net.primitives"; version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; + name = "system.net.requests"; version = "4.3.0"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + sha256 = "0pcznmwqqk0qzp0gf4g4xw7arhb0q8v9cbzh3v8h8qp6rjcr339a"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; + name = "system.net.security"; + version = "4.3.2"; + sha256 = "1aw1ca1vssqrillrh4qkarx0lxwc8wcaqdkfdima8376wb98j2q8"; + }) + (fetchNuGet { + name = "system.net.webheadercollection"; version = "4.3.0"; - sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) - (fetchNuGet { - name = "System.ServiceModel.Primitives"; + name = "system.private.servicemodel"; version = "4.5.3"; - sha256 = "1v90pci049cn44y0km885k1vrilhb34w6q2zva4y6f3ay84klrih"; + sha256 = "0nyw9m9dj327hn0qb0jmgwpch0f40jv301fk4mrchga8g99xbpng"; }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; + name = "system.private.uri"; version = "4.3.0"; - sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; + name = "system.reflection"; version = "4.3.0"; - sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.3.0"; - sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + name = "system.reflection.dispatchproxy"; + version = "4.5.0"; + sha256 = "0v9sg38h91aljvjyc77m1y5v34p50hjdbxvvxwa1whlajhafadcn"; }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit"; + name = "system.reflection.emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.4.0"; - sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; + name = "system.reflection.emit.ilgeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; + name = "system.reflection.emit.lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - + (fetchNuGet { + name = "system.reflection.extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "system.reflection.primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "system.reflection.typeextensions"; + version = "4.4.0"; + sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; + }) + (fetchNuGet { + name = "system.resources.resourcemanager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "system.runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "system.runtime.extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "system.runtime.handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "system.runtime.interopservices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "system.runtime.numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "system.security.claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + name = "system.security.cryptography.algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + name = "system.security.cryptography.cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + name = "system.security.cryptography.csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + name = "system.security.cryptography.encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + name = "system.security.cryptography.openssl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + name = "system.security.cryptography.primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + name = "system.security.cryptography.x509certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + name = "system.security.principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + name = "system.security.principal.windows"; + version = "4.5.0"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }) + (fetchNuGet { + name = "system.servicemodel.primitives"; + version = "4.5.3"; + sha256 = "1v90pci049cn44y0km885k1vrilhb34w6q2zva4y6f3ay84klrih"; + }) + (fetchNuGet { + name = "system.text.encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "system.text.encoding.extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "system.text.regularexpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "system.threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "system.threading.tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "system.threading.tasks.extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "system.threading.threadpool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + name = "system.xml.readerwriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "system.xml.xmldocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "system.xml.xmlserializer"; + version = "4.3.0"; + sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; + }) + (fetchNuGet { + name = "yamldotnet"; + version = "5.2.1"; + sha256 = "0nb34qcdhs5qn4783idg28f2kr89vaiyjn4v2barhv7i75zhym6y"; + }) ] From 9a1ee5250a8360eed7c70cfb9aac2844db48a41e Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 10 Nov 2021 23:54:48 +0100 Subject: [PATCH 312/359] alttpr-opentracker: Update dependencies --- pkgs/tools/games/opentracker/deps.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/games/opentracker/deps.nix b/pkgs/tools/games/opentracker/deps.nix index 3d6944b66724..fb3427dbbb49 100644 --- a/pkgs/tools/games/opentracker/deps.nix +++ b/pkgs/tools/games/opentracker/deps.nix @@ -25,11 +25,12 @@ (fetchNuGet { name = "HarfBuzzSharp"; version = "2.6.1.7"; sha256 = "0xm4dr6cs5n1ywbbpp1jrxfk8rn1iy61kdm29kb6bqj1q0gv8zyv"; }) (fetchNuGet { name = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.6.1.7"; sha256 = "1slackrhcwsjn3f6sa0nlrcynzmx5pbqv8j33l9w6z9w7ssq4wkn"; }) (fetchNuGet { name = "JetBrains.Annotations"; version = "2020.3.0"; sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "0akdzi35497v8yxr3a9q1g26cnx9vxnwv81kwxi293jklwnx8gsr"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "16kya6xvi7k42sr8bxgpbz9116dj7g3i18ylpvji9qngdx41891v"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.21"; sha256 = "0rd3w3i6fzwhi71jcr8i0mchgfgpp1a0qhancg4dxsva032as4s6"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.19"; sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.19"; sha256 = "0fhj1q9zdy5nqxppjgr8ayqlc2b9zfbrs7h3zc1wlg9xxbzk944y"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.19"; sha256 = "0cbic6d8ck79fgg7hngfvsdyd9aj6zanf6c36lzdydvqvjza1l48"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.19"; sha256 = "040rbbxgcqks2f81x2sr8bnrarxygadzv84ksfpwcdw5xjnqj5c9"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "3.9.0"; sha256 = "1x6l6kn8iv5gk1545nxs2gwzkb8gj4sb9kryai132l7yg9afjqik"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "3.9.0"; sha256 = "0crb9x5rhija8y7b0iya9axcvinz2hv3bgf80bvz7kv6zpbpszkz"; }) @@ -39,15 +40,14 @@ (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.9.1"; sha256 = "18isx8w4kwnlk6hq5ay8i4lgzwhx0zg9brayfdk2lakagvv6yyaf"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.19"; sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.19"; sha256 = "1yqkh1z643vfxs2qkhc4h8403ha29f3kpj28cm067zsyr0jn1zbx"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.19"; sha256 = "1069h3yznipl44gzx0r7srg5yfhkp8v552g1pl7rdnwrbi1xfrbg"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.19"; sha256 = "19vkqpw5j0zd6b06npx934idjq90av0rhsvcx01z6hlhg80ajr14"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.19"; sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.19"; sha256 = "0av8fnjmjmws9h1r49ga7an9180z156dii3n0crwmn9fwdw2l7g2"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.19"; sha256 = "19rw3hpr32x4kwlx7drd2f522pkvhgpscjldg0rg40z6ki3biykd"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.19"; sha256 = "17kxfradsfdf8cr506izmb3lhgy4kg7ij82cjdx6nxwkpaq96ykw"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.21"; sha256 = "1s5g9gk0hvs268q2zpc32m0my2m2ivlmsmza86797a9vkxr6pzw6"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.21"; sha256 = "0dl4yakfmdkx6xr18f09cdnl11b4fyp23jg3msr8a25zqdqvcr29"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.21"; sha256 = "1l5wh5c9bgnzph07cd72q08mr87lsczwl0vy0rzrsi7xpzryvw7l"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "1p7fpcmx4m2374zjfh53i3mv4lkr8xrkz5lnawv95s7j005m07pc"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "02zgxzf8l607mh17900n7msga0yfcnqgd70rj1rlwj23plifykx1"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.21"; sha256 = "1gsrajdhlyndwb0s1c03cbm7wh1yfiwpk075nrlfvicbc4m7h347"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) From 5913fdbd0bf1a77811f262df1af3f3dc1b6e44df Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 11 Nov 2021 09:54:41 +0100 Subject: [PATCH 313/359] github-runner: Update dependencies --- .../github-runner/deps.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index 803a4019a744..197927674be1 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -15,13 +15,13 @@ in }) (fetchNuGet { name = "microsoft.aspnetcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; + version = "3.1.21"; + sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) (fetchNuGet { name = "microsoft.aspnetcore.app.runtime.linux-arm64"; - version = "3.1.19"; - sha256 = "0xspb0xib1zsqnkkqm4s26z27v9idh9k09zziar1cavh2hxxxfcd"; + version = "3.1.21"; + sha256 = "0147s60lvbzj2agb4wgwvkxacq96mqsgayxkbpjqybnc8ggzqkvr"; }) (fetchNuGet { name = "microsoft.aspnet.webapi.client"; @@ -45,13 +45,13 @@ in }) (fetchNuGet { name = "microsoft.netcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; + version = "3.1.21"; + sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) (fetchNuGet { name = "microsoft.netcore.app.runtime.linux-arm64"; - version = "3.1.19"; - sha256 = "0v9nc38bg4k2qk547pl1rlrslwprixqlbhcbbf6pw1ia6261wm5m"; + version = "3.1.21"; + sha256 = "04rp4j2kyzslyfbzldm2ndb6v4g7jq9xi9bmvss34fh25gdgqs3q"; }) (fetchNuGet { name = "microsoft.netcore.platforms"; From bde93173ddc6d213dbb52be3fdd20bb244b809b5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 16 Nov 2021 16:08:21 +0100 Subject: [PATCH 314/359] mockobjects: remove builder.sh --- .../libraries/java/mockobjects/builder.sh | 6 ------ .../libraries/java/mockobjects/default.nix | 13 ++++++++++++- 2 files changed, 12 insertions(+), 7 deletions(-) delete mode 100755 pkgs/development/libraries/java/mockobjects/builder.sh diff --git a/pkgs/development/libraries/java/mockobjects/builder.sh b/pkgs/development/libraries/java/mockobjects/builder.sh deleted file mode 100755 index fd5d1a20869c..000000000000 --- a/pkgs/development/libraries/java/mockobjects/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -set -e -source $stdenv/setup - -tar xvf $src -mkdir -p $out -mv * $out diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index e20d7e707e71..3780ef4abed2 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -2,13 +2,24 @@ stdenv.mkDerivation { name = "mockobjects-0.09"; - builder = ./builder.sh; src = fetchurl { url = "mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar"; sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; }; + # Work around the "unpacker appears to have produced no directories" + setSourceRoot = "sourceRoot=`pwd`"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java + cp mockobjects-*.jar $out/share/java + + runHook postInstall + ''; + meta = with lib; { description = "Generic unit testing framework and methodology for testing any kind of code"; platforms = platforms.unix; From 37fa1e7c1d412b26152fc30e087c038685b32756 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Oct 2021 14:31:52 +0200 Subject: [PATCH 315/359] treewide: pass and inherit writeShellScript in node2nix packages --- .../networking/cluster/spacegun/node-composition.nix | 2 +- pkgs/applications/version-management/commitizen/node-env.nix | 2 +- pkgs/development/compilers/elm/packages/node-composition.nix | 2 +- pkgs/development/misc/google-clasp/google-clasp.nix | 2 +- pkgs/development/web/remarkjs/nodepkgs.nix | 2 +- pkgs/misc/base16-builder/node-packages.nix | 2 +- pkgs/servers/jellyfin/node-composition.nix | 2 +- .../matrix-synapse/matrix-appservice-irc/node-composition.nix | 2 +- .../matrix-synapse/matrix-appservice-slack/node-composition.nix | 2 +- .../monitoring/prometheus/webui/codemirror-promql/default.nix | 2 +- pkgs/servers/monitoring/prometheus/webui/webui/default.nix | 2 +- pkgs/servers/mx-puppet-discord/node-composition.nix | 2 +- pkgs/servers/web-apps/cryptpad/node-packages.nix | 2 +- pkgs/servers/web-apps/whitebophir/node-packages.nix | 2 +- pkgs/tools/audio/botamusique/default.nix | 2 +- pkgs/tools/graphics/ldgallery/viewer/node-composition.nix | 2 +- pkgs/tools/networking/airfield/node.nix | 2 +- pkgs/tools/package-management/nixui/nixui.nix | 2 +- pkgs/tools/security/onlykey/onlykey.nix | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 7cbb2328ae73..9d532a3861a1 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/applications/version-management/commitizen/node-env.nix b/pkgs/applications/version-management/commitizen/node-env.nix index 262df27e464f..3803723a5147 100644 --- a/pkgs/applications/version-management/commitizen/node-env.nix +++ b/pkgs/applications/version-management/commitizen/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile, writeShellScript}: let python = if nodejs ? python then nodejs.python else python2; diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index 4b662bd072b4..10952aff94b6 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix index baacee29ff20..6bb4ea8fbd67 100644 --- a/pkgs/development/misc/google-clasp/google-clasp.nix +++ b/pkgs/development/misc/google-clasp/google-clasp.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index baacee29ff20..6bb4ea8fbd67 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 79748949ff72..459157b82a4c 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -10,7 +10,7 @@ let inherit (pkgs) stdenv lib nix-gitignore fetchurl fetchgit; }); nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/jellyfin/node-composition.nix b/pkgs/servers/jellyfin/node-composition.nix index d0c72d2e8536..fc96c12c5b25 100644 --- a/pkgs/servers/jellyfin/node-composition.nix +++ b/pkgs/servers/jellyfin/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix index 6fb86dfd79e7..f9a1999f36d7 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix index e0d21f7d44d3..9f0040e2f446 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix b/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix index 20c7e2568cf0..6b56f640ae9a 100644 --- a/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix +++ b/pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/monitoring/prometheus/webui/webui/default.nix b/pkgs/servers/monitoring/prometheus/webui/webui/default.nix index 20c7e2568cf0..6b56f640ae9a 100644 --- a/pkgs/servers/monitoring/prometheus/webui/webui/default.nix +++ b/pkgs/servers/monitoring/prometheus/webui/webui/default.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index 777c9db52568..1285e13cfba4 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index 76d5cf6a202f..0961603968ea 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix index 76d5cf6a202f..0961603968ea 100644 --- a/pkgs/servers/web-apps/whitebophir/node-packages.nix +++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index d13bbd13c922..a1c78768f6ab 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -17,7 +17,7 @@ let nodejs = pkgs.nodejs-12_x; nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix index aaf54a05c884..02fdb925fb1b 100644 --- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix +++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 0bcd0eb4b851..e6ff9b78d386 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 0bcd0eb4b851..e6ff9b78d386 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix index 6fb86dfd79e7..f9a1999f36d7 100644 --- a/pkgs/tools/security/onlykey/onlykey.nix +++ b/pkgs/tools/security/onlykey/onlykey.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; From 6c2f6a21ed354628adffae407340472fa245ef2d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Oct 2021 15:43:25 +0200 Subject: [PATCH 316/359] commitizen: 4.2.1 -> 4.2.4 --- .../commitizen/generate-dependencies.sh | 2 +- .../commitizen/node-composition.nix | 8 +- .../commitizen/node-env.nix | 132 +- .../commitizen/node-packages.nix | 2923 +++++++++-------- 4 files changed, 1736 insertions(+), 1329 deletions(-) diff --git a/pkgs/applications/version-management/commitizen/generate-dependencies.sh b/pkgs/applications/version-management/commitizen/generate-dependencies.sh index 7111289d2909..9855e2d41d1a 100755 --- a/pkgs/applications/version-management/commitizen/generate-dependencies.sh +++ b/pkgs/applications/version-management/commitizen/generate-dependencies.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix +#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix node2nix \ --node-env node-env.nix \ diff --git a/pkgs/applications/version-management/commitizen/node-composition.nix b/pkgs/applications/version-management/commitizen/node-composition.nix index 0769168a78fa..53bdef1f9864 100644 --- a/pkgs/applications/version-management/commitizen/node-composition.nix +++ b/pkgs/applications/version-management/commitizen/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import { inherit system; @@ -6,12 +6,12 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; - inherit nodejs; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/pkgs/applications/version-management/commitizen/node-env.nix b/pkgs/applications/version-management/commitizen/node-env.nix index 3803723a5147..5f055785791b 100644 --- a/pkgs/applications/version-management/commitizen/node-env.nix +++ b/pkgs/applications/version-management/commitizen/node-env.nix @@ -1,8 +1,11 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile, writeShellScript}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: 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 @@ -37,36 +40,22 @@ let ''; }; - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi + local strippedName - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) + local DIR=$PWD cd $TMPDIR - unpackFile ${src} + unpackFile $src # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" + mkdir -p "$(dirname "$DIR/$packageName")" - if [ -f "${src}" ] + if [ -f "$src" ] then # Figure out what directory has been unpacked packageDir="$(find . -maxdepth 1 -type d | tail -1)" @@ -76,28 +65,53 @@ let chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] + 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})" + 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}" + mv "$strippedName" "$DIR/$packageName" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; - # Include the dependencies of the package - cd "$DIR/${packageName}" + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.name}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} cd .. ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -242,8 +256,8 @@ let if(fs.existsSync("./package-lock.json")) { var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - if(packageLock.lockfileVersion !== 1) { - process.stderr.write("Sorry, I only understand lock file version 1!\n"); + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); process.exit(1); } @@ -388,15 +402,16 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -411,6 +426,8 @@ let passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -443,10 +460,15 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); - # Builds a development shell - buildNodeShell = + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = { name , packageName , version @@ -465,12 +487,12 @@ let let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ + in + stdenv.mkDerivation ({ name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -483,6 +505,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} @@ -512,11 +536,32 @@ let 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) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell < Date: Tue, 16 Nov 2021 16:16:15 +0100 Subject: [PATCH 317/359] python3Packages.cdcs: init at 0.1.5 --- .../python-modules/cdcs/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/cdcs/default.nix diff --git a/pkgs/development/python-modules/cdcs/default.nix b/pkgs/development/python-modules/cdcs/default.nix new file mode 100644 index 000000000000..9dd8a272395b --- /dev/null +++ b/pkgs/development/python-modules/cdcs/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pandas +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + version = "0.1.5"; + pname = "cdcs"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "usnistgov"; + repo = "pycdcs"; + rev = "v${version}"; + sha256 = "0sd0s0mka2bvpxxiz98cjc2h5ncsb7d03af1q3w9w8pmvfsgj7pc"; + }; + + propagatedBuildInputs = [ + numpy + pandas + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "cdcs" + ]; + + meta = with lib; { + description = "Python client for performing REST calls to configurable data curation system (CDCS) databases"; + homepage = "https://github.com/usnistgov/pycdcs"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c63a35749259..734d1c80281e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1409,6 +1409,8 @@ in { cchardet = callPackage ../development/python-modules/cchardet { }; + cdcs = callPackage ../development/python-modules/cdcs { }; + celery = callPackage ../development/python-modules/celery { }; cement = callPackage ../development/python-modules/cement { }; From 3be80d16192b9b1a9c6853e2d2387015914c0858 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 16 Nov 2021 16:31:56 +0100 Subject: [PATCH 318/359] mssql-jdbc: remove build.sh --- pkgs/servers/sql/mssql/jdbc/builder.sh | 6 ------ pkgs/servers/sql/mssql/jdbc/default.nix | 16 +++++++++++++--- 2 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 pkgs/servers/sql/mssql/jdbc/builder.sh diff --git a/pkgs/servers/sql/mssql/jdbc/builder.sh b/pkgs/servers/sql/mssql/jdbc/builder.sh deleted file mode 100644 index a5ba86cb0808..000000000000 --- a/pkgs/servers/sql/mssql/jdbc/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -set -e - -mkdir -p $out/share/java -cp $src $out/share/java/mssql-jdbc.jar diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index 881f014f1342..78132614bba9 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -1,15 +1,25 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mssql-jdbc"; version = "7.2.2"; - builder = ./builder.sh; src = fetchurl { - url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/${pname}-${version}.jre8.jar"; + url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; sha256 = "09psxjy1v3khq8lcq6h9mbgyijsgawf0z2qryk1l91ypnwl8s3pg"; }; + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java + cp $src $out/share/java/mssql-jdbc.jar + + runHook postInstall + ''; + meta = { platforms = lib.platforms.unix; }; From 1fc113f0df6e83c9dc3e5110ae7706772f21ba68 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Nov 2021 17:17:12 +0100 Subject: [PATCH 319/359] nginxStable: 1.20.1 -> 1.20.2 --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index bb554c500e27..5db7c65daa40 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - version = "1.20.1"; - sha256 = "0jccnknx57yvbvx6qwwisa8rb5zm1wb54xnz0nm0phym6cay2qp4"; + version = "1.20.2"; + sha256 = "0hjsyjzd35qyw49w210f67g678kvzinw4kg1acb0l6c2fxspd24m"; } From e6feb74002f5ae542e4a09cf04e04a2f24d8dd89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 17:18:30 +0100 Subject: [PATCH 320/359] python3Packages.potentials: init at 0.3.1 --- .../python-modules/potentials/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/potentials/default.nix diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix new file mode 100644 index 000000000000..24db19b3c065 --- /dev/null +++ b/pkgs/development/python-modules/potentials/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ipywidgets +, cdcs +, bibtexparser +, habanero +, pandas +, requests +, numpy +, matplotlib +, unidecode +, datamodeldict +, xmltodict +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + version = "0.3.1"; + pname = "potentials"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "02l1rav5jdfsb00byxbswyhqdnjljp9y7g4ddn4mivzi7x39qa52"; + }; + + propagatedBuildInputs = [ + ipywidgets + cdcs + bibtexparser + habanero + pandas + requests + numpy + matplotlib + unidecode + datamodeldict + xmltodict + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "potentials" + ]; + + meta = with lib; { + description = "Python API database tools for accessing the NIST Interatomic Potentials Repository"; + homepage = "https://github.com/usnistgov/potentials"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 734d1c80281e..7c86a8d4bb9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5918,6 +5918,8 @@ in { pot = callPackage ../development/python-modules/pot { }; + potentials = callPackage ../development/python-modules/potentials { }; + potr = callPackage ../development/python-modules/potr { }; power = callPackage ../development/python-modules/power { }; From 115e6e7299bd52b84fe4dc5315ef5758274b8b61 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 16 Nov 2021 18:27:38 +0200 Subject: [PATCH 321/359] nixos/profiles/minimal: disable command-not-found reduces size by about 1M --- nixos/modules/profiles/minimal.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index f044e6f39ea5..e79b92723841 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -14,4 +14,6 @@ with lib; documentation.enable = mkDefault false; documentation.nixos.enable = mkDefault false; + + programs.command-not-found.enable = mkDefault false; } From e1bfb41f6ced583f73a3242226a739385a47fa8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 16 Nov 2021 17:30:38 +0100 Subject: [PATCH 322/359] corectrl: 1.1.4 -> 1.2.2 --- pkgs/applications/misc/corectrl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index dc692b67730e..d5e2e6adf526 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.1.4"; + version = "1.2.2"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-o8u9WnkK/6VZ+wlJ9I5Ti6ADjV9VXraRGpSWkDQv5JQ="; + sha256 = "1zp523cgvmfjc42wx1f1jh5q3jnsnm833m2xnbbwmfrmhrzh5269"; }; nativeBuildInputs = [ From c408cd921f8681df1eb813a8692ed740dacfe2d4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Nov 2021 17:30:57 +0100 Subject: [PATCH 323/359] nixos/nginx: fix SystemCallFilter after 1fc113f0df6e83c9dc3e5110ae7706772f21ba68 --- nixos/modules/services/web-servers/nginx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index be589e42ddd6..5717b86b3bea 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -896,7 +896,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@cpu-emulation @debug @keyring @ipc @mount @obsolete @privileged @setuid"; + SystemCallFilter = "~@cpu-emulation @debug @keyring @ipc @mount @obsolete @privileged @setuid @mincore"; }; }; From ab054f8fdb3258d5b97edf3c5ca699b5d71714cd Mon Sep 17 00:00:00 2001 From: Dusk Banks Date: Sun, 10 Oct 2021 14:58:22 -0700 Subject: [PATCH 324/359] steamPackages: make customisable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Keep in mind the note in `lib.makeScopeWithSplicing`'s source: # N.B. the other stages of the package set spliced in are *not* # overridden. To globally override `pkgs.steamPackages`, overlay `pkgs` like: final: prev: { steamPackages = steamPackages.overrideScope …; } --- pkgs/games/steam/default.nix | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index ff2c6e13288a..bfe19a88ca98 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,26 +1,37 @@ -{ pkgs, newScope, buildFHSUserEnv }: +{ lib, newScope, splicePackages, steamPackagesAttr ? "steamPackages" +, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget +, stdenv, buildFHSUserEnv, pkgsi686Linux +}: let - callPackage = newScope self; - - self = rec { - steamArch = if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "amd64" - else if pkgs.stdenv.hostPlatform.system == "i686-linux" then "i386" - else throw "Unsupported platform: ${pkgs.stdenv.hostPlatform.system}"; + steamPackagesFun = self: let + inherit (self) callPackage; + in { + steamArch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" + else if stdenv.hostPlatform.system == "i686-linux" then "i386" + else throw "Unsupported platform: ${stdenv.hostPlatform.system}"; steam-runtime = callPackage ./runtime.nix { }; steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; steam = callPackage ./steam.nix { }; steam-fonts = callPackage ./fonts.nix { }; steam-fhsenv = callPackage ./fhsenv.nix { - glxinfo-i686 = pkgs.pkgsi686Linux.glxinfo; + glxinfo-i686 = pkgsi686Linux.glxinfo; steam-runtime-wrapped-i686 = - if steamArch == "amd64" - then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped + if self.steamArch == "amd64" + then pkgsi686Linux.${steamPackagesAttr}.steam-runtime-wrapped else null; inherit buildFHSUserEnv; }; steamcmd = callPackage ./steamcmd.nix { }; }; - -in self + otherSplices = { + selfBuildBuild = pkgsBuildBuild.${steamPackagesAttr}; + selfBuildHost = pkgsBuildHost.${steamPackagesAttr}; + selfBuildTarget = pkgsBuildTarget.${steamPackagesAttr}; + selfHostHost = pkgsHostHost.${steamPackagesAttr}; + selfTargetTarget = pkgsTargetTarget.${steamPackagesAttr}; + }; + keep = self: { }; + extra = spliced0: { }; +in lib.makeScopeWithSplicing splicePackages newScope otherSplices keep extra steamPackagesFun From dbfd26724defe3f8a63431e0fe1bf6955cc2f44f Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 16 Nov 2021 16:49:17 +0000 Subject: [PATCH 325/359] doc: add ocaml end user doc to nixpkgs manual (#145100) doc: add ocaml end user doc to nixpkgs manual Co-authored-by: Sandro Co-authored-by: Dmitry Kalinkin --- doc/languages-frameworks/ocaml.section.md | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 5ffc23173d6d..d266a032268c 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -1,5 +1,31 @@ # OCaml {#sec-language-ocaml} +## User guide {#sec-language-ocaml-user-guide} + +OCaml libraries are available in attribute sets of the form `ocaml-ng.ocamlPackages_X_XX` where X is to be replaced with the desired compiler version. For example, ocamlgraph compiled with OCaml 4.12 can be found in `ocaml-ng.ocamlPackages_4_12.ocamlgraph`. The compiler itself is also located in this set, under the name `ocaml`. + +If you don't care about the exact compiler version, `ocamlPackages` is a top-level alias pointing to a recent version of OCaml. + +OCaml applications are usually available top-level, and not inside `ocamlPackages`. Notable exceptions are build tools that must be built with the same compiler version as the compiler you intend to use like `dune` or `ocaml-lsp`. + +To open a shell able to build a typical OCaml project, put the dependencies in `buildInputs` and add `ocamlPackages.ocaml` and `ocamlPackages.findlib` to `nativeBuildInputs` at least. +For example: +```nix +let + pkgs = import {}; + # choose the ocaml version you want to use + ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_12; +in +pkgs.mkShell { + # build tools + nativeBuildInputs = with ocamlPackages; [ ocaml findlib dune_2 ocaml-lsp ]; + # dependencies + buildInputs = with ocamlPackages; [ ocamlgraph ]; +} +``` + +## Packaging guide {#sec-language-ocaml-packaging} + OCaml libraries should be installed in `$(out)/lib/ocaml/${ocaml.version}/site-lib/`. Such directories are automatically added to the `$OCAMLPATH` environment variable when building another package that depends on them or when opening a `nix-shell`. Given that most of the OCaml ecosystem is now built with dune, nixpkgs includes a convenience build support function called `buildDunePackage` that will build an OCaml package using dune, OCaml and findlib and any additional dependencies provided as `buildInputs` or `propagatedBuildInputs`. From 194628e4040a59fd7afbbab14074e3f4f74be957 Mon Sep 17 00:00:00 2001 From: Clemens Lutz Date: Tue, 16 Nov 2021 14:52:31 +0100 Subject: [PATCH 326/359] zoom-us: 5.8.3.145 -> 5.8.4.210 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d04f2d18f97a..9b3ab777b053 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.8.3.145"; + version = "5.8.4.210"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "1p4agpbcpk95r04m775dr17fmlm18vxq9mb65pyfbhvsd1ypw6kr"; + sha256 = "1qjr35wg1jk6a6c958s0hbgqqczq789iim77s02yqpy5kyjbnn1n"; }; }; From ad1d0fb77219394407f81a075d4ef789538c2328 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 18:01:56 +0100 Subject: [PATCH 327/359] python3Packages.atomman: 1.3.0 -> 1.4.2 --- .../python-modules/atomman/default.nix | 47 +++++++++++++++---- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index b576504588aa..8e03dbe67af7 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -1,39 +1,66 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib +, buildPythonPackage , cython , datamodeldict +, fetchFromGitHub , matplotlib , numericalunits , numpy , pandas +, potentials , pytest +, pythonOlder , scipy , toolz , xmltodict +, python }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.4.2"; pname = "atomman"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "usnistgov"; - repo = "atomman"; + repo = "atomman"; rev = "v${version}"; - sha256 = "09pfykd96wmw00s3kgabghykjn8b4yjml4ybpi7kwy7ygdmzcx51"; + sha256 = "sha256-Kq4mDykYf74ylWw2golxc81CYKGokXro64YUsFctLmk="; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits toolz ]; + propagatedBuildInputs = [ + cython + datamodeldict + matplotlib + numericalunits + numpy + pandas + potentials + scipy + toolz + xmltodict + ]; + + checkInputs = [ + pytest + ]; checkPhase = '' - py.test tests -k 'not test_atomic' + # pytestCheckHook doesn't work + py.test tests -k "not test_rootdir and not test_version \ + and not test_atomic_mass and not imageflags" ''; + pythonImportsCheck = [ + "atomman" + ]; + meta = with lib; { - homepage = "https://github.com/usnistgov/atomman/"; description = "Atomistic Manipulation Toolkit"; + homepage = "https://github.com/usnistgov/atomman/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From d882c5751b5f0a06b60c56a468f76b54aaac04aa Mon Sep 17 00:00:00 2001 From: ilkecan Date: Tue, 16 Nov 2021 20:24:31 +0300 Subject: [PATCH 328/359] flutter: add passthru.dart --- pkgs/development/compilers/flutter/flutter.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index e0ede49b0919..376e0f529874 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -156,7 +156,10 @@ runCommand drvName ''; preferLocalBuild = true; allowSubstitutes = false; - passthru = { unwrapped = flutter; }; + passthru = { + unwrapped = flutter; + inherit dart; + }; meta = with lib; { description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; longDescription = '' From 47a69c646f8e82658177f21d9d2342a4045456a1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 14 Nov 2021 13:30:14 -0800 Subject: [PATCH 329/359] qtile: fix qtile check command --- pkgs/applications/window-managers/qtile/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index e17cbce7e2bb..c831bc6907e7 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: +{ lib, fetchFromGitHub, python3, mypy, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: let enabled-xcffib = cairocffi-xcffib: cairocffi-xcffib.override { @@ -52,6 +52,11 @@ let xkbcommon ]; + # for `qtile check`, needs `stubtest` and `mypy` commands + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ mypy ]}" + ]; + doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. meta = with lib; { From c46f9c42b8f0508bfccd96a75e7ff4ad920d594e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Nov 2021 19:21:32 +0100 Subject: [PATCH 330/359] python39Packages.tensorflow: remove ? null from inputs --- pkgs/development/python-modules/tensorflow/bin.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index aae4406d0d79..6d4df4eb2c8e 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -20,8 +20,8 @@ , tensorflow-estimator_2 , tensorflow-tensorboard_2 , cudaSupport ? false -, cudatoolkit ? null -, cudnn ? null +, cudatoolkit +, cudnn , zlib , python , keras-applications @@ -37,9 +37,6 @@ # - the source build doesn't work on Darwin. # - the source build is currently brittle and not easy to maintain -assert cudaSupport -> cudatoolkit != null - && cudnn != null; - # unsupported combination assert ! (stdenv.isDarwin && cudaSupport); From 19b22191f7de3d172562f2fdcf1e9be21df23fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Tue, 16 Nov 2021 13:24:47 +0100 Subject: [PATCH 331/359] vim-utils: better error message if duplicates Print a more user friendly error message if you try to in install multiple plugins with the same name closes #145980 #146099 --- pkgs/misc/vim-plugins/vim-utils.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index aa97f6b60985..92642016b24a 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -199,6 +199,10 @@ let linkVimlPlugin = plugin: packageName: dir: '' mkdir -p $out/pack/${packageName}/${dir} + if test -e "$out/pack/${packageName}/${dir}/${lib.getName plugin}"; then + printf "\nERROR - Duplicated vim plugin: ${lib.getName plugin}\n\n" + exit 1 + fi ln -sf ${plugin}/${rtpPath} $out/pack/${packageName}/${dir}/${lib.getName plugin} ''; From a7ea834b1782c0931b47a58db65e3cb6b337a2ad Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 16 Nov 2021 20:37:44 +0200 Subject: [PATCH 332/359] nixos/plex: replace literalExample with literalExpression --- nixos/modules/services/misc/plex.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 7c97069aaf75..2ae4e80d5c3f 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -76,7 +76,7 @@ in in Plex's scanners directory will be cleared and this module will symlink all of the paths specified here to that directory. ''; - example = literalExample '' + example = literalExpression '' [ (fetchFromGitHub { owner = "ZeroQI"; From 62d48440a1d4020c615c4462c3c40bde07484f71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 19:48:00 +0100 Subject: [PATCH 333/359] python3Packages.libcloud: 3.4.0 -> 3.4.1 --- .../python-modules/libcloud/default.nix | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index eacc05ffd144..77aa9e2927a5 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -1,40 +1,49 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, mock , pycrypto +, pythonOlder , requests -, pytest-runner -, pytest -, requests-mock -, typing }: buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.4.0"; + version = "3.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "17618ccbe3493f2be015db9e1efa35080ff34d470de723f1384d908ff126e51c"; + sha256 = "sha256-iPGNoM8/rAr3I+dD+3QdnRviUYge2reloNFimVW1ARs="; }; - checkInputs = [ mock pytest pytest-runner requests-mock ]; - propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing ]; + propagatedBuildInputs = [ + pycrypto + requests + ]; - preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; + preConfigure = '' + cp libcloud/test/secrets.py-dist libcloud/test/secrets.py + ''; + + postPatch = '' + substituteInPlace setup.py \ + --replace "setup_requires=pytest_runner," "setup_requires=[]," + ''; # requires a certificates file doCheck = false; - pythonImportsCheck = [ "libcloud" ]; + pythonImportsCheck = [ + "libcloud" + ]; meta = with lib; { description = "A unified interface to many cloud providers"; homepage = "https://libcloud.apache.org/"; changelog = "https://github.com/apache/libcloud/blob/v${version}/CHANGES.rst"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } From 4d5800ed103555675b600b9688c1733df6bf1e51 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 16 Nov 2021 21:07:09 +0100 Subject: [PATCH 334/359] imagemagick: 7.1.0-13 -> 7.1.0-14 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index a07cf38c0eba..257206b4f27e 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-13"; + version = "7.1.0-14"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-W/XqgYOlSailHQdNBYsvf2P9go9sblWayDLrQQlekro="; + sha256 = "sha256-w4h4KEfmDC/dDgtk7xgEnIYvSfPlKfsvdFhx43Tn9GA="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 75b645529450fd4bac3b897dc1fab1701ade3465 Mon Sep 17 00:00:00 2001 From: misuzu Date: Tue, 16 Nov 2021 22:50:30 +0200 Subject: [PATCH 335/359] zerotierone: 1.8.2 -> 1.8.3 (#146293) --- pkgs/tools/networking/zerotierone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index d86eb8c88657..94cd645d177c 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-Itq06zE2AVQ1HSUEQdNUuvEazfU56Hs86T0DEVuF8d4="; + sha256 = "sha256-668KZ2E0jx/s+w4pl+oJbPlfdRGr6ypP2/FoFEBReIk="; }; preConfigure = '' From f5e6bb8c7542ee9cdbd180ab5a566afa24b2848b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 16 Nov 2021 22:05:30 +0100 Subject: [PATCH 336/359] chromiumDev: 97.0.4692.8 -> 97.0.4692.20 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index ca73b620cfbb..313a03d0dd2f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "97.0.4692.8", - "sha256": "0n47jfxs05g55p69f5939jf5pgyw88n4cpg78k019n3zr2vlv1qf", - "sha256bin64": "1gisqc6dz7yfigj0dji7cnx5jdcjz0gmn248cp2a6zs9mfvwwbqv", + "version": "97.0.4692.20", + "sha256": "1njgfz3kz1pyyaaskqc47ldy2gzc3c9a8mjib81nalzrqbmd3372", + "sha256bin64": "06vsmzz8nvmx7hfqwvqfmq4h000dw22srxdrgrdfgh7mry0yvf4a", "deps": { "gn": { "version": "2021-11-03", From 30c56e2e10046e255050d7b4b8c07b3b5f1f368a Mon Sep 17 00:00:00 2001 From: Valentin Robert Date: Tue, 16 Nov 2021 13:43:32 -0800 Subject: [PATCH 337/359] coq-bits: 1.0.0 -> 1.1.0 --- .../coq-modules/coq-bits/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 410280925dcc..1da0a0d17ea9 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -4,10 +4,23 @@ with lib; mkCoqDerivation { pname = "coq-bits"; repo = "bits"; inherit version; - defaultVersion = if versions.isGe "8.7" coq.version then "20190812" else null; + defaultVersion = + if versions.isGe "8.10" coq.version + then "1.1.0" + else if versions.isGe "8.7" coq.version + then "1.0.0" + else null; - release."20190812".rev = "1.0.0"; - release."20190812".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; + release = { + "1.0.0" = { + rev = "1.0.0"; + sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; + }; + "1.1.0" = { + rev = "1.1.0"; + sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; + }; + }; propagatedBuildInputs = [ mathcomp.algebra ]; From f12614d43b93c95e09597620b339f991b91f3b4c Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 10 Nov 2021 12:46:52 -0500 Subject: [PATCH 338/359] cargo-outdated: 0.9.18 -> 0.10.1 --- .../cargo-outdated/default.nix | 27 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 106622706f00..62b91a4e4d1f 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -1,28 +1,37 @@ -{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, libiconv, curl, darwin }: +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, openssl +, stdenv +, curl +, Security +, SystemConfiguration +}: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.18"; + version = "0.10.1"; src = fetchCrate { inherit pname version; - sha256 = "19r4nv28iq4cmzs5j127qgvdf7y3pfmgjp6jzzbb8b5xj7w06jhl"; + sha256 = "sha256-jg8KuIu1SaIRlEI9yvpLCESZfAyNgSThJ6pe7+IM6j0="; }; - cargoSha256 = "1rf3sxprra9s76iip2xf82kclgs83fhnlx9ykl9hhn2y0z8r3342"; + cargoSha256 = "sha256-jfZUtUVHEC8zK+FJHSOQxELWTG/Of2WSDoqdg/Sckws="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - libiconv + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl + Security + SystemConfiguration ]; meta = with lib; { description = "A cargo subcommand for displaying when Rust dependencies are out of date"; homepage = "https://github.com/kbknapp/cargo-outdated"; + changelog = "https://github.com/kbknapp/cargo-outdated/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ sondr3 ivan ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ed21c6a3140..06b7f496ace6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12790,7 +12790,9 @@ with pkgs; cargo-graph = callPackage ../tools/package-management/cargo-graph { }; cargo-license = callPackage ../tools/package-management/cargo-license { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; - cargo-outdated = callPackage ../tools/package-management/cargo-outdated {}; + cargo-outdated = callPackage ../tools/package-management/cargo-outdated { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; cargo-release = callPackage ../tools/package-management/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; From 28289f34ece9ba0cd1524b6f3f84fff4f09e3d35 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 16 Nov 2021 22:11:25 +0000 Subject: [PATCH 339/359] Revert "zfs: unlock for 5.15" This reverts commit 86e057aa5b6b44aa20b65ed194ec359e897bd89d. --- pkgs/os-specific/linux/zfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 818452ba2013..8e2345ec3a4e 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -215,8 +215,8 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; + latestCompatibleLinuxPackages = linuxPackages_5_14; # this package should point to the latest release. version = "2.1.1"; @@ -226,8 +226,8 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; + latestCompatibleLinuxPackages = linuxPackages_5_14; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the From d9673a6e90fec6ae772fef5f5dfad03fc9725561 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Tue, 16 Nov 2021 19:13:42 -0300 Subject: [PATCH 340/359] mongodb-compass: 1.25.0 -> 1.29.4 --- pkgs/tools/misc/mongodb-compass/default.nix | 60 ++++++++++++++++----- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 8baeb1556b14..e11d0899df4e 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,9 +1,40 @@ -{ lib, stdenv, fetchurl, dpkg -, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: +{ +alsa-lib, +at-spi2-atk, +at-spi2-core, +atk, +cairo, +cups, +curl, +dbus, +dpkg, +expat, +fetchurl, +fontconfig, +freetype, +gdk-pixbuf, +glib, +gnome2, +gtk3, +lib, +libdrm, +libnotify, +libsecret, +libuuid, +libxcb, +libxkbcommon, +mesa, +nspr, +nss, +pango, +stdenv, +systemd, +wrapGAppsHook, +xorg, +}: let - version = "1.25.0"; + version = "1.29.4"; rpath = lib.makeLibraryPath [ alsa-lib @@ -17,22 +48,24 @@ let expat fontconfig freetype + gdk-pixbuf glib gnome2.GConf - gdk-pixbuf gtk3 - pango + libdrm libnotify libsecret libuuid libxcb + libxkbcommon + mesa nspr nss + pango stdenv.cc.cc systemd - - xorg.libxkbfile xorg.libX11 + xorg.libXScrnSaver xorg.libXcomposite xorg.libXcursor xorg.libXdamage @@ -42,14 +75,16 @@ let xorg.libXrandr xorg.libXrender xorg.libXtst - xorg.libXScrnSaver - ] + ":${stdenv.cc.cc.lib}/lib64"; + xorg.libxkbfile + xorg.libxshmfence + (lib.getLib stdenv.cc.cc) + ]; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-998/voQ04fLj3KZCy6BueUoI1v++4BoGRTGJT7Nsv40="; + sha256 = "sha256-CqC6BrRhMfjxamSwC6ub1u3+FtDuIq3/OMNdUZgpCAQ="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; @@ -94,8 +129,9 @@ in stdenv.mkDerivation { meta = with lib; { description = "The GUI for MongoDB"; + maintainers = with maintainers; [ bryanasdev000 ]; homepage = "https://www.mongodb.com/products/compass"; - license = licenses.unfree; + license = licenses.sspl; platforms = [ "x86_64-linux" ]; }; } From 922661273c38d8fe34a8b2abf6b8d49b32d7c3ec Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 16 Nov 2021 17:22:29 -0500 Subject: [PATCH 341/359] beret: remove Was broken for 6 years --- pkgs/games/beret/default.nix | 42 --------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/games/beret/default.nix diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix deleted file mode 100644 index 5d1bf0dd47c8..000000000000 --- a/pkgs/games/beret/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer }: - -stdenv.mkDerivation { - pname = "beret"; - version = "1.2.0"; - - buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ]; - - NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; - NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin - "-framework CoreFoundation -framework OpenGL -framework Cocoa"; - - patches = [ ./use-home-dir.patch ]; - - postPatch = '' - sed -i 's@RESOURCE_PATH ""@RESOURCE_PATH "'$out'/share/"@' game.c - ''; - - src = fetchurl { - url = "https://gitorious.org/beret/beret/archive-tarball/ae029777"; - name = "beret-1.2.0.tar.gz"; - sha256 = "1rx9z72id1810fgv8mizk8qxwd1kh5xi07fdhmjc62mh3fn38szc"; - }; - - installPhase = '' - mkdir -p $out/bin - install -v -m755 beret $out/bin - mkdir -p $out/share - cp -av tahoma.ttf images music rooms sfx $out/share - ''; - - meta = with lib; { - description = "A 2D puzzle-platformer game about a scientist with telekinetic abilities"; - homepage = "http://kiwisauce.com/beret/"; - license = licenses.lgpl2; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.all; - broken = true; # source won't download, and no replacement is visible - }; -} - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 99f66c938e32..6fac1340ff04 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -76,6 +76,7 @@ mapAliases ({ bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 bcat = throw "bcat has been removed because upstream is dead"; # added 2021-08-22 beegfs = throw "beegfs has been removed."; # added 2019-11-24 + beret = throw "beret has been removed"; # added 2021-11-16 bluezFull = bluez; # Added 2019-12-03 bpftool = bpftools; # Added 2021-05-03 brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ed21c6a3140..8713dab69625 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29848,8 +29848,6 @@ with pkgs; bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; - beret = callPackage ../games/beret { }; - black-hole-solver = callPackage ../games/black-hole-solver { inherit (perlPackages) PathTiny; }; From b8df591eb67c55e9c80fda3ba705a7d86c341c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Nov 2021 23:29:22 +0100 Subject: [PATCH 342/359] zfs: remove myself as maintainer --- pkgs/os-specific/linux/zfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8e2345ec3a4e..50327bc658f2 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -202,7 +202,7 @@ let changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = licenses.cddl; platforms = platforms.linux; - maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; + maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. From 7c26a808993b8c47dfb638ec6110e073f42ca3d6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 16 Nov 2021 17:24:51 +0100 Subject: [PATCH 343/359] seexpr: 2.11 -> 3.0.1 --- pkgs/development/compilers/seexpr/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index 5dfa08c45727..f4c640710b1e 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -1,22 +1,26 @@ { lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, -bison, flex, libGLU, python2Packages +bison, flex, libGLU, python3Packages }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "seexpr"; - version = "2.11"; + version = "3.0.1"; + src = fetchFromGitHub { owner = "wdas"; repo = "SeExpr"; - rev = "v2.11"; - sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4"; + rev = "v${version}"; + sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk="; }; + cmakeFlags = [ "-DENABLE_SSE4=OFF" ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ libGLU libpng zlib qt4 python2Packages.pyqt4 bison flex ]; + buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ]; + meta = with lib; { description = "Embeddable expression evaluation engine from Disney Animation"; - homepage = "https://www.disneyanimation.com/technology/seexpr.html"; + homepage = "https://wdas.github.io/SeExpr/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; platforms = platforms.linux; From ba5628c2ab923b9f1ecbf1bc44dabd3664fad16a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 16 Nov 2021 23:39:27 +0100 Subject: [PATCH 344/359] seexpr: fmt --- pkgs/development/compilers/seexpr/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index f4c640710b1e..f13ec5174d5a 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, -bison, flex, libGLU, python3Packages +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libpng +, zlib +, qt4 +, bison +, flex +, libGLU +, python3Packages }: stdenv.mkDerivation rec { @@ -7,9 +16,9 @@ stdenv.mkDerivation rec { version = "3.0.1"; src = fetchFromGitHub { - owner = "wdas"; - repo = "SeExpr"; - rev = "v${version}"; + owner = "wdas"; + repo = "SeExpr"; + rev = "v${version}"; sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk="; }; From eeac1c543d398f167f8886883824fc99266aad40 Mon Sep 17 00:00:00 2001 From: n0emis <22817873+n0emis@users.noreply.github.com> Date: Tue, 16 Nov 2021 23:41:17 +0100 Subject: [PATCH 345/359] nixos/networkd: add BatmanAdvanced options (#145963) Since systemd v248 networkd supports BatmanAdvanced. This adds the according config options to the networkd-module --- nixos/modules/system/boot/networkd.nix | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 662dfe2db989..2e17bdf6bb65 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -131,6 +131,7 @@ let "fou" "xfrm" "ifb" + "batadv" ]) (assertByteFormat "MTUBytes") (assertMacAddress "MACAddress") @@ -381,6 +382,29 @@ let (assertInt "Table") (assertMinimum "Table" 0) ]; + + sectionBatmanAdvanced = checkUnitConfig "BatmanAdvanced" [ + (assertOnlyFields [ + "GatewayMode" + "Aggregation" + "BridgeLoopAvoidance" + "DistributedArpTable" + "Fragmentation" + "HopPenalty" + "OriginatorIntervalSec" + "GatewayBandwithDown" + "GatewayBandwithUp" + "RoutingAlgorithm" + ]) + (assertValueOneOf "GatewayMode" ["off" "client" "server"]) + (assertValueOneOf "Aggregation" boolValues) + (assertValueOneOf "BridgeLoopAvoidance" boolValues) + (assertValueOneOf "DistributedArpTable" boolValues) + (assertValueOneOf "Fragmentation" boolValues) + (assertInt "HopPenalty") + (assertRange "HopPenalty" 0 255) + (assertValueOneOf "RoutingAlgorithm" ["batman-v" "batman-iv"]) + ]; }; network = { @@ -473,6 +497,7 @@ let "IgnoreCarrierLoss" "Xfrm" "KeepConfiguration" + "BatmanAdvanced" ]) # Note: For DHCP the values both, none, v4, v6 are deprecated (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6"]) @@ -1056,6 +1081,21 @@ let ''; }; + batmanAdvancedConfig = mkOption { + default = {}; + example = { + GatewayMode = "server"; + RoutingAlgorithm = "batman-v"; + }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionBatmanAdvanced; + description = '' + Each attribute in this set specifies an option in the + [BatmanAdvanced] section of the unit. See + systemd.netdev + 5 for details. + ''; + }; + }; addressOptions = { @@ -1507,6 +1547,10 @@ let [VRF] ${attrsToSection def.vrfConfig} '' + + optionalString (def.batmanAdvancedConfig != { }) '' + [BatmanAdvanced] + ${attrsToSection def.batmanAdvancedConfig} + '' + def.extraConfig; }; From 12371f83b1e2e8b398116d4fa4af9b33f4401ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Nov 2021 19:21:45 +0100 Subject: [PATCH 346/359] python39Packages.tensorflow: simplify pname+version code --- pkgs/development/python-modules/tensorflow/bin.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 6d4df4eb2c8e..c14a90e0953e 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -42,13 +42,10 @@ assert ! (stdenv.isDarwin && cudaSupport); let packages = import ./binary-hashes.nix; - - variant = if cudaSupport then "-gpu" else ""; - pname = "tensorflow${variant}"; metadataPatch = ./relax-dependencies-metadata.patch; patch = ./relax-dependencies.patch; in buildPythonPackage { - inherit pname; + pname = "tensorflow" + lib.optionalString cudaSupport "-gpu"; inherit (packages) version; format = "wheel"; From a63f9e1ca11bb1d795e89d3c41b0c5141f198b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 14 Nov 2021 16:55:01 +0100 Subject: [PATCH 347/359] vscode-extensions.update_installed_exts.sh: add function how to use the output with vscode, make shellcheck work --- .../vscode-extensions/update_installed_exts.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/misc/vscode-extensions/update_installed_exts.sh b/pkgs/misc/vscode-extensions/update_installed_exts.sh index 8e0af182cec5..5af747605f59 100755 --- a/pkgs/misc/vscode-extensions/update_installed_exts.sh +++ b/pkgs/misc/vscode-extensions/update_installed_exts.sh @@ -1,7 +1,23 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p curl jq unzip +# shellcheck shell=bash set -eu -o pipefail +# can be added to your configuration with the following command and snippet: +# $ ./pkgs/misc/vscode-extensions/update_installed_exts.sh > extensions.nix +# +# packages = with pkgs; +# (vscode-with-extensions.override { +# vscodeExtensions = map +# (extension: vscode-utils.buildVscodeMarketplaceExtension { +# mktplcRef = { +# inherit (extension) name publisher version sha256; +# }; +# }) +# (import ./extensions.nix).extensions; +# }) +# ] + # Helper to just fail with a message and non-zero exit code. function fail() { echo "$1" >&2 From ef1a0dab00af56bf99d248143a9518826d943d80 Mon Sep 17 00:00:00 2001 From: flurie Date: Mon, 15 Nov 2021 22:40:00 -0500 Subject: [PATCH 348/359] cardpeek: fix build on darwin --- pkgs/applications/misc/cardpeek/default.nix | 65 ++++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 44 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 1d5baf9f6b34..adabcdac9542 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -1,29 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, - glib, gtk3, pcsclite, lua5_2, curl, readline }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, glib +, gtk3 +, pcsclite +, lua5_2 +, curl +, readline +, PCSC +, xcbuild +}: let version = "0.8.4"; in - stdenv.mkDerivation { - pname = "cardpeek"; - inherit version; +stdenv.mkDerivation { + pname = "cardpeek"; + inherit version; - src = fetchFromGitHub { - owner = "L1L1"; - repo = "cardpeek"; - rev = "cardpeek-${version}"; - sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; - }; + src = fetchFromGitHub { + owner = "L1L1"; + repo = "cardpeek"; + rev = "cardpeek-${version}"; + sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; + }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ glib gtk3 pcsclite lua5_2 curl readline ]; + postPatch = lib.optionalString stdenv.isDarwin '' + # replace xcode check and hard-coded PCSC framework path + substituteInPlace configure.ac \ + --replace 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ + --replace 'PCSC_HEADERS=`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*.sdk/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers/ | sort | head -1`' 'PCSC_HEADERS=${PCSC}/Library/Frameworks/PCSC.framework/Headers' + ''; - enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ glib gtk3 lua5_2 curl readline ] + ++ lib.optional stdenv.isDarwin PCSC + ++ lib.optional stdenv.isLinux pcsclite; - meta = with lib; { - homepage = "https://github.com/L1L1/cardpeek"; - description = "A tool to read the contents of ISO7816 smart cards"; - license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ embr ]; - }; - } + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/L1L1/cardpeek"; + description = "A tool to read the contents of ISO7816 smart cards"; + license = licenses.gpl3Plus; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ embr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e3e2b65bb0b..303fba55be05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2377,7 +2377,7 @@ with pkgs; catclock = callPackage ../applications/misc/catclock { }; - cardpeek = callPackage ../applications/misc/cardpeek { }; + cardpeek = callPackage ../applications/misc/cardpeek { inherit (darwin.apple_sdk.frameworks) PCSC; }; cawbird = callPackage ../applications/networking/cawbird { }; From 2b46936e9c167b420f1aee7edbb24bb596e455d0 Mon Sep 17 00:00:00 2001 From: flurie Date: Tue, 16 Nov 2021 20:42:55 -0500 Subject: [PATCH 349/359] cbftp: fix build on darwin --- pkgs/tools/networking/cbftp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/cbftp/default.nix b/pkgs/tools/networking/cbftp/default.nix index e78b8a93dc67..5709acb02ddb 100644 --- a/pkgs/tools/networking/cbftp/default.nix +++ b/pkgs/tools/networking/cbftp/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { dontConfigure = true; + makeFlags = lib.optional stdenv.isDarwin "OPTFLAGS=-O0"; + installPhase = '' runHook preInstall From 009c51b5aec69dd46e8941156f4fdf8f2dfcbb55 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 16 Nov 2021 21:05:36 -0500 Subject: [PATCH 350/359] menyoki: fix darwin build --- pkgs/applications/graphics/menyoki/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 77d1fd230726..afaa681437cc 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -6,6 +6,7 @@ , stdenv , libX11 , libXrandr +, AppKit , withSki ? true }: @@ -25,7 +26,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux pkg-config; - buildInputs = lib.optionals stdenv.isLinux [ libX11 libXrandr ]; + buildInputs = lib.optionals stdenv.isLinux [ libX11 libXrandr ] + ++ lib.optional stdenv.isDarwin AppKit; buildNoDefaultFeatures = !withSki; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07cd0fc72b16..c9648078f583 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26611,6 +26611,7 @@ with pkgs; menyoki = callPackage ../applications/graphics/menyoki { inherit (xorg) libX11 libXrandr; + inherit (darwin.apple_sdk.frameworks) AppKit; }; mercurial = callPackage ../applications/version-management/mercurial { From 5f757db908b32749c8ca291a728c58e9113228d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 16 Nov 2021 18:10:47 -0800 Subject: [PATCH 351/359] python3Packages.explorerscript: fix build with renamed python-igraph --- .../python-modules/explorerscript/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index fe23b7182346..a77c31e26a63 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonPackage, fetchFromGitHub, antlr4-python3-runtime, pygments, igraph }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, antlr4-python3-runtime +, igraph +, pygments +}: buildPythonPackage rec { pname = "explorerscript"; @@ -11,6 +18,14 @@ buildPythonPackage rec { sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1"; }; + patches = [ + # https://github.com/SkyTemple/ExplorerScript/pull/17 + (fetchpatch { + url = "https://github.com/SkyTemple/ExplorerScript/commit/47d8b3d246881d675a82b4049b87ed7d9a0e1b15.patch"; + sha256 = "0sadw9l2nypl2s8lw526lvbdj4rzqdvrjncx4zxxgyp3x47csb48"; + }) + ]; + propagatedBuildInputs = [ antlr4-python3-runtime igraph ]; checkInputs = [ pygments ]; From 4097dadcd928b65e0f32dd34ea17088c922d052f Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 14 Nov 2021 21:50:02 +0530 Subject: [PATCH 352/359] lscolors: 0.8.0 -> 0.8.1 --- pkgs/applications/misc/lscolors/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index f29fdfda6c18..70804ef1fddb 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,19 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.8.0"; + version = "0.8.1"; src = fetchCrate { inherit version pname; - sha256 = "sha256-dwtrs9NlhJ+km2/146HMnDirWRB5Ur5LTmWdKAK03v0="; + sha256 = "sha256-74KNnERhyiZamVyS9yzDNVf33KMqDiSfPb5BCTKFuHA="; }; - cargoSha256 = "sha256-vQnrLt+VSDPr61VMkYFtjSDnEt+NmWBZUd4qLzPzQBU="; + cargoSha256 = "sha256-mjGZ/q9BByndwfnFGk6k5KD9ctY0X0/oaEugiOJY8Ms="; + + # setid is not allowed in the sandbox + checkFlags = [ "--skip=tests::style_for_setid" ]; meta = with lib; { description = "Rust library and tool to colorize paths using LS_COLORS"; homepage = "https://github.com/sharkdp/lscolors"; - license = with licenses; [ asl20 mit ]; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; } From e8328148cd446452b51971b796649fd88e2499a4 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 17 Nov 2021 13:29:36 +0800 Subject: [PATCH 353/359] linuxKernel.kernels.linux_xanmod: 5.14.16 -> 5.15.2 --- .../os-specific/linux/kernel/linux-xanmod.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index f28f6c0cef55..8b95e912b029 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,9 +1,9 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.14.16"; + version = "5.15.2"; release = "1"; - suffix = "xanmod${release}-cacule"; + suffix = "xanmod${release}-tt"; in buildLinux (args // rec { inherit version; @@ -13,20 +13,33 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-ro7WnN0BPxW/8sajUyGTnvmbemKJEadSBcFmjZ+Wtrs="; + sha256 = "sha256-3tIwj+4xf/I5srEAqECbfH343J5nzCWViq1ZnidZI24="; }; structuredExtraConfig = with lib.kernel; { + # removed options + CFS_BANDWIDTH = lib.mkForce (option no); + RT_GROUP_SCHED = lib.mkForce (option no); + SCHED_AUTOGROUP = lib.mkForce (option no); + + # AMD P-state driver + X86_AMD_PSTATE = yes; + + # Linux RNG framework + LRNG = yes; + + # Paragon's NTFS3 driver + NTFS3_FS = module; + NTFS3_LZX_XPRESS = yes; + NTFS3_FS_POSIX_ACL = yes; + # Preemptive Full Tickless Kernel at 500Hz + SCHED_CORE = lib.mkForce (option no); PREEMPT_VOLUNTARY = lib.mkForce no; PREEMPT = lib.mkForce yes; NO_HZ_FULL = yes; HZ_500 = yes; - # Google's Multigenerational LRU Framework - LRU_GEN = yes; - LRU_GEN_ENABLED = yes; - # Google's BBRv2 TCP congestion Control TCP_CONG_BBR2 = yes; DEFAULT_BBR2 = yes; @@ -46,14 +59,12 @@ buildLinux (args // rec { 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 = { - branch = "5.14-cacule"; + branch = "5.15-tt"; maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; broken = stdenv.isAarch64; From 7eea33031892aa63f4c7b66912d486bfb97c9148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Wed, 17 Nov 2021 07:03:57 +0100 Subject: [PATCH 354/359] gildas: 20200901_a -> 20211101_a (#146224) --- pkgs/applications/science/astronomy/gildas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index b716b0f2f90f..beb3bd92ea5e 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "sep20a"; - version = "20200901_a"; + srcVersion = "nov21a"; + version = "20211101_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "9faa0b3e674b5ffe5b1aee88027d7401a46ae28cd0b306595300547605d6222a"; + sha256 = "0fb6iqwh4hm7v7sib7sx98vxdavn3d6q2gq6y6vxg2z29g31f8g2"; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; From c138eff31574ff1b89ffd5132af7df30c0bfaa4a Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 17 Nov 2021 15:08:03 +0900 Subject: [PATCH 355/359] unicorn: fix darwin build (#146346) --- pkgs/development/libraries/unicorn/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index 57983537ad14..2be3c9508291 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , pkg-config , cmake +, IOKit }: stdenv.mkDerivation rec { @@ -16,6 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; meta = with lib; { description = "Lightweight multi-platform CPU emulator library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07cd0fc72b16..4b949111d210 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10647,7 +10647,9 @@ with pkgs; withRedis = true; }; - unicorn = callPackage ../development/libraries/unicorn { }; + unicorn = callPackage ../development/libraries/unicorn { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; units = callPackage ../tools/misc/units { enableCurrenciesUpdater = true; From bc5a610cb7a08494d1dffd01c07e59833ce27d7b Mon Sep 17 00:00:00 2001 From: Anund Date: Wed, 3 Nov 2021 22:37:39 +1100 Subject: [PATCH 356/359] nixos-rebuild: fix --install-bootloader nixos-rebuild relies on setting an environment variable to change behaviour during nixos-rebuild boot/switch between calling update or install via systemd bootctl. Adding sudo -- as a prefix to various exec calls does not preserve the environment breaking this mechanism. This is a some what ugly fix that works. Closes https://github.com/NixOS/nixpkgs/pull/144429 --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 198a6eae6005..244e1c1d52b1 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -29,7 +29,9 @@ upgrade_all= profile=/nix/var/nix/profiles/system buildHost=localhost targetHost= -maybeSudo=() +remoteSudo= +# comma separated list of vars to preserve when using sudo +preservedSudoVars=NIXOS_INSTALL_BOOTLOADER while [ "$#" -gt 0 ]; do i="$1"; shift 1 @@ -100,7 +102,7 @@ while [ "$#" -gt 0 ]; do shift 1 ;; --use-remote-sudo) - maybeSudo=(sudo --) + remoteSudo=1 ;; --flake) flake="$1" @@ -126,8 +128,8 @@ while [ "$#" -gt 0 ]; do esac done -if [ -n "$SUDO_USER" ]; then - maybeSudo=(sudo --) +if [[ -n "$SUDO_USER" || -n $remoteSudo ]]; then + maybeSudo=(sudo --preserve-env="$preservedSudoVars" --) fi if [ -z "$buildHost" -a -n "$targetHost" ]; then From 6253ab088a212aefd8ead666241b051e48bf2aaa Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 17 Nov 2021 02:43:44 -0500 Subject: [PATCH 357/359] mariadb: revert to using fetchurl Unlike the `fetchzip`, the `fetchurl` allows for tarballs to be backed up to tarballs.nixos.org. --- pkgs/servers/sql/mariadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 0034a831bfe2..c1e97a81c741 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests , libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd @@ -24,9 +24,9 @@ mariadb = server // { common = rec { # attributes common to both builds version = "10.6.5"; - src = fetchzip { + src = fetchurl { url = "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "0rvcllbplgn92kr5n3qxfasnsqc8cn9ijm01fb7i7j2p9zxnfhig"; + sha256 = "sha256-4L4EBCjZpCqLtL0iG1Z/8lIs1vqJBjhic9pPA8XCCo8="; }; nativeBuildInputs = [ cmake pkg-config ] From 86db5fef7bfdfaca6055b1242a7265ab4436b11f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 17 Nov 2021 02:45:55 -0500 Subject: [PATCH 358/359] mariadb: fix darwin build --- pkgs/servers/sql/mariadb/default.nix | 5 ++++- .../mariadb/macos-MDEV-26769-regression-fix.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c1e97a81c741..90fa78351286 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -44,7 +44,10 @@ common = rec { # attributes common to both builds patches = [ ./cmake-includedir.patch - ]; + ] + # Fixes a build issue as documented on + # https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073 + ++ lib.optional (!stdenv.isLinux) ./macos-MDEV-26769-regression-fix.patch; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" diff --git a/pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch b/pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch new file mode 100644 index 000000000000..8c0e6f78e287 --- /dev/null +++ b/pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch @@ -0,0 +1,12 @@ +diff -ru a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h +--- a/storage/innobase/include/buf0types.h 2021-11-17 02:37:32.000000000 -0500 ++++ b/storage/innobase/include/buf0types.h 2021-11-17 02:38:50.000000000 -0500 +@@ -179,7 +179,7 @@ + #include "sux_lock.h" + + #ifdef SUX_LOCK_GENERIC +-class page_hash_latch : private rw_lock ++class page_hash_latch : public rw_lock + { + /** Wait for a shared lock */ + void read_lock_wait(); From 7a5f0ec2d11cd715acb05d4634e8d28c17811c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Wed, 17 Nov 2021 11:01:28 +0100 Subject: [PATCH 359/359] R: fix build on Darwin Closes #146131. --- pkgs/applications/science/math/R/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 0a9a976f18a3..815d108ce412 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -33,11 +33,15 @@ stdenv.mkDerivation rec { ./no-usr-local-search-paths.patch ]; + # Test of the examples for package 'tcltk' fails in Darwin sandbox. See: + # https://github.com/NixOS/nixpkgs/issues/146131 prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure \ --replace "-install_name libRblas.dylib" "-install_name $out/lib/R/lib/libRblas.dylib" \ --replace "-install_name libRlapack.dylib" "-install_name $out/lib/R/lib/libRlapack.dylib" \ --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" + substituteInPlace tests/Examples/Makefile.in \ + --replace "test-Examples: test-Examples-Base" "test-Examples:" # do not test the examples ''; dontDisableStatic = static;