From e7996ab6cef26b3885ee0d337bcbd7de75c2988f Mon Sep 17 00:00:00 2001 From: rebecca skinner Date: Wed, 8 Sep 2021 23:28:22 -0500 Subject: [PATCH 01/42] 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 02/42] 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 ef9b3aea0836de44f26f8ece966d13a006fda1f0 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Fri, 17 Sep 2021 21:12:20 -0400 Subject: [PATCH 03/42] 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 1070be5fe43fdda1b185c55f51457a7710bd7337 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 23:42:44 +0100 Subject: [PATCH 04/42] 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 05/42] 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 06/42] 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 07/42] 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 6599cb61aaa00e4b97c2ffcae0898821995f6460 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Nov 2021 02:22:17 +0100 Subject: [PATCH 08/42] 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 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 09/42] 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 c28ad410499b1a6f3c1d4267103f470c875cdd91 Mon Sep 17 00:00:00 2001 From: dunklecat Date: Fri, 12 Nov 2021 17:53:35 +0100 Subject: [PATCH 10/42] 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 11/42] 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 8f5073b59e731e8fbb2fa363f674669b714e222f Mon Sep 17 00:00:00 2001 From: dunklecat Date: Sat, 13 Nov 2021 08:11:10 +0100 Subject: [PATCH 12/42] 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 17c61e97723ef2b10b60fd497b0e4eebe3b8655c Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 13 Nov 2021 17:04:42 +0200 Subject: [PATCH 13/42] 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 0977a6042f5b4c9dcaec2783d958fb71a184e979 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Nov 2021 12:46:18 +0100 Subject: [PATCH 14/42] 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 2b439432294626fe676f4c0c94ea75ccc95b429c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 14 Nov 2021 20:12:04 +0200 Subject: [PATCH 15/42] 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 eb7e0ba2578eb94622ecffe5b6142edcc9a8bfc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 21:51:32 +0000 Subject: [PATCH 16/42] 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 bf78db4e39853cbcc7391a3258d144d6bae50c9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Nov 2021 23:31:37 +0000 Subject: [PATCH 17/42] 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 a53521b536daa74fe4f52549d65eb8715ff843b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 00:12:18 +0000 Subject: [PATCH 18/42] 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 d73349bff0767392af829eedd85c6de3cbd4b498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 01:34:10 +0000 Subject: [PATCH 19/42] 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 20/42] 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 21/42] 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 94b137c851ba7b26d159d6b6f78c9849014739c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Nov 2021 04:44:03 +0000 Subject: [PATCH 22/42] 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 23/42] 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 6f371f473782d518a2868484ef83572fcdc4d879 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Nov 2021 18:00:32 +0100 Subject: [PATCH 24/42] 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 867e614f97623ed7d75857fc9e4cfde19b206e89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Oct 2021 00:27:22 +0200 Subject: [PATCH 25/42] 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 21f640f93ab5d2bbdf1bd7a3ca5fa65f0f824ae8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 16 Nov 2021 12:30:31 +0300 Subject: [PATCH 26/42] 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 708666dcb6a5339a02c9e9fb5c78ae350b3b54bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Oct 2021 10:19:23 +0200 Subject: [PATCH 27/42] 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 37fa1e7c1d412b26152fc30e087c038685b32756 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Oct 2021 14:31:52 +0200 Subject: [PATCH 28/42] 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 29/42] 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 18:27:38 +0200 Subject: [PATCH 30/42] 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 d882c5751b5f0a06b60c56a468f76b54aaac04aa Mon Sep 17 00:00:00 2001 From: ilkecan Date: Tue, 16 Nov 2021 20:24:31 +0300 Subject: [PATCH 31/42] 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 32/42] 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 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 33/42] 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 34/42] 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 4d5800ed103555675b600b9688c1733df6bf1e51 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 16 Nov 2021 21:07:09 +0100 Subject: [PATCH 35/42] 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 36/42] 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 37/42] 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 f12614d43b93c95e09597620b339f991b91f3b4c Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 10 Nov 2021 12:46:52 -0500 Subject: [PATCH 38/42] 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 39/42] 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 40/42] 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 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 41/42] 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 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 42/42] 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; };