From 43cab046883d2869f57a440047cefd6ab945cb0a Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 21 Oct 2021 16:27:36 +0200 Subject: [PATCH 001/194] gforth: 0.7.3 -> 0.7.9_20211111 This updates to forthy42's version, which the community seems to have transitioned to. --- .../compilers/gforth/boot-forth.nix | 24 ++++++++++ pkgs/development/compilers/gforth/default.nix | 46 ++++++++++++++----- .../compilers/gforth/fix-install-txt.patch | 25 ++++++++++ 3 files changed, 83 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/compilers/gforth/boot-forth.nix create mode 100644 pkgs/development/compilers/gforth/fix-install-txt.patch diff --git a/pkgs/development/compilers/gforth/boot-forth.nix b/pkgs/development/compilers/gforth/boot-forth.nix new file mode 100644 index 000000000000..fc7b5ffa982d --- /dev/null +++ b/pkgs/development/compilers/gforth/boot-forth.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchurl, m4 }: + +let + version = "0.7.3"; +in +stdenv.mkDerivation { + pname = "gforth-boot"; + inherit version; + src = fetchurl { + url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; + sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; + }; + + buildInputs = [ m4 ]; + + configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; + + meta = { + description = "The Forth implementation of the GNU project (outdated version used to bootstrap)"; + homepage = "https://www.gnu.org/software/gforth/"; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index bdf172cb9b99..a36f8f4a2d38 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -1,19 +1,40 @@ -{ lib, stdenv, fetchurl, m4 }: - +{ lib, stdenv, callPackage, autoreconfHook, texinfo, fetchFromGitHub +, swig, libffi +}: let - version = "0.7.3"; -in -stdenv.mkDerivation { - pname = "gforth"; + version = "0.7.9_20211111"; + sha256 = "sha256-KwYPMWdsL9o8SVcNdENMs4C9ioFBEfyVMqe5bgIrfzs="; + ## FIXME build https://github.com/GeraldWodni/swig with gforth, then rebuild + #### This will get rid of the configuration warning + # swigf = swig.overrideDerivation (old: { + # configureFlags = old.configureFlags ++ [ + # "--enable-forth" + # ]; + # }); + bootForth = callPackage ./boot-forth.nix { }; + +in stdenv.mkDerivation { + name = "gforth-${version}"; inherit version; - src = fetchurl { - url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; - sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; + src = fetchFromGitHub { + owner = "forthy42"; + repo = "gforth"; + rev = version; + inherit sha256; }; + patches = [ ./fix-install-txt.patch ]; - buildInputs = [ m4 ]; + nativeBuildInputs = [ + autoreconfHook texinfo bootForth + ]; + buildInputs = [ + swig libffi + ]; - configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; + passthru = { inherit bootForth; }; + + configureFlags = # [ "--enable-lib" ] ++ + lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp @@ -22,8 +43,9 @@ stdenv.mkDerivation { meta = { description = "The Forth implementation of the GNU project"; - homepage = "https://www.gnu.org/software/gforth/"; + homepage = "https://github.com/forthy42/gforth"; license = lib.licenses.gpl3; platforms = lib.platforms.all; }; + } diff --git a/pkgs/development/compilers/gforth/fix-install-txt.patch b/pkgs/development/compilers/gforth/fix-install-txt.patch new file mode 100644 index 000000000000..71f67e6fe65e --- /dev/null +++ b/pkgs/development/compilers/gforth/fix-install-txt.patch @@ -0,0 +1,25 @@ +From c03408921ee8f5592e19cfcb64132a320fbd6279 Mon Sep 17 00:00:00 2001 +From: Herwig Hochleitner +Date: Thu, 9 Sep 2021 18:19:42 +0200 +Subject: [PATCH 1/2] fix install-txt task + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 5fe49787..51ad67c6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -839,7 +839,7 @@ install-gensources: + done + echo "\\ empty site-init" > $(siteforthdir)/siteinit.fs + +-install-txt: doc ++install-txt: txt + $(INSTALL_DATA) doc/gforth.txt $(datadir)/gforth/$(VERSION)/doc/gforth.txt + + install-images: install-txt +-- +2.33.0 + From 65c327d4b601d0d152f80f1452a2cbb037eefa08 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 21 Nov 2021 21:01:53 +0000 Subject: [PATCH 002/194] grub2_xen: pull upstream fix for binutils-2.36 Without the change linkage on binutils-2.36 fails as: ld: section .note.gnu.property VMA [0000000000400158,0000000000400187] overlaps section .bss VMA [000000000000f000,000000000041e1b7] --- pkgs/tools/misc/grub/2.0x.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index d9c4ceeca2c0..60f1d9c43c71 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -65,6 +65,13 @@ stdenv.mkDerivation rec { url = "https://marc.info/?l=grub-devel&m=146193404929072&q=mbox"; sha256 = "00wa1q5adiass6i0x7p98vynj9vsz1w0gn1g4dgz89v35mpyw2bi"; }) + + # Pull upstream patch to fix linkage against binutils-2.36. + (fetchpatch { + name = "binutils-2.36"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b98275138bf4fc250a1c362dfd2c8b1cf2421701"; + sha256 = "001m058bsl2pcb0ii84jfm5ias8zgzabrfy6k2cc9w6w1y51ii82"; + }) ]; postPatch = if kbdcompSupport then '' From 0e00c0b8f3c2f3eea9ef70daa2eaf02aac2fa464 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 26 Nov 2021 02:42:32 +0100 Subject: [PATCH 003/194] gforth: replace name with pname Co-authored-by: Ben Siraphob --- pkgs/development/compilers/gforth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index a36f8f4a2d38..9b59167d3139 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -14,7 +14,7 @@ let bootForth = callPackage ./boot-forth.nix { }; in stdenv.mkDerivation { - name = "gforth-${version}"; + pname = "gforth"; inherit version; src = fetchFromGitHub { owner = "forthy42"; From 1a5c6d8d551c44242d2d31965534dcb2cf5b79cb Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 26 Nov 2021 03:22:47 +0100 Subject: [PATCH 004/194] gforth: remove useless comment Co-authored-by: Dmitry Kalinkin --- pkgs/development/compilers/gforth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index 9b59167d3139..22a7d35ec8f9 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { passthru = { inherit bootForth; }; - configureFlags = # [ "--enable-lib" ] ++ + configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; postInstall = '' From be7f8fae432ab5cd7ad819121eba50ed6aaf86f9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Nov 2021 22:53:10 -0500 Subject: [PATCH 005/194] ms-dotnettools-csharp: Add Darwin support - Add support for x86_64-darwin; and - Include the debugger for aarch64-darwin (running under Rosetta 2). --- .../_maintainers/update-bin-srcs-lib.sh | 8 ++- .../ms-dotnettools-csharp/default.nix | 22 +++++-- .../rt-deps-bin-srcs.json | 58 +++++++++++++++++++ 3 files changed, 82 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh b/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh index f3058755d6a2..e3d1e5fb1397 100755 --- a/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh +++ b/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh @@ -105,11 +105,15 @@ formatExtRuntimeDeps() { jsonStorePath="$(echo "$jsonShaWStorePath" | tail -n1)" 1>&2 echo "jsonStorePath='$jsonStorePath'" + # Assume packages without an architectures are for x86_64 and remap arm64 to aarch64. declare jqQuery jqQuery=$(cat <<'EOF' .runtimeDependencies -| map(select(.platforms[] | in({"linux": null}))) -| map(select(.architectures[] | in({"x86_64": null}))) +| map(select(.platforms[] | in({"linux": null, "darwin": null}))) +| map(select(.architectures == null).architectures |= ["x86_64"]) +| map(del(.architectures[] | select(. | in({"x86_64": null, "arm64": null}) | not))) +| map((.architectures[] | select(. == "arm64")) |= "aarch64") +| map(select(.architectures != [])) | .[] | { (.id + "__" + (.architectures[0]) + "-" + (.platforms[0])): {installPath, binaries, urls: [.url, .fallbackUrl] | map(select(. != null))} diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix index 393ea0f44502..ea5388ed4702 100644 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -38,7 +38,13 @@ let rtDepsBinSrcs."${bSrcName}__${stdenv.targetPlatform.system}"; omnisharp = rtDepBinSrcByName "OmniSharp"; - vsdbg = rtDepBinSrcByName "Debugger"; + vsdbgs = [ + (rtDepBinSrcByName "Debugger") + ] ++ lib.optionals (stdenv.isDarwin) [ + # Include the aarch64-darwin debugger binaries on x86_64-darwin. Even though OmniSharp will be + # running under Rosetta 2, debugging will fail to start if both sets of binaries are not present. + (rtDepsBinSrcs."Debugger__aarch64-darwin") + ]; razor = rtDepBinSrcByName "Razor"; in @@ -112,20 +118,28 @@ vscode-utils.buildVscodeMarketplaceExtension { chmod a+x "$omnisharp_dir/run" touch "$omnisharp_dir/install.Lock" + '' + builtins.concatStringsSep "\n" (map (vsdbg: '' declare vsdbg_dir="$PWD/${vsdbg.installPath}" unzip_to "${vsdbg.bin-src}" "$vsdbg_dir" chmod a+x "$vsdbg_dir/vsdbg-ui" chmod a+x "$vsdbg_dir/vsdbg" touch "$vsdbg_dir/install.complete" touch "$vsdbg_dir/install.Lock" - patchelf_common "$vsdbg_dir/vsdbg" - patchelf_common "$vsdbg_dir/vsdbg-ui" + '') vsdbgs) + '' declare razor_dir="$PWD/${razor.installPath}" unzip_to "${razor.bin-src}" "$razor_dir" chmod a+x "$razor_dir/rzls" touch "$razor_dir/install.Lock" + + '' + lib.optionalString stdenv.isLinux '' + patchelf_common "$vsdbg_dir/vsdbg" + patchelf_common "$vsdbg_dir/vsdbg-ui" patchelf_common "$razor_dir/rzls" + + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $omnisharp_dir/etc/config \ + --replace "libmono-native-compat.dylib" "libmono-native.dylib" ''; meta = with lib; { @@ -133,6 +147,6 @@ vscode-utils.buildVscodeMarketplaceExtension { homepage = "https://github.com/OmniSharp/omnisharp-vscode"; license = licenses.mit; maintainers = [ maintainers.jraygauthier ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json index 8f90fda228c8..bf8a6c3433e4 100644 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json @@ -1,4 +1,16 @@ { + "OmniSharp__x86_64-darwin": { + "installPath": ".omnisharp/1.37.15", + "binaries": [ + "./mono.osx", + "./run" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/bc6ac844afef87eedaab5191f11dc374/omnisharp-osx-1.37.15.zip", + "https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-osx-1.37.15.zip" + ], + "sha256": "03n3x70ml2xjm7ns58giv5kn2h4y689iyjzz4mw5vcnil5fwq8ng" + }, "OmniSharp__x86_64-linux": { "installPath": ".omnisharp/1.37.15", "binaries": [ @@ -11,6 +23,42 @@ ], "sha256": "0pchywkxy8niq0i6gq2r43cmf58blfhhj8w8zyibf0m9h09h165s" }, + "Debugger__x86_64-darwin": { + "installPath": ".debugger/x86_64", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/c1122f7141735472d9583c1124024c55/coreclr-debug-osx-x64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-x64.zip" + ], + "sha256": "08z3k0h25gdsbmlxwayd94672hp2z7zmwdmd0nyr9j82izj3ci2m" + }, + "Debugger__aarch64-darwin": { + "installPath": ".debugger/arm64", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/96a88189c7904a517f3bb59b2dba8bd1/coreclr-debug-osx-arm64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-arm64.zip" + ], + "sha256": "113kz02ihvb4y5fj01wamqz2jsql2q7n7f55s9kzs9dsrmq5ffa0" + }, + "Debugger__aarch64-linux": { + "installPath": ".debugger", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/7a723bfbda6d196c52084226b6835b36/coreclr-debug-linux-arm64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-arm64.zip" + ], + "sha256": "1d4a5q3f7qfk3jq2i4f6g50i9i4z8z7g8ss083y9n5c1yj3629kw" + }, "Debugger__x86_64-linux": { "installPath": ".debugger", "binaries": [ @@ -32,5 +80,15 @@ "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/b846e9c7d7afdba54a72fae1dcb6c42c/razorlanguageserver-linux-x64-6.0.0-preview.5.21358.6.zip" ], "sha256": "0gb36nlb7fgcv03a0awna1qyrsky6ys5gkpsmvxc5j35f1yq337b" + }, + "Razor__x86_64-darwin": { + "installPath": ".razor", + "binaries": [ + "./rzls" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/ad846449769eb2ae810d0236823a6aaa/razorlanguageserver-osx-x64-6.0.0-preview.5.21358.6.zip" + ], + "sha256": "0iqinpwwlqwajdq4i1qbb9hfpfmgy17av95bpw02ad2f9fnyh572" } } From 6b5cebe20fa716f10e8deae119520b630300e433 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 29 Nov 2021 16:58:36 -0500 Subject: [PATCH 006/194] ms-dotnettools.csharp: 1.23.15 -> 1.23.16 --- .../ms-dotnettools-csharp/default.nix | 4 ++-- .../ms-dotnettools-csharp/rt-deps-bin-srcs.json | 16 ++++++++-------- .../ms-dotnettools-csharp/update-bin-srcs | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix index ea5388ed4702..d91cbccb8083 100644 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -52,8 +52,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "1.23.15"; - sha256 = "0b74jr45zl7lzirjgj8s2lbf3viy9pbwlgjh055rcwmy77wcml1x"; + version = "1.23.16"; + sha256 = "sha256-fM4vcSMi2tEjIox9Twh2sRiFhXgAeRwAM9to3vtcSqI="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json index bf8a6c3433e4..13678d1097e0 100644 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json @@ -1,27 +1,27 @@ { "OmniSharp__x86_64-darwin": { - "installPath": ".omnisharp/1.37.15", + "installPath": ".omnisharp/1.37.16", "binaries": [ "./mono.osx", "./run" ], "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/bc6ac844afef87eedaab5191f11dc374/omnisharp-osx-1.37.15.zip", - "https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-osx-1.37.15.zip" + "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/0ea1ea1eae48552a1992ed6df782353a/omnisharp-osx-1.37.16.zip", + "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-osx-1.37.16.zip" ], - "sha256": "03n3x70ml2xjm7ns58giv5kn2h4y689iyjzz4mw5vcnil5fwq8ng" + "sha256": "0hhgfx7zs1rljhn3n9c7lci7j15yp2448z3f1d3c47a95l1hmlip" }, "OmniSharp__x86_64-linux": { - "installPath": ".omnisharp/1.37.15", + "installPath": ".omnisharp/1.37.16", "binaries": [ "./mono.linux-x86_64", "./run" ], "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/b96375395e639233d546a4937be3bd32/omnisharp-linux-x64-1.37.15.zip", - "https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-linux-x64-1.37.15.zip" + "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/9ae3ed99fc0c41c7139751dde6f2bc78/omnisharp-linux-x64-1.37.16.zip", + "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-linux-x64-1.37.16.zip" ], - "sha256": "0pchywkxy8niq0i6gq2r43cmf58blfhhj8w8zyibf0m9h09h165s" + "sha256": "0a2basc6dw42fnjv9zz93ff0bsw2i3446gvcjx5mn5d8dasi483i" }, "Debugger__x86_64-darwin": { "installPath": ".debugger/x86_64", diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs index 83230915d0b1..8c43231b1a7f 100755 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs @@ -10,7 +10,7 @@ scriptDir=$(cd "$(dirname "$0")"; pwd) declare extPublisher="ms-dotnettools" declare extName="csharp" -declare defaultExtVersion="1.23.15" +declare defaultExtVersion="1.23.16" declare extVersion="${1:-$defaultExtVersion}" formatExtRuntimeDeps \ From d046fcf4b1da09e04a1b9a04c1d9ac9e42fffc94 Mon Sep 17 00:00:00 2001 From: Zenithal Date: Sun, 16 Jan 2022 07:22:33 +0800 Subject: [PATCH 007/194] command-not-found: make NIX_AUTO_RUN work when multiple choices --- .../command-not-found/command-not-found.pl | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl index 220d057b7f4f..5f4b30d90190 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.pl +++ b/nixos/modules/programs/command-not-found/command-not-found.pl @@ -21,9 +21,11 @@ my $res = $dbh->selectall_arrayref( "select package from Programs where system = ? and name = ?", { Slice => {} }, $system, $program); -if (!defined $res || scalar @$res == 0) { +my $len = !defined $res ? 0 : scalar @$res; + +if ($len == 0) { print STDERR "$program: command not found\n"; -} elsif (scalar @$res == 1) { +} elsif ($len == 1) { my $package = @$res[0]->{package}; if ($ENV{"NIX_AUTO_RUN"} // "") { exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV)); @@ -35,11 +37,30 @@ ephemeral shell by typing: EOF } } else { - print STDERR <{package}\n"; + } + my $choice = 0; + while (1) { # exec will break this loop + no warnings "numeric"; + print STDERR "Your choice [1-${len}]: "; + # 0 can be invalid user input like non-number string + # so we start from 1 + $choice = + 0; + if (1 <= $choice && $choice <= $len) { + exec("nix-shell", "-p", @$res[$choice - 1]->{package}, + "--run", shell_quote("exec", @ARGV)); + } + } + } else { + print STDERR <{package}\n" foreach @$res; + print STDERR " nix-shell -p $_->{package}\n" foreach @$res; + } } exit 127; From 0358703df27cdc2526b7c17701a1da79e4e4ad5b Mon Sep 17 00:00:00 2001 From: Zenithal Date: Sun, 16 Jan 2022 07:53:54 +0800 Subject: [PATCH 008/194] command-not-found: add interactive option for auto run --- .../programs/command-not-found/command-not-found.pl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl index 220d057b7f4f..af2c606230f4 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.pl +++ b/nixos/modules/programs/command-not-found/command-not-found.pl @@ -26,6 +26,17 @@ if (!defined $res || scalar @$res == 0) { } elsif (scalar @$res == 1) { my $package = @$res[0]->{package}; if ($ENV{"NIX_AUTO_RUN"} // "") { + if ($ENV{"NIX_AUTO_RUN_INTERACTIVE"} // "") { + while (1) { + print STDERR "'$program' from package '$package' will be run, confirm? [yn]: "; + chomp(my $comfirm = ); + if (lc $comfirm eq "n") { + exit 0; + } elsif (lc $comfirm eq "y") { + last; + } + } + } exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV)); } else { print STDERR < Date: Mon, 17 Jan 2022 10:36:48 -0700 Subject: [PATCH 009/194] matrix-synapse-shared-secret-auth: 1.0.2 -> 2.0.1 --- pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix b/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix index 5c0dc1e2ce2b..e667d3417af3 100644 --- a/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix +++ b/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix @@ -1,18 +1,19 @@ -{ buildPythonPackage, fetchFromGitHub, twisted }: +{ buildPythonPackage, fetchFromGitHub, matrix-synapse, twisted }: buildPythonPackage rec { pname = "matrix-synapse-shared-secret-auth"; - version = "1.0.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "devture"; repo = "matrix-synapse-shared-secret-auth"; rev = version; - sha256 = "0cnxp3bp8mmk01a0g3lzgvaawyywjg754j4nb9iwkmm3c2nqvnpz"; + sha256 = "sha256-kaok5IwKx97FYDrVIGAtUJfExqDln5vxEKrZda2RdzE="; }; doCheck = false; pythonImportsCheck = [ "shared_secret_authenticator" ]; + buildInputs = [ matrix-synapse ]; propagatedBuildInputs = [ twisted ]; } From 4091631b52aa2a8732f2a3b0e399405320ef744b Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 18 Jan 2022 07:48:45 -0700 Subject: [PATCH 010/194] matrix-synapse-shared-secret-auth: add sumnerevans as maintainer --- .../matrix-synapse/plugins/shared-secret-auth.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix b/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix index e667d3417af3..3df7f1e5a5d4 100644 --- a/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix +++ b/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, matrix-synapse, twisted }: +{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, twisted }: buildPythonPackage rec { pname = "matrix-synapse-shared-secret-auth"; @@ -16,4 +16,11 @@ buildPythonPackage rec { buildInputs = [ matrix-synapse ]; propagatedBuildInputs = [ twisted ]; + + meta = with lib; { + description = "Shared Secret Authenticator password provider module for Matrix Synapse"; + homepage = "https://github.com/devture/matrix-synapse-shared-secret-auth"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ sumnerevans ]; + }; } From fcc9991376b91f148f7ca1e94be46c19a33c80f5 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Wed, 19 Jan 2022 14:17:16 +0000 Subject: [PATCH 011/194] pijuice: fix for python 3.9 Bump the version that we are building against pijuce which includes a fix for python3.9. --- pkgs/development/python-modules/pijuice/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pijuice/default.nix b/pkgs/development/python-modules/pijuice/default.nix index f46ddfca1be2..3ed2f903b13e 100644 --- a/pkgs/development/python-modules/pijuice/default.nix +++ b/pkgs/development/python-modules/pijuice/default.nix @@ -14,10 +14,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PiSupply"; repo = "PiJuice"; - # rev hash retrieved from the latest modification on file Software/Source/VERSION, as this project - # does not use Github tags facility - rev = "3ba6719ab614a3dc7495d5d9c900dd4ea977c7e3"; - sha256 = "GoNN07YgVaktpeY5iYDbfpy5fxkU1x0V3Sb1hgGAQt4="; + # Latest commit that fixes using the library against python 3.9 by renaming + # isAlive() to is_alive(). The former function was removed in python 3.9. + rev = "e2dca1f8dcfa12e009952a882c0674a545d193d6"; + sha256 = "07Jr7RSjqI8j0tT0MNAjrN1sjF1+mI+V0vtKInvtxj8="; }; patches = [ From b52c3e742eb31f2c915fdcc9ef75d366cc37ee0f Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Wed, 19 Jan 2022 15:22:53 +0100 Subject: [PATCH 012/194] besu: init at 21.10.8 --- .../applications/blockchains/besu/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/blockchains/besu/default.nix diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix new file mode 100644 index 000000000000..550d65051e3e --- /dev/null +++ b/pkgs/applications/blockchains/besu/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "besu"; + version = "21.10.8"; + + src = fetchurl { + url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; + sha256 = "sha256-0yXi42vDinB6nuv5IGj1AhYGqMa2Rku0tNWQCO+AFPw="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -r bin $out/ + mkdir -p $out/lib + cp -r lib $out/ + wrapProgram $out/bin/${pname} --set JAVA_HOME "${jre}" + ''; + + meta = with lib; { + description = "An enterprise-grade Java-based, Apache 2.0 licensed Ethereum client"; + homepage = "https://www.hyperledger.org/projects/besu"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 884890c46ac9..22e8e47bfefd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29788,6 +29788,8 @@ with pkgs; clightning = callPackage ../applications/blockchains/clightning { }; + besu = callPackage ../applications/blockchains/besu { }; + bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { boost = boost165; withGui = true; From 46ad1dbb4fe3f7413850aba5efd975c4badf290a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Dec 2021 18:13:28 +0000 Subject: [PATCH 013/194] libnats-c: 2.1.0 -> 3.2.0 --- pkgs/development/libraries/libnats-c/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 3d1e2b7ac4a3..7913515df66c 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "2.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; - rev = "refs/tags/v${version}"; - sha256 = "16a0f0gvrmyrqvmh6vinqny3qhm6wyzw5ijnn3r82b1gqlpws0fz"; + rev = "v${version}"; + sha256 = "1ngji3sa44y27lnq4x5dzbd117s9psx4w0j50b4c2b72cf2z139q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31946e922093..967c00af8b2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17870,9 +17870,7 @@ with pkgs; libinklevel = callPackage ../development/libraries/libinklevel { }; - libnats-c = callPackage ../development/libraries/libnats-c { - openssl = openssl_1_0_2; - }; + libnats-c = callPackage ../development/libraries/libnats-c { }; liburing = callPackage ../development/libraries/liburing { }; From 8d9215d3dce6bd16eac3668bfb64e4646f62efb4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 31 Jan 2022 18:32:31 +0200 Subject: [PATCH 014/194] pdfsam-basic: 4.2.10 -> 4.2.12 --- pkgs/applications/misc/pdfsam-basic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 782fc30f4d69..298b4bf2c0ae 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.10"; + version = "4.2.12"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-YxUozMrsR65A7+xeerMaYxkGALobG1wLguWGZnoQYcU="; + sha256 = "sha256-B9V3dw5A52yPoNfROI3+wAql+Y0hY4T3sTm9uN70TQQ="; }; unpackPhase = '' From aca79695b924a4d9c273c019342d1dbe1470f08c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 31 Jan 2022 14:22:17 +0100 Subject: [PATCH 015/194] mat2: fix nautilus-extension --- pkgs/development/python-modules/mat2/default.nix | 7 ++++++- .../python-modules/mat2/fix_poppler.patch | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/mat2/fix_poppler.patch diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 31bf90f7f0ae..80719e1076b5 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -47,6 +47,11 @@ buildPythonPackage rec { ./executable-name.patch # hardcode path to mat2 executable ./tests.patch + # fix gobject-introspection typelib path for Nautilus extension + (substituteAll { + src = ./fix_poppler.patch; + poppler_path = "${poppler_gi}/lib/girepository-1.0"; + }) ]; postPatch = '' @@ -76,7 +81,7 @@ buildPythonPackage rec { install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps" install -Dm 444 doc/mat2.1 -t "$out/share/man/man1" install -Dm 444 nautilus/mat2.py -t "$out/share/nautilus-python/extensions" - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $pythonPath $propagatedBuildInputs" patchPythonScript "$out/share/nautilus-python/extensions/mat2.py" '' + lib.optionalString dolphinIntegration '' install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus" diff --git a/pkgs/development/python-modules/mat2/fix_poppler.patch b/pkgs/development/python-modules/mat2/fix_poppler.patch new file mode 100644 index 000000000000..02bdbb6345dc --- /dev/null +++ b/pkgs/development/python-modules/mat2/fix_poppler.patch @@ -0,0 +1,14 @@ +diff --git a/nautilus/mat2.py b/nautilus/mat2.py +index 11e6986..5a0e68f 100644 +--- a/nautilus/mat2.py ++++ b/nautilus/mat2.py +@@ -22,6 +22,9 @@ import gi + gi.require_version('Nautilus', '3.0') + gi.require_version('Gtk', '3.0') + gi.require_version('GdkPixbuf', '2.0') ++gi.require_version('GIRepository', '2.0') ++from gi.repository import GIRepository ++GIRepository.Repository.prepend_search_path('@poppler_path@') + from gi.repository import Nautilus, GObject, Gtk, Gio, GLib, GdkPixbuf + + from libmat2 import parser_factory From 4eb1a437e93c77395405e90a1d915e1844344a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 1 Feb 2022 13:01:18 +0100 Subject: [PATCH 016/194] odoo: 15.0.20211029 -> 15.0.20220126 --- pkgs/applications/finance/odoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index c2f201774fea..d77c3cc2a77e 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { major = "15"; minor = "0"; - patch = "20211029"; + patch = "20220126"; version = "${major}.${minor}.${patch}"; @@ -22,7 +22,7 @@ buildPythonApplication rec { src = fetchurl { url = "https://nightly.odoo.com/${major}.${minor}/nightly/src/odoo_${version}.tar.gz"; name = "${pname}-${version}"; - sha256 = "sha256-/E+bLBbiz7fRyTwP+0AMpqbuRkOpE4B4P6kREIB4m1Q="; + hash = "sha256-mofV0mNCdyzJecp0XegZBR/5NzHjis9kbpsUA/KJbZg="; }; nativeBuildInputs = [ From 7a7876a90bda89399bde38694e055c15201842be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 1 Feb 2022 13:24:47 +0100 Subject: [PATCH 017/194] werkzeug/1: init at 1.0.1 --- .../development/python-modules/werkzeug/1.nix | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/werkzeug/1.nix diff --git a/pkgs/development/python-modules/werkzeug/1.nix b/pkgs/development/python-modules/werkzeug/1.nix new file mode 100644 index 000000000000..ae7ce1f2b90a --- /dev/null +++ b/pkgs/development/python-modules/werkzeug/1.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi +, itsdangerous, hypothesis +, pytestCheckHook, requests +, pytest-timeout +, isPy3k + }: + +buildPythonPackage rec { + pname = "Werkzeug"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + }; + + propagatedBuildInputs = [ itsdangerous ]; + checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; + + postPatch = '' + # ResourceWarning causes tests to fail + rm tests/test_routing.py + ''; + + disabledTests = [ + "test_save_to_pathlib_dst" + "test_cookie_maxsize" + "test_cookie_samesite_attribute" + "test_cookie_samesite_invalid" + "test_range_parsing" + "test_content_range_parsing" + "test_http_date_lt_1000" + "test_best_match_works" + "test_date_to_unix" + "test_easteregg" + + # Seems to be a problematic test-case: + # + # > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg)) + # E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]> + # E + # E Traceback (most recent call last): + # E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers + # E return Headers(result) + # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True> + "test_basic_routing" + "test_merge_slashes_match" + "test_merge_slashes_build" + "TestMultiPart" + "TestHTTPUtility" + ] ++ lib.optionals stdenv.isDarwin [ + "test_get_machine_id" + ]; + + meta = with lib; { + homepage = "https://palletsprojects.com/p/werkzeug/"; + description = "A WSGI utility library for Python"; + license = licenses.bsd3; + maintainers = [ ]; + }; +} + From e062e44e6567ae4418501ac3a80387561e666a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 1 Feb 2022 13:25:06 +0100 Subject: [PATCH 018/194] odoo: fix package: use werkzeug v1 --- pkgs/applications/finance/odoo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index d77c3cc2a77e..66b1bb0f97fe 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -5,10 +5,15 @@ , python3Packages , nodePackages , wkhtmltopdf +, callPackage }: with python3Packages; +let + werkzeug = python3Packages.callPackage ../../../development/python-modules/werkzeug/1.nix {}; +in + buildPythonApplication rec { pname = "odoo"; From 56076698c2d08be341a9e517aa0c92242f64d7d6 Mon Sep 17 00:00:00 2001 From: Joel Date: Wed, 2 Feb 2022 11:34:43 +1000 Subject: [PATCH 019/194] minecraft-servers: fix update.py Previously, running `nix-shell maintainers/scripts/update.nix --argstr package minecraft-server` caused `versions.json` to be placed in the repository root instead of `pkgs/games/minecraft-servers`. --- pkgs/games/minecraft-servers/update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/minecraft-servers/update.py b/pkgs/games/minecraft-servers/update.py index 4fe84ee21a59..0e7f10a8c932 100755 --- a/pkgs/games/minecraft-servers/update.py +++ b/pkgs/games/minecraft-servers/update.py @@ -4,6 +4,7 @@ import json from dataclasses import dataclass, field from datetime import datetime +from pathlib import Path from typing import Any, Dict, List, Optional import requests @@ -150,6 +151,6 @@ def generate() -> Dict[str, Dict[str, str]]: if __name__ == "__main__": - with open("versions.json", "w") as file: + with open(Path(__file__).parent / "versions.json", "w") as file: json.dump(generate(), file, indent=2) file.write("\n") From 3dc6fab5c9362db2cf079ffa15f2b62b05001747 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 2 Feb 2022 13:45:39 +0300 Subject: [PATCH 020/194] nixos/stage-1: add nixos modprobe options --- nixos/modules/system/boot/stage-1.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 9c684fbada2c..1575c0257d1c 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -350,6 +350,9 @@ let ''; symlink = "/etc/modprobe.d/ubuntu.conf"; } + { object = config.environment.etc."modprobe.d/nixos.conf".source; + symlink = "/etc/modprobe.d/nixos.conf"; + } { object = pkgs.kmod-debian-aliases; symlink = "/etc/modprobe.d/debian.conf"; } From 7446e158d8b9f13d4770b71b066dc0383456f8f9 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Wed, 2 Feb 2022 02:40:41 +0100 Subject: [PATCH 021/194] 7kaa: init at 2.15.4p1 --- pkgs/games/7kaa/default.nix | 79 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/games/7kaa/default.nix diff --git a/pkgs/games/7kaa/default.nix b/pkgs/games/7kaa/default.nix new file mode 100644 index 000000000000..2b74306cd253 --- /dev/null +++ b/pkgs/games/7kaa/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, gccStdenv +, autoreconfHook +, pkg-config +, fetchurl +, fetchFromGitHub +, openal +, libtool +, enet +, SDL2 +, curl +, gettext +, libiconv +}: + +let + + name = "7kaa"; + versionMajor = "2.15"; + versionMinor = "4p1"; + + music = stdenv.mkDerivation rec { + pname = "${name}-music"; + version = "${versionMajor}"; + + src = fetchurl { + url = "https://www.7kfans.com/downloads/${name}-music-${versionMajor}.tar.bz2"; + sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM="; + }; + + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; + + meta.license = lib.licenses.unfree; + + }; + +in + +gccStdenv.mkDerivation rec { + pname = "${name}"; + version = "v${versionMajor}.${versionMinor}"; + + src = fetchFromGitHub { + owner = "the3dfxdude"; + repo = pname; + rev = "9db2a43e1baee25a44b7aa7e9cedde9a107ed34b"; + sha256 = "sha256-OAKaRuPP0/n8pO3wIUvGKs6n+U+EmZXUTywXYDAan1o="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ openal enet SDL2 curl gettext libiconv ]; + + preAutoreconf = '' + autoupdate + ''; + + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + + postInstall = '' + mkdir $out/share/7kaa/MUSIC + cp -R ${music}/MUSIC $out/share/7kaa/ + cp ${music}/COPYING-Music.txt $out/share/7kaa/MUSIC + cp ${music}/COPYING-Music.txt $out/share/doc/7kaa + ''; + + # Multiplayer is auto-disabled for non-x86 system + + meta = with lib; { + homepage = "https://www.7kfans.com"; + description = "GPL release of the Seven Kingdoms with multiplayer (available only on x86 platforms)"; + license = licenses.gpl2Only; + platforms = platforms.x86_64 ++ platforms.aarch64; + maintainers = with maintainers; [ _1000101 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa59ea17a58f..9a8edeafb080 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31766,6 +31766,8 @@ with pkgs; _0verkill = callPackage ../games/0verkill { }; + _7kaa = callPackage ../games/7kaa { }; + hhexen = callPackage ../games/hhexen { }; wyvern = callPackage ../games/wyvern { }; From 2b3f77b716f8cec333ff72e8a70cf1851a023f4e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 2 Feb 2022 22:58:27 +0300 Subject: [PATCH 022/194] nixos/udev: set firmware path in a separate modprobe.d file This way we don't bloat ramdisk with the whole Linux firmware packages. --- nixos/modules/services/hardware/udev.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index d48b5444677c..61448af2d33b 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -317,7 +317,8 @@ in (isYes "NET") ]; - boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}/lib/firmware"; + # We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat. + environment.etc."modprobe.d/firmware.conf".text = "options firmware_class path=${config.hardware.firmware}/lib/firmware"; system.activationScripts.udevd = '' From 20bb580cce5aab03f5f374873e72413b7ffbb248 Mon Sep 17 00:00:00 2001 From: Kyle Ondy Date: Fri, 4 Feb 2022 21:31:47 -0500 Subject: [PATCH 023/194] tmuxPlugins.tmux-fzf: unstable-2020-12-07 -> unstable-2021-10-20 Fixes #158162. --- pkgs/misc/tmux-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index b04a54874571..94f646f83b1e 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -523,12 +523,12 @@ in rec { tmux-fzf = mkTmuxPlugin { pluginName = "tmux-fzf"; rtpFilePath = "main.tmux"; - version = "unstable-2020-12-07"; + version = "unstable-2021-10-20"; src = fetchFromGitHub { owner = "sainnhe"; repo = "tmux-fzf"; - rev = "5efeb91086040a3becf5372fb38258acd0579954"; - sha256 = "1z0zmsf8asxs9wbwvkiyd81h93wb2ikl8nxxc26sdpi6l333q5s9"; + rev = "1801dd525b39154745ea668fb6916035023949e3"; + sha256 = "e929Jqletmobp3WAR1tPU3pJuYTYVynxc5CvB80gig8="; }; postInstall = '' find $target -type f -print0 | xargs -0 sed -i -e 's|fzf |${pkgs.fzf}/bin/fzf |g' From 1da4e07ea68c1782f11889f507d3e923d6b9ad85 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 14:00:33 -0800 Subject: [PATCH 024/194] linuxPackage.nvidia_x11: suffix x86_64 vulkan icd This matches mesa behavior --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index d108ca0d0060..24ab34c4ea9d 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -89,10 +89,11 @@ installPhase() { sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed fi + # nvidia currently only supports x86_64 and i686 if [ "$system" = "i686-linux" ]; then install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.i686.json else - install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.json + install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.x86_64.json fi fi From 82b2a833d85d951e207e1c572725b7fc327c7845 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 14:01:11 -0800 Subject: [PATCH 025/194] linuxPackages.nvidia_x11: add jonringer as maintainer --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 3b4ed64bda07..c7e062534a4d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -115,7 +115,7 @@ let description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ jonringer ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; }; From 81f99f4170be618468dc07506b931aa922241534 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 7 Feb 2022 09:56:49 +0800 Subject: [PATCH 026/194] =?UTF-8?q?zeitgeist:=201.0.3=20=E2=86=92=201.0.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/blob/v1.0.4/NEWS --- pkgs/development/libraries/zeitgeist/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index de1953622e93..d5e058ef726e 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab -, fetchpatch , pkg-config , glib , sqlite @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "zeitgeist"; - version = "1.0.3"; + version = "1.0.4"; outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py"; @@ -29,17 +29,9 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0y6fyzxl5np4yskcxibd0p03h619w9ir907nhf40h02y0pk1kgkp"; + sha256 = "kG1N8DXgjYAJ8fbrGHsp7eTqB20H5smzRnW0PSRUYR0="; }; - patches = [ - # Fix build with Vala 0.52 - (fetchpatch { - url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/64ac3a6f94cd299e5e14945dc31b48f009dec152.patch"; - sha256 = "Dw1kNE3JoFdmgcQ0eFoFLYvmxlPjXNj56Jkn2meINz4="; - }) - ]; - nativeBuildInputs = [ autoconf automake From 08e9a94c10943ad1548238294fe5257a7d91fe84 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 7 Feb 2022 03:18:05 +0000 Subject: [PATCH 027/194] electron_17: init at 17.0.0 https://github.com/electron/electron/releases/tag/v17.0.0 --- pkgs/development/tools/electron/default.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 7 +++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index cb209a45119a..e61c77b6151c 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -22,7 +22,7 @@ let in rec { - electron = electron_16; + electron = electron_17; electron_7 = mkElectron "7.3.3" { x86_64-linux = "a947228a859149bec5bd937f9f3c03eb0aa4d78cfe4dfa9aead60d3646a357f9"; @@ -119,4 +119,14 @@ rec { aarch64-darwin = "dc8414d7b9a967bda530c83a81720519931aebf541cfaed142ee2042c16e683a"; headers = "042gz036dzwbvvxvgbgkdb5nq7p8a7vcan6c35l7imgv1hd4g5v4"; }; + + electron_17 = mkElectron "17.0.0" { + armv7l-linux = "29b31c5e77d4d6d9e1a4340fdf08c28ae6698ea9e20d636cec8a59dc758815ef"; + aarch64-linux = "e7bf2ec09b8a7018ba417fc670a15594fb8f3e930626485f2423e9a89e2dcbd0"; + x86_64-linux = "dc74e28719a79f05dd741cda8c22c2bb164dec178c6d560af085910b37cf000b"; + i686-linux = "6f6fe5fa0452e871abe82dbd25d7cf92ab7011995b3b2b15d04d8691ddc9e9de"; + x86_64-darwin = "c35d81af3a3f156059a53436d7874a46770cbf6e4e5087f7caee269e66abb636"; + aarch64-darwin = "7dc5eabc7e582a031d5bd079eeadc9582f5605446085b4cbd1dc7e7c9e978c45"; + headers = "1i3sx1xy62i4f68zbsz1a7jgqw7shx0653w9fyvcdly2nraxldil"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5bc1adea522..a783c485fafe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1227,7 +1227,9 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; - logseq = callPackage ../applications/misc/logseq { }; + logseq = callPackage ../applications/misc/logseq { + electron = electron_16; + }; natls = callPackage ../tools/misc/natls { }; @@ -14290,7 +14292,8 @@ with pkgs; electron_13 electron_14 electron_15 - electron_16; + electron_16 + electron_17; autobuild = callPackage ../development/tools/misc/autobuild { }; From 3ca052a4ec0b337226dcd7cbf68750447a729cc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Feb 2022 08:15:03 +0100 Subject: [PATCH 028/194] python3Packages.types-setuptools: 57.4.8 -> 57.4.9 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 7e602b2d3c16..24ee2ce5b294 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.8"; + version = "57.4.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1VRfKrPa0k9cscAbp0way3QHqzGyYY1CMVj8hAhRYPE="; + sha256 = "sha256-U273R0T44eS+T8cZiH+IbnTkzzx5K0oGmEMgvk30ULU="; }; # Module doesn't have tests From ceda5a3e788c10f4ac4298e4996615fcc7d225f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Feb 2022 07:54:49 +0000 Subject: [PATCH 029/194] simgear: 2020.3.11 -> 2020.3.12 --- pkgs/development/libraries/simgear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 3ce41e3193c5..c24c336c7289 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.11"; + version = "2020.3.12"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-u438vCo7AUPR/88B0alh5WbvId0z2cx2jW2apYcdTzw="; + sha256 = "sha256-W7KZzFU5qZE6tOv9YSzH3yoNi8YET2yzmThMcl23140="; }; nativeBuildInputs = [ cmake ]; From 9694c778f2856cb0062453b2e4ff5c8028b05105 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Feb 2022 12:48:45 +0100 Subject: [PATCH 030/194] home-assistant: 2022.2.2 -> 2022.2.3 https://github.com/home-assistant/core/releases/tag/2022.2.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 13e82c760166..00af1e21899f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.2.2"; + version = "2022.2.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 79d452bc1524..adbbc204f3a4 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -121,7 +121,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.2.2"; + hassVersion = "2022.2.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -139,7 +139,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256:09hji1n6blnr10k5y1rhp4v66iz2gwfd7afcd0sz156kw4g5mq89"; + hash = "sha256:OqyWm7O8ajxBlWGzvNhZvFmy5p2dINfMQ3cQ304Er18="; }; # leave this in, so users don't have to constantly update their downstream patch handling From ff811677ccc74bc018616c953004750d87fe99c4 Mon Sep 17 00:00:00 2001 From: Max Hille Date: Mon, 7 Feb 2022 13:47:32 +0100 Subject: [PATCH 031/194] android-studio-stable: 2021.1.1.20 -> 2021.1.1.21 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4191fa7cd43e..e7824cd93f1c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,8 +9,8 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2021.1.1.20"; # "Android Studio Bumblebee (2021.1.1)" - sha256Hash = "LwG5IDJBFpdlspDoTNpbi1togri2fvEOEDbkkiYvrJE="; + version = "2021.1.1.21"; # "Android Studio Bumblebee (2021.1.1 Patch 1)" + sha256Hash = "PeMJIILfaunTlpR4EV76qQlTlZDcWoKes61qe9W9oqQ="; }; betaVersion = { version = "2021.2.1.8"; # "Android Studio Chipmunk (2021.2.1) Beta 1" From 1c583d89e056e6d5ca63e4abf86d3803970a89bd Mon Sep 17 00:00:00 2001 From: ckie Date: Mon, 7 Feb 2022 19:06:38 +0200 Subject: [PATCH 032/194] SDL2_ttf_2_0_15: init This is an older version of the SDL2_ttf derivation needed for `linthesia` to run properly. I don't know why a minor version change broke things (2.0.15 -> 2.0.18) but it did and this fixes that without disrupting other packages. --- .../development/libraries/SDL2_ttf/2.0.15.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/SDL2_ttf/2.0.15.nix diff --git a/pkgs/development/libraries/SDL2_ttf/2.0.15.nix b/pkgs/development/libraries/SDL2_ttf/2.0.15.nix new file mode 100644 index 000000000000..a5057c0fbec8 --- /dev/null +++ b/pkgs/development/libraries/SDL2_ttf/2.0.15.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }: + +stdenv.mkDerivation rec { + pname = "SDL2_ttf"; + version = "2.0.15"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; + sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; + }; + + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ SDL2 freetype libGL ] + ++ lib.optional stdenv.isDarwin darwin.libobjc; + + meta = with lib; { + description = "SDL TrueType library"; + platforms = platforms.unix; + license = licenses.zlib; + homepage = "https://www.libsdl.org/projects/SDL_ttf/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e9f41a0506b..55835065be28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19966,6 +19966,8 @@ with pkgs; SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; + SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; + sdnotify-wrapper = skawarePackages.sdnotify-wrapper; sdrplay = callPackage ../applications/radio/sdrplay {}; From 202f13c7b076fe878ae1b401cf1114c3f6ad2969 Mon Sep 17 00:00:00 2001 From: ckie Date: Mon, 31 Jan 2022 01:30:38 +0200 Subject: [PATCH 033/194] linthesia: init at 0.8.0 --- pkgs/games/linthesia/default.nix | 38 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/games/linthesia/default.nix diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix new file mode 100644 index 000000000000..0914722a9acb --- /dev/null +++ b/pkgs/games/linthesia/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, libGL, libGLU +, alsa-lib, glibmm, sqlite, SDL2, SDL2_ttf_2_0_15, SDL2_image, gtk3, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "linthesia"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "linthesia"; + repo = "linthesia"; + rev = version; + sha256 = "sha256-bdW0RlV14ttnK8NizfNfXmZ7zlJOqZCpVvt8vT2Pjys="; + }; + + postPatch = '' + patchShebangs meson_post_install.py + ''; + + nativeBuildInputs = [ meson ninja pkg-config python3 wrapGAppsHook ]; + buildInputs = [ + libGL + libGLU + alsa-lib + glibmm + sqlite + SDL2 + SDL2_ttf_2_0_15 + SDL2_image + gtk3.out # icon cache + ]; + + meta = with lib; { + description = "A game of playing music using a MIDI keyboard following a MIDI file"; + inherit (src.meta) homepage; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55835065be28..9d1213b8b629 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22640,6 +22640,8 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + linthesia = callPackage ../games/linthesia/default.nix { }; + libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { }; openiscsi = callPackage ../os-specific/linux/open-iscsi { }; From a41acde05c59544f17d8a35579b91ef16e16f8c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Feb 2022 17:18:58 +0100 Subject: [PATCH 034/194] firefox: 96.0.3 -> 97.0 --- pkgs/applications/networking/browsers/firefox/common.nix | 2 ++ pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 677c41e7230f..687f4048e572 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -178,6 +178,8 @@ buildStdenv.mkDerivation ({ rm -rf obj-x86_64-pc-linux-gnu substituteInPlace toolkit/xre/glxtest.cpp \ --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' + + patchShebangs mach ''; nativeBuildInputs = diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6fc369c60dc6..3bc3abe48ba1 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "96.0.3"; + version = "97.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3dd5fbc96e369d5f4fb3eca778c2bd3e2313d089f867de9fac3556810a797e9b5629ef1b8840fb2f22a18df7de95ea1993eee052f691d861a555cea544b05966"; + sha512 = "a913695a42cb06ee9bda2a20e65cc573e40ca93e9f75b7ee0a43ebd1935b371e7e80d5fc8d5f126ad0712ab848635a8624bbeed43807e5c179537aa32c884186"; }; meta = { From 38219f7cc7e1eb28defe943164020d58e03d68b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Feb 2022 17:19:46 +0100 Subject: [PATCH 035/194] firefox-esr-91: 91.5.1esr -> 91.6.0esr --- .../networking/browsers/firefox/common.nix | 3 --- .../firefox/fix-build-with-wayland-1.20.patch | 13 ------------- .../networking/browsers/firefox/packages.nix | 4 ++-- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 687f4048e572..3816689f84ec 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -134,9 +134,6 @@ buildStdenv.mkDerivation ({ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ - # Fix wayland 1.20 compatibility (https://bugzilla.mozilla.org/show_bug.cgi?id=1745560:) - lib.optional (lib.versionOlder version "96") ./fix-build-with-wayland-1.20.patch ++ - patches; # Ignore trivial whitespace changes in patches, this fixes compatibility of diff --git a/pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch b/pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch deleted file mode 100644 index 49ce627faf54..000000000000 --- a/pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c -index 7a448e6..7792581 100644 ---- a/widget/gtk/mozwayland/mozwayland.c -+++ b/widget/gtk/mozwayland/mozwayland.c -@@ -200,3 +200,8 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; } - - MOZ_EXPORT void wl_list_insert_list(struct wl_list* list, - struct wl_list* other) {} -+ -+MOZ_EXPORT struct wl_proxy * -+wl_proxy_marshal_flags(struct wl_proxy *proxy, uint32_t opcode, -+ const struct wl_interface *interface, uint32_t version, -+ uint32_t flags, ...) { return NULL; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 3bc3abe48ba1..0ae962f2551e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.5.1esr"; + version = "91.6.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "26239e7a94b79f1e24a6667d7cf1c398d75992e8850144affbc5d3f34f04b91f0c9b020cab662b2cd4927924839ff2ddd2f3605c537bb5494fd9ac0d951b14fa"; + sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; }; meta = { From f448fc739446db64e42e7870d7484d09c213acaa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Feb 2022 18:13:56 +0100 Subject: [PATCH 036/194] firefox-bin: 96.0.3 -> 97.0 --- .../browsers/firefox-bin/release_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 935739b52257..c5998084a534 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0.3"; + version = "97.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ach/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ach/firefox-97.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "aee9a5f570fec2c8c0566f70673a6db1f60a92bb2c165ceb30f434b0dcf1a65b"; + sha256 = "1d02f86f1e903f97e36a90e89af2190c905e2c15bd78e252d4e52f77b347c7d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/af/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/af/firefox-97.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f929516c277cfb2d45100e677ed9dd200f8b3a09166455f39c2474bad7cc4d74"; + sha256 = "f82635fa7e2835fbdd998e0a0132c83c5831f5d4969ac8c2840a0b690ccba805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/an/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/an/firefox-97.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "daee2330478c036da51128c1f32d372b73b5400c8c0f261d50bfd821456042c5"; + sha256 = "cc817e42258c09944108bea46553ebea9859c99884b157b322f78f2550f9018b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ar/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ar/firefox-97.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "51549041ec1cbf2e0caea181f4468f46d15dd1a7b6a620e359f6de533118f8af"; + sha256 = "87b782af877baebae09aa2d0e0ab399b3ad9a9d6d8aa63ac8519fc7767f7cc60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ast/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ast/firefox-97.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "6cbce2293f1982e3e1cc993104a46f3093bec3f420af9ea561eb2601776b9cf6"; + sha256 = "f8889f0a843da8c681701e559bca94ce9bb6db446387cc142e2c4547115b5811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/az/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/az/firefox-97.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "45ba4e47ef4a32d4a8daa7b873a3658de2ebe88532f33af2fead1619939c8294"; + sha256 = "bab0951865aa8f62b6aa2b92437fc861caa4c6f2757848835d6523e0677e3bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/be/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/be/firefox-97.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "58666c9b75862076b00144de96bbcdd8b0b3a5bf5bd0895065fb38d3c12a30ac"; + sha256 = "fd6d94270bf1333d2f12229bcf843a43a9b1d9775bc9fa71ce6260d924176310"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/bg/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/bg/firefox-97.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "4ff97af116eb450edbb2a4c2d9864da3c0b07c5f6913f198b905779f2be48f98"; + sha256 = "95a576e8624745e94087aeb51718cb9ef55a0ed3258e06a8f0341ea6b1e993d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/bn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/bn/firefox-97.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "bda665d796fe62524f1d1c96afc4c8da569e9b264895a26aaeb20bab7c2f3030"; + sha256 = "a27340668dde133d2526607cd67f5216c62b22ba9f46c943ada18b979d8fd010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/br/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/br/firefox-97.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2305e226c5e492505dfc82fe34f17c8725eeab2ea10b61b089c92ad7b85a5186"; + sha256 = "2f66ff56c261d8b30614937fd7c1ccb3a89474b5cafe9573dab180279b3c18c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/bs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/bs/firefox-97.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "6aeb690c82790a72906ff80d55ae5de2dc7aa5a430c45a0ef2861336a6e73b15"; + sha256 = "d3fa9bcaf628cdfe067449e79abe378ef44fca46fcb43ab9a14fa73f75b817f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ca-valencia/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ca-valencia/firefox-97.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "86e2a4720b991d6ffd7c9ce996162db9ef9ccd80da96fd5ad184ef006ae8fb1a"; + sha256 = "3339e4a2859893368534b9390ef1475d115a4ba1058dcc44dacbb7da80e0fef3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ca/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ca/firefox-97.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0e9675d739eec02c98812e4d707c37d352de7605e9567d9d4adccd0e6ab40e8e"; + sha256 = "1c2e354248e8bf969ad026a472e6820dd125df35f23b9663aa65090a71af4398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/cak/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/cak/firefox-97.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "35d5d2c5eef32819499b4078c7f31f23c848b44c40788ff42ba66d10b3771fda"; + sha256 = "580c7fb31030d000bf9f1c807690a4df6d67a37a41c88a2b70d8aee10ed37b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/cs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/cs/firefox-97.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "67f42b8ce23ef78aab9fd5e61abada98d7fba5dd76d8c57ceefb43a1783d29a5"; + sha256 = "3be967c8cb22ae11587a48e0e2592097c486a9dfc2b5eb252442d7302cb04d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/cy/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/cy/firefox-97.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c6bb154bb341b88994d060f18430670184bd3646c662da6351df11e2ce9a6abb"; + sha256 = "cc1c93fff75ea41e45020ed81d8d68a5663effe695993b7fc34d34c76f1b0d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/da/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/da/firefox-97.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "3c268391a116f9b8ada73a98020c44f67bb9f275fbb7462a188e6d2d8acede7a"; + sha256 = "34d7952beb7d5dad269df9664faabb43ff94475ef5acb3f4bc726be5f92c4d10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/de/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/de/firefox-97.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "dc5ce8991db83708bfbe686db8a3244e28e61077a754b6dc41f29946b8afb489"; + sha256 = "475f14c65678178ef0581003a0a04c2fa3f8904f0261946387dd114a8c03d679"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/dsb/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/dsb/firefox-97.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9afd277a20cc47de854ec48c9aa484118e274ce24532e53076eafeb78d4f8e0a"; + sha256 = "d20671dedcf007a2d3e2be65bea9a13b98fa33c4cb34181a1996cb1629dc0de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/el/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/el/firefox-97.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "58130d71888ee7f3c40a1656ee0e7ab9f3538573f1dde104a93e850863ea1be9"; + sha256 = "92daba146e93c9dd378208f85fb530d241f4e9fbaebc10670ba67f3e707e8c5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/en-CA/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/en-CA/firefox-97.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "2548098aa8527abd10b0f23203a1a4fafb231c6bf853d67c938006d6c230856a"; + sha256 = "b7f9aeb6ecd2f0053f2df7e4e7a168b7ac425fb7c91435446d554042b55f38c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/en-GB/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/en-GB/firefox-97.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c8f8e171e28b629fc9cfc4557409987e7a72aa9507a51fe2bf0f8347530cc962"; + sha256 = "99f3af63a1ac4f16a0fbb714d42592881e0b20714c04cbdfe4ba51d1ead81213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/en-US/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/en-US/firefox-97.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2b642cfd2db0c2cb0f67453307a5a7d8c90e372a03274644212b51f60d503965"; + sha256 = "3d0f74790fe6ff5e38324222ab0c47e10edb31970ed67c6dd7a1c84e7017d1a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/eo/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/eo/firefox-97.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "803ea1560568fb1c2af0bc0ff47a01ec7d854866b209bce7ceff8f7351a1cffc"; + sha256 = "0ecc3d02a07c48076549ad9420c0ac9cf692470705ca390051ee5bc2a15af026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-AR/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-AR/firefox-97.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "4ab03c3623f26785b09308ca3d334536b169aec7690050db2141e40a83bd7b0d"; + sha256 = "7a4a3f330fb00c9e1083d65ded0006e44bbfc2b75f16acb93f49c257f3bf4243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-CL/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-CL/firefox-97.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "578e4ae8697ddf6754c88e94c7676b1f1fb4d0cd65dadd833966f1b69a277f14"; + sha256 = "4a2c44c4def2502a5606d4951d6436ff38de02a678a2c3385d0bb2ac60612d1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-ES/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-ES/firefox-97.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "91ed54c34aac2fa5f3345403f4123f154679759bdbc4d6453de093216db630d4"; + sha256 = "31b3c7ca8f3f9bf46fcf6a3cf33b1182cbc3cecd09f4e1741ed9a3e1257c2eff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-MX/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-MX/firefox-97.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8cad63aedba46ae735a6d69e510c912f746ed5f1d0af8a8bc7f396a53ca9bd7d"; + sha256 = "c9a2e2ed18dd3b08828cb08e1da038bd887429543e55ce4597a802169445240e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/et/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/et/firefox-97.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c12317af0fc4a4ae13a0ddb376192ba62ef3a2bc3205a0a87531ea4147707c5d"; + sha256 = "5b929209e539d57d94ff0ce3e2bfd4da41ab06e60fe050e7351a09b91e08ee10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/eu/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/eu/firefox-97.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a244b1fbd2ef6197c739834177e6bf9c8f1241f9257baa77eeebac149da0919e"; + sha256 = "285dac2db38f2cec56b1bb5c81790dac85f6097de2262038fafdca42680246fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fa/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fa/firefox-97.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7eac238a916f009c83f8a95cb5f6d13e08461630094d85a78cfae041df7b9179"; + sha256 = "fec85a746389ca7ee1e11d1e4b23f24fc31b4c72fd9628ca2772bdd544ff7f45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ff/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ff/firefox-97.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "afd6d4635f3840287ac5497ec33555fa6399d0555e8a9a8cd8c58384d6aba6c3"; + sha256 = "819c604b071e0f95cc3209d6ce0d6e733e4f15dc93a9154aa9b0a63c2b3c3af5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fi/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fi/firefox-97.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3e68e136d8a9a1522fe6477fec66df20fb454ab017d9337fbaab39cd4e607192"; + sha256 = "92e242fd2ea40389d0710ce798d795df9509fc0e0bbd93ec69ac29df93609e66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fr/firefox-97.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5b1b622c122acba08315918969dfc14f952de946e121c7c037d53ca422fbc3d6"; + sha256 = "44e95b2045e407f08be367f17573520ceadbb1198d16f0fc2c200d265f904c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fy-NL/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fy-NL/firefox-97.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c6588dc0436e8c96fe2660c356bd26dbd3065f04ab439aa034a154c28e5feb49"; + sha256 = "abdc4e3bcf9e1d8b0aac777adc55ceb52cfca92e27523f22614b2347b6209ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ga-IE/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ga-IE/firefox-97.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "d289f690338b6191f6da0201745d361915c83839f829375913a004bf63482fd3"; + sha256 = "699866a4b21d6c0015a0a65b937f784e4d66a24f0560f00b73c75b68ceaa2fb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gd/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gd/firefox-97.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f007344cb0ff1a2999d87ab4563cde87c2afa416cf3e20f7c369c9e6d4f17193"; + sha256 = "ad7a9847468cf3dd84f106b712ed9ff3824a9bcd8e15032fc371843b5357eb5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gl/firefox-97.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d42233e3a6cce9d0464428bf8e2dbaecac1eebf2c03f58e0045f971d38a2d844"; + sha256 = "efa8b59f8b7c7a3638adfcd31095dff88ba24016b8891f7cc496e9f286259559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gn/firefox-97.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "333e9de73b08a2c86d3491ff15a39312c63fcd2ab46f45d271fc37244242f39f"; + sha256 = "e850bd2e1940f755c7eaa1c517972e2d2e7ae2bdf5fc75142fda1c7aad05e0b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gu-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gu-IN/firefox-97.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2ef9974b7281e17ba3469947365b299b821afca28d5369c374e18d9498a5d15f"; + sha256 = "d74495e5369db197e614d99aefd2b26ab858511017b44c18da668d0a16a69a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/he/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/he/firefox-97.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6df30dc08a3f85cb1c78269d05fc56af9651efed5d5bd2d09cbd1eba264e5eeb"; + sha256 = "c9889e3356e2a7cd99519f97c9f7053f2b1ccaafa48a3462cd4bb3192f174e43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hi-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hi-IN/firefox-97.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "1ddb67ff888a37dac8e92637a051d3cc4f632bf3b22d05b91bd58bbad223e04f"; + sha256 = "3d02c2af702972412cc6923c426fd7235c7dafbf3a95f2a0703abc002813ef88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hr/firefox-97.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "85425e1a026d9ae2a5d55b0ad2b355a715e35904ac88a706f027dbf18ba11a0b"; + sha256 = "ac6eef6986bfea61aced2183eb592b2ff1d033e4ec60dbbfc4e2301947b3d40c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hsb/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hsb/firefox-97.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "abeee49422541d11d2eed2d159b7f20f3f0f36b7ce82505a2991368275f6bccb"; + sha256 = "719e01cec8be4d16b6bef69d45bbe838a4ca8c3b84a1340c88de48511970379e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hu/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hu/firefox-97.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2c42e7ed59de20b5377c37a41bfe083279f0e481c61cba6249790ff83ce2977a"; + sha256 = "3774aee9afd211b50605ab76a213d36ba6692ff695fdb464ccd116dcb0a64d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hy-AM/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hy-AM/firefox-97.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "74a0b038ca4cbccbfcd276b299ed0d127f4d4cdea159789cf01313095ee8874f"; + sha256 = "d27c4148627a2f32bf4ee900e50b8f96805deaead292b4ccc33259c8fdabf626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ia/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ia/firefox-97.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c711c1cf38ab231ae74404852999d74e4d802f36c12e44835e9bc6916133eab9"; + sha256 = "d1bd6d3f5c78a3ec6e7caf25cd5befe1e35125aa2456431cb0487d968375798a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/id/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/id/firefox-97.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e03819b47694a6ded168212877294b187f3e3218ab78dcf888a947d90479fc30"; + sha256 = "325af486e9faaa9202d013dcd9a6fd4e0b04237ccd54a132b79480475033e936"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/is/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/is/firefox-97.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "94eabb7522d56e732ee816a7ee1236307d8dd7ebe22fafa6bf4a3ae14d3a0d8b"; + sha256 = "2b980ba98d7edcb737bb47d3eced8fde9a3285e43e345a52fe0d375343e841e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/it/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/it/firefox-97.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "5b73da04bfd5601fd199e1ad32cc02b41ccd056551e3e14ae975ae401baebb53"; + sha256 = "b7f9c12f31e7306592a2640582b327c12f250f3237aed83848d37be0dc6a2647"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ja/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ja/firefox-97.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2e8992b199d36c9857627942b43d3472f56e7657f929dc655cd4bc74b0441fe5"; + sha256 = "7d535b695a0adf5a6068c33c03f0ab589fb00e33192fe855eca3953b94dd7a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ka/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ka/firefox-97.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "6c4059f00b2598bc28755f8051ef20159cf8cffc9732f1644822769799e886ca"; + sha256 = "e712558a74a73600cb751b583be37294f7b23053b560bef3ba8468baf8614cd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/kab/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/kab/firefox-97.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "730e62f6d18da4519ae2ed46266d2014fd44260549d8d2dd4d0fd8b6174a2831"; + sha256 = "f46c4c90bf3a3da559e7c4cadc9bd6fea92dba6635058bf82a276b1483640951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/kk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/kk/firefox-97.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a7f4afdd9d43f0bfec34edf17dd5ff0d68d529731b51deb86e2a09d85e7b86b1"; + sha256 = "379a45ae1b5f6fa2a039ab2bfdd342d40c5cc6ae556bd6f7ab54b79964533948"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/km/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/km/firefox-97.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "c69f54f1a9775c76f7126a18c5c8c66f683737076e3e59479b3e36a34a6c30f6"; + sha256 = "d619c47406d024691e63657e11dfb34624c01f120470f1acbffc2b39ab6f95a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/kn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/kn/firefox-97.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c9fb9ff1e2c79dc0ad804846bbcccf608a09ad380932bd7d68267e10cc9eeb65"; + sha256 = "c058146a99dd06e71c61e780a232efca883e181b237ba03d0bc70942181109e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ko/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ko/firefox-97.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "43adfc767b7869adcbb2d39410813eeab6ca7d50df6398bc00106f1b73daa564"; + sha256 = "f9d5f7d11c8ac517fc7f19b7d1c3dbf325a224c3a8993c6a91879e0aca05c3ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/lij/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/lij/firefox-97.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "812ebc60c69de188a12247cf82881824ee0efff571b91527fc343f50f216c27b"; + sha256 = "2d450a105ff42bd396df813438085b88cf6a4fbd7c59af05be482a0e316e03df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/lt/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/lt/firefox-97.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "375ce82258424250c48051f33551958adad2b72bff9c06f2109a54618fb0a038"; + sha256 = "ecd64fb4eaa169e36a36e039563ecc5de9cf97f655fffce496373dadd5e4b49a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/lv/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/lv/firefox-97.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "5b27b13ae0406e6ac0bdd612ab8523fab2665b8e4e146aaf2f47a83712453958"; + sha256 = "a0fcb7699d6b76165b7274b2316c192dbd933ed39349148882a682c8d354497f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/mk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/mk/firefox-97.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5215eb91572c7f863d79d44d23fff9181b1c910817d40383a83459d6ce0fffd5"; + sha256 = "850f5589b9d4951738ed1d32bf14270191bfc34f7278243c42c7a745ee893e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/mr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/mr/firefox-97.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "056491449edc305d2994f8eb985dad136d9687b3f0aaf9b95d134a352f72ea34"; + sha256 = "bc13f72cde29dd1ba5e770b929376572a9cdd4a755fce685b44e34af757f240f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ms/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ms/firefox-97.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "eb7244a97611860167f98dd038e4d1f60c3b52a2cf81fdf93c2402d780c1ecfd"; + sha256 = "bbb9fb8ae7548ffe1e1d982925d7b3933fbcded03c5bc31df606282c4d4f538f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/my/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/my/firefox-97.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "93b93324e305b5ba0f9a005b73230de8acc6607ff0e284c5d3814892f95181a6"; + sha256 = "05f5c5eca3d02480ec61b42ec92bd71c9d27a1e843439f527fa57ba7dc5762ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/nb-NO/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/nb-NO/firefox-97.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "255056583e093d4b733326f732a529ddbe18010b64e5a093e6a17e09953f6c5b"; + sha256 = "715a82164dd577d36100bb28859efa1468e7213993e622eb97a44c4423c5829a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ne-NP/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ne-NP/firefox-97.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "65fcb5475f2ad6e4e9471e4129ed26c615786e6b90c13e1f38c1c679b913b023"; + sha256 = "d7c55ac4e78309718caf4b1e911999f6d4a1558b885f9831747d4fbd3bffba55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/nl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/nl/firefox-97.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1197ff7d9bb843d56d081da51105283923768884cecee4ce9cb50a93952e909d"; + sha256 = "6b539b2486aa1deff4b99828a319285ce73277c93bd863777f88b4a906b83c76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/nn-NO/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/nn-NO/firefox-97.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "47fe60e6c0115914630edf99a56447f5a1536da0e55e6253e58e4e9ac54c9eec"; + sha256 = "42777f881c86b597f7c39cef1651d65aabdae9d616d8a115a0a993867adba92f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/oc/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/oc/firefox-97.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "17d363269d5b0911d47ea3ba52e9a7b28f911e4f0a1eaa83849d749b4bfe906c"; + sha256 = "76ad8b28abea06743e7e70a463ca39c6eae94dd406d7db27428246d190266aaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pa-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pa-IN/firefox-97.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6c1f582c50b36055fb9f3b8c20db1bc823cbd2d56cf36c8495e7c18599a906a9"; + sha256 = "8f30e7f2835c6421e41da2558d30448911d1eb4b84d4d9b076833d70450030b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pl/firefox-97.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e4a1fdc104a58966e760a1ea78bd353f61272462920085c347693adbac769d43"; + sha256 = "107b879c5c34608f1c5aca1cfc3c0722be2df4c1573a0bbc8cf0968742c11cf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pt-BR/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pt-BR/firefox-97.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "90a1bff86400f555d284fd8094df9d7c13556ebad0ce982710508d901c6cb1ff"; + sha256 = "83f52f48d55efa4b52ffead877ba7fcf69823d136a307d2d84640edf586c4108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pt-PT/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pt-PT/firefox-97.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7e59d9ab9369f8f7ef00b85c6c6be62b4bb9da488071268ddab808367541892c"; + sha256 = "523f082daad8c56e258eb053ba0d2383cbd36a8924b01b57cc2efdaa85292d3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/rm/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/rm/firefox-97.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ca20e98f9703ccf00cde6793b2e1d28c0c429c0fff01a2eb592e4270181e8c1b"; + sha256 = "798bdf60c52b331edbae3ed77734e1204696ba18c08b509b9465a999a7707484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ro/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ro/firefox-97.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "55ac07f7ffa919ba37d29899f8fcbb13793db9f198e2a9cc0b5dda717b1d4116"; + sha256 = "811d95d5ecfa02e2f315ac1c6065251d9b7e7f862748a9466b3464c02687088f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ru/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ru/firefox-97.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f05ba84219501f904d51f320fecd84df6c51cb1f4ad541afbdbf8a781e46699a"; + sha256 = "dd9060448a645c7395d2abb75b1b6c0d33399ef7fc4ee7fa2474e4de4e5cd5ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sco/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sco/firefox-97.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "5186773e72363dd05e46ba418e58a9e4d80381fc530c509135c76c5e63353d48"; + sha256 = "27f119009eae212234ce78dc77d66e99505c1a7058658b5cfd4952f5bd5b7732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/si/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/si/firefox-97.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "8bdc526c6d7b4c672d12c860376458d03efd5305f4823405c0827a4b75912a8c"; + sha256 = "73f37697e72ebc8ee72583ab2061f10dedd09a7c91dfcd00f051f9d372e10700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sk/firefox-97.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bb17d52c6c549dc7861c32ec9a4f57a0df323845a6076a9499c1faa9ae3c8d28"; + sha256 = "9aeb7a0a38defc38e7483c1fb6e939421cab6704dc69dd882b7dbf2c413af246"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sl/firefox-97.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "fecd2cf24bed949a02360ae74f6701ac9b65186a7a51f851249a2cee67ccb63a"; + sha256 = "ff2020d595daf151fcf1d8c20614b848b8dac981f7ad9b9b11497fd3adb94a94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/son/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/son/firefox-97.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c3130c49ad77912107c61d0b24e5290f20ec7dcf95d329682a0703f43c768c28"; + sha256 = "eb758e0772b33a955f0a69e673dc53c419e83b29e7003b90161555567bd0c9c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sq/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sq/firefox-97.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "4cf2ac0f3957a205a26548655f00c3af0c35751ff6f69d25e5a38dde86dbc335"; + sha256 = "8cfcd1863bb79e537547f296f08c6e34b441d110e0d360678aecb43564eaada7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sr/firefox-97.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7f3e01919220b39029bf48c651864dfe9970c858f4c379a0a458bbadc1cea666"; + sha256 = "84246cd93b2762e06af5aee56139484b70bb37dc10d8077c58323bca88ca86a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sv-SE/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sv-SE/firefox-97.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "bdeba12b07803a1bf86c7e38185fc1add59a10e09ed59aff7d135107d004f0bb"; + sha256 = "b57f4a6ea4e8011c1fdf448d67afca9a028f76c9a08e399919937aaf3cd1bf84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/szl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/szl/firefox-97.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "f6b69c4e88e23da50b4f7f3b4961a92ddb3321dab8a988d29150fc1ad60258f5"; + sha256 = "71f1b134dc8b363856596e4c0b398641702d37811e84008c9efe36b3722e8633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ta/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ta/firefox-97.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d7bb8645992788ac5161f3becf98248526b02b767cff958d5094ad24086cad06"; + sha256 = "25cc66d29ad3e85be20a620c40426d0afe65df22f75001ecffec733122006841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/te/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/te/firefox-97.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "692b65313b3b792e35b1160ee830fd9c9ff082d6f6177af7be135dd6096efe09"; + sha256 = "15dc00d56d31699e3d7089b82ad9e585be5a857b7b2e1056b678b2ecf9c50994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/th/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/th/firefox-97.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c792a126f487b51f4832a56fec8a6fb502fe3a0a38dea7a8f3c5a7060b9d7576"; + sha256 = "16629550b5eafbe3ad4c9137d3e89225050918dfca55bc898aa001084e1882bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/tl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/tl/firefox-97.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "ef633b565abf5349aaa86afcd9934145b70abc036bcddc733075e5157a736406"; + sha256 = "ad4ecfe3d7c103090d8642101543b6e2970fdefb3923afd28ac4f1602c926b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/tr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/tr/firefox-97.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ef04eff4e101405dbf8291b0384f8ecc95febf6730aabdc28d8c8cfaf305810e"; + sha256 = "5d8b1b1dd0ae04869be672f098ceb1ddd3b70be40fd5c09d52006120a434f3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/trs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/trs/firefox-97.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "0a5c709f86dd33c771aec4760a5df1dbfd7baade90c8d9519c46a1dee8f18aad"; + sha256 = "f64a6a311034b7d02737bc1ed5aac991286a42463554c10eb96795cd1a5d169d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/uk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/uk/firefox-97.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "488baa16c6d60043d5da0aa667e3973eb0df141d50bef117effecc2a39a30019"; + sha256 = "b0e98a5ddb7ec8bce8dd456c6587733ac6bde6f8058cfcd735f10751d4b95d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ur/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ur/firefox-97.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "039278fc25b62c6ccc024965ea296de4381f86c485b10cfa93cd5025d39f7e47"; + sha256 = "d6fdbc3111b040a8b4880d81e22aa76abfe45ff05d551950324ffcbff2cb8eef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/uz/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/uz/firefox-97.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "59c1a1f8a85f1f569112df4dbfeaaf15f4337210f50111193b36bdedf4d3b2b4"; + sha256 = "4d806ff1b92ce4ec56f49d0ec474c5bcf01bbfb2aa46ce3ed3eb3297658cf185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/vi/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/vi/firefox-97.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e9a1a2330b1d09ae8f9ecb95613799db87a06f7a4fcd70265ebca2a6aa179bf9"; + sha256 = "0ee797028b2464417fef119de35e78895e0c14d43c8344e3bb5332e71958fa76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/xh/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/xh/firefox-97.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "8dd8816267c62f309206a45cab60bd6dd4d067b0de3002111d86b737f4f9d11e"; + sha256 = "6c3acd60b0124f23403160c3194e3c1624d16c7c4450c2eeae929ba562e138c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/zh-CN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/zh-CN/firefox-97.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b080362a5fa2a660770698915abbbc9230d85ce1eb3510e96ff9374ee19fbf94"; + sha256 = "22606e4647d267ec369382ecca328e2022becaf6600449da482cc3d402fd60f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/zh-TW/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/zh-TW/firefox-97.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "34f43a3dc69a116d5b9a136d89fe0180deee13907a94eb6d02ef2ffacb94ef49"; + sha256 = "7046246516f83e6747706e164f75b03ea5358c9ef262a2eebe9091eb67037791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ach/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ach/firefox-97.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "b2f21e188e6ab08be9b57a1a50dc735c50cc6586a70c3243af1dc242def66f79"; + sha256 = "8f2b6c27b89643661fb6c457daea22403787d9255da83f57cc1ece1c133ff6f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/af/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/af/firefox-97.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c153b40cccdb36903e3ced9d8685443a9dd4550419b45f09c201fc5b9ef2d12c"; + sha256 = "f0066a19fe65b6d4a32e202a09bd2e454d5265e424543235ce4dd5c440c6f492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/an/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/an/firefox-97.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "0514725b38a83e6385362dfdac57b7d374a458e6621296c4285d769933aa7bdc"; + sha256 = "7aeb5226c869c2ba438ba62a49e0a1b5dbaca2c4b7a427794ad2603e522024b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ar/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ar/firefox-97.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ba1003e913322f06aa113f61d6de5ce52e08bdb5644fd6c5c8d9f059765a7737"; + sha256 = "6e8d27e6ce8051e918e0ce29976aa048d58a38b31fe6ade18965881bdb07268d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ast/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ast/firefox-97.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c2983efe1ba2b201006581d10fa629e2704f70590290a2720817b49ea3cb6ec0"; + sha256 = "e1814ef2b6f314fc46693e822a8bb7f6340bdda8af9a48d2534aa8a385e1646e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/az/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/az/firefox-97.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "b4cf2197f83835fb580ed79e01851e7be2d9d7e319e1dcea3028e075f244d6f6"; + sha256 = "14d3bcd5251620d59764c9c905c56f8332174ff1bbe78087cdb73e1803edf3cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/be/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/be/firefox-97.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "519c34bffab78065fcd3b9027eac4e0eda7ab864784f98474dcc04d887540bc4"; + sha256 = "903eaf9f4ebe60d69605da083733cca327b25fa9842c9c9384600b4a4b6d6fbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/bg/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/bg/firefox-97.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "fc897672d9eed6bcc835fa3e9e6e7fe07214192fd6899b2e7f85d64a0fbb1179"; + sha256 = "e71e1fab1a87d4346e5f8a90b8f674eb10af292a5bf640a94cb7d765d6217b46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/bn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/bn/firefox-97.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "67550724f06e82f430e398171715a96eb2b4aa6e902066faf7e7a1efc5bfcbb1"; + sha256 = "f815f71dc8a1f288c7fc62978b8bfba1e53323459f99de0ac931d9f6c266e641"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/br/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/br/firefox-97.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "22d15a81ee580824465ff2bae1f134efc4525cb2b7e3707c365f8b720f8511b9"; + sha256 = "4443dcd0d1e1fbaa7f52884734bdf2378caeeece0e2f62f36b56eb6aea8b73bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/bs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/bs/firefox-97.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0d2bca33d770c88b808c74f3178e5f4782424f804e59acfdb884879e195e3ba4"; + sha256 = "0d02992545c745b95c341204585b0163ce32938a7112903f7878c91196c883ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ca-valencia/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ca-valencia/firefox-97.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "3214ba1b640b1802d1a22c0a76ed5a26f0f2c23785cced7ed1cc8eaecb0c0030"; + sha256 = "bcd25813e25d30f4d6e3cfc999c02c014f2d6335e52ff4c46226540bdc0c720c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ca/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ca/firefox-97.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "07fa269368d120c547c6faad6c896c73cd95cfb1a99da9bb7bcdec1453e4c898"; + sha256 = "dc5874fe3c9e9fb01cda7e7dfcf93ce3c9de2e8a65b7443e231e193ef4debb14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/cak/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/cak/firefox-97.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "3350662d19a2f4bf68688917c4b37565c9049f22c272ed860e1d47f6f11e3be0"; + sha256 = "979008d2f21b0cdeb877841e66dd6013c32d8eb00a7bfe95fc3343d66bd3eff8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/cs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/cs/firefox-97.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "2a70bc5fe26c427ac4d0c6ff75670dc485d9f4701926572ff46f6e6044a94d97"; + sha256 = "27a831c18f74e449a624905c18485989391b4e8769f1ac2646e2567a6cccc91f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/cy/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/cy/firefox-97.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d5e4177638e84295f2733357548791a179cd32e97c1080666a6b48270236f8e8"; + sha256 = "a6cb71d9eb5d19a00818faf353b7f454e38316fadb242150948fb9ab485133ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/da/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/da/firefox-97.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3d31f922d743c9ec84841bacfcc563c6c71716f75cef8b78b5331bfe6916dcb3"; + sha256 = "2224b753fc1e9355ebffcf381adce940e1e517e33e11098d3a8e92ea36216eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/de/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/de/firefox-97.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2e1ff6056e589d420ae813a448317de248910694fa89ecfdce9b5545a647e2b5"; + sha256 = "aa7f041d58eedb41b7460574d736cbed6bd990dc68de6687f143e9a2cd450ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/dsb/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/dsb/firefox-97.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "73d2c7e568d7e6bf8831dc4405f407357e3066896446d3ea2bbaf7de45c1314f"; + sha256 = "7d14ef8d451e8274c3a03af9111c3d1f09cc83fad57ee0a6f84366428bed417e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/el/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/el/firefox-97.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "1669c35b9ab66367d998f1b15556ababbb3b80aa191bed6a7b7f34c6f29fef1c"; + sha256 = "bebc24fd34af4d3a7d5820a0df0a2753956a82034603c4a71441b8cb66b99066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/en-CA/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/en-CA/firefox-97.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c5aba93081eaf416dab845e0e8d2e5db10992c3aaeab209182c4af2e725dc5c6"; + sha256 = "f39a52a27af7b68f683df373a35b29848fa990fb6fc251a511f0525061e6f930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/en-GB/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/en-GB/firefox-97.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "72acf998d686d34727ca307855d3c0139c620868b13614ef5c7a61953a3c2ac8"; + sha256 = "858e86a232cf23be1ca2c6aff1954d28782f8e893c096d8263e486b92a6498f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/en-US/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/en-US/firefox-97.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "096169898ad97b2575b0b5e07c012f55f8749b7bc85f373c276d97948c3b7e08"; + sha256 = "7df5164de2eea1c32657c6ba813664a15ba5a198ac1a19c32ab494f9fab1d39c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/eo/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/eo/firefox-97.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "365611e7265d56b3c9bab3a6aca71b838d48b945119b710624696080170443cd"; + sha256 = "c48804fe31c7ec37676fe2f875b61faa992aa2dc1ff67bb5b3033b790e927d79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-AR/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-AR/firefox-97.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "49a54d184ea10380fac710f49f6c3e36c2e338e5324acf94b39535f6e06c91ce"; + sha256 = "4aef2060aca1d24a2ae0ad8e6f9029ab0cc1296bc2efc53ce4f28073f6b15757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-CL/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-CL/firefox-97.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "3a5fbabf862c35f29db2c325e6b2e89af8a2fafea9c6613dbe4f367ce07e1abe"; + sha256 = "5423bbcea8a0454202c099fb66a39eba4a274d2062f45464783c9a8aee5c2305"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-ES/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-ES/firefox-97.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "241fb3c9a2d07276085d586cf51fc55eaa6293d188ec286f25c6f58eb1919f31"; + sha256 = "cbc1dcbcf7c2e3602507826e9d2e299f213855c5e7aa1968cdc2fd19a1fee872"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-MX/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-MX/firefox-97.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "066bfc95073b28afbf61accf2455e3294281749eb048bfab0670b21f920e51bf"; + sha256 = "9225ef8b083b8b7fb91cd142ec204a53d74ef49518db6f9f5eb98851ecf52def"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/et/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/et/firefox-97.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "437b61d073054cfb81063991c03afeeb5be52a31bd4f3bd1a2e65bef0c92a1d5"; + sha256 = "32d4dbf6ab64e7a54fed85c6ff58d514e43b4427a30e5009f157a21bf21997d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/eu/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/eu/firefox-97.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "bf998de6b1b2dee067ee05d0a28d0128f63c9e6e7b788181d785b8afce8b0789"; + sha256 = "576696120b4dfc64174a0a208506482dfb24cf45bc4794c4d4255796539b85d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fa/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fa/firefox-97.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "efe1cd9c8acbb8cdd8d72eee6c81f100c17c90fe0e13784992c5cfbe712a1eaa"; + sha256 = "96b394c28bc77fd4d650196b75e266c70774af5a4f6f49c813cdbd5d0ad6de9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ff/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ff/firefox-97.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "dcd0dbe923403f1b078695257bb2705a4be9c91ad51fe065500ebfdfd0e8bf45"; + sha256 = "d9aa3dac84c96163bf3c2a4370d7cf1a27045b8c506df3da2c8751bde80e1a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fi/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fi/firefox-97.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8c2288c2c7e96e2176b005227c504d7be001e03c43757f9e945f8a5a360dfc74"; + sha256 = "594e1b265abd354aabd180af2e9099f5d22eaab05d66dbd7511468dee0fb31df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fr/firefox-97.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "dbb3ebec1fb7da951c30d9a9fb50d59fe4b10cc56354c6d988708b4912092ae7"; + sha256 = "542441111026dca84050e6ecec1007dce9910d41d8f961a2dc6a4ed49a7aba6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fy-NL/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fy-NL/firefox-97.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "510522af3fa4c2f264223ac1970222c6d77abee42cf41ae1725f615bc519ba0f"; + sha256 = "40ea9e076c5df6c81a4c19960a2c96f83a8174817db33aff882d4c121e58d8de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ga-IE/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ga-IE/firefox-97.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "82225bd4f8a00ffd38af9c4ce19cc3d224bcced34f6523cbe02a9c7f3d228697"; + sha256 = "b7839aeae2734ac52fad253311e255a5e5d203ae117730bb9bd8a414489f300a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gd/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gd/firefox-97.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5c11e2efaab296b436c6d21c7693612b910297681c49af90d376d9e1525b1aa8"; + sha256 = "86820d66c8f6e7a03f4a73b564d0f94bd70477a4e5d74b27f7cfc23f70d0b559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gl/firefox-97.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "8895ec691bdcebfc5eb13ef4a59fc1e08bd7aebd8ba336fc2a99db47608e03ca"; + sha256 = "4c121697d38f717cbf66d48bf9af5d65d67e2e3458ad17ac72266b522e89c6c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gn/firefox-97.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "fb6f99ee38f85d45b4d529934acdb94e804c5d8e85ae54124667c302156523b0"; + sha256 = "71a823797c386c3b50e4034bcd404197f40af00128eedc614638bda51a7bdeca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gu-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gu-IN/firefox-97.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "69aaf403dc5fb15f92b95175a1be399452cd06ab751d3c6ff2a78c2ec9ebcab0"; + sha256 = "498a2222df5fc34e2565b76a797723d8e01a7569c168fb549fe07cb6b1d20c2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/he/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/he/firefox-97.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "eedd4f7d709b56e002f8f9955debe3bd4b2c4caef61b5160af78a44677f44530"; + sha256 = "7b86815403bda8e156ad2d461391b81f869222ce93ead4bf40fadb2c687dc850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hi-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hi-IN/firefox-97.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "3df9f781a68686c430da2f5aeafec68b983e1a9c64989701a78cec7a25830202"; + sha256 = "068b26208c44b2c5fe46c29e5a1c4e98ee1eb81f335cde5935575e05088fd18a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hr/firefox-97.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e809039217112743f459f37ae9b8cda21bb63aa00a23641a5f869a65ac55a527"; + sha256 = "876985390499fb65e29c91ae1410c41959d9baef96cf0857baf4988e7ac2e94f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hsb/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hsb/firefox-97.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4ee840b8014aa7b0e8ef5262ac2d69e48049a7b2beab803ee7dc09c35dee8f03"; + sha256 = "d366bf448d82abda3cf1728fb4bd57489010fef0885e5f0d4eb5c8d371e004ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hu/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hu/firefox-97.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8e62842f1be4afd2d61c0ef9a9be05f6e3c133d1994a55d8b165d39560d96018"; + sha256 = "5b080f77d0990a026a73bdc298ab1bfc3e1bbc07714646e3ebf0c064104b58f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hy-AM/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hy-AM/firefox-97.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e0fa7cbc6bc4679585ce832f8cc1380e7de0cb0ca46b93293c9ba08fb04f91d7"; + sha256 = "86a9c6285a87ecb3f41f4c894f4b27f28975daf487cab8600e18c6a7f8446919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ia/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ia/firefox-97.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "d20630531aba75aa0641422fadcfd2d3bc663fc817c22641a63e9bfc4cd29a76"; + sha256 = "fdba1012d16a7b4fe98cabc7527a7c912f81383e09d7f3d195248b52072a3040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/id/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/id/firefox-97.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b11550957bf6caf0f088e5791db67f7685d4626f7535691c4201764244649fd5"; + sha256 = "0cde2aeae0bc24841d8487880d80b0842c3d738d110c6235a2b09b03df366e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/is/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/is/firefox-97.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d9112f5dc6c3fbc415d9bb9da52f36dbce325d36d8ec1843cf96b093d19d4b69"; + sha256 = "76dccb349d505794a13863960d432f1362c1d24df25e0152e710aa661760d95c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/it/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/it/firefox-97.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "35f4350d1cec94cb4402b7b22f11e929e8a08b44a150f7910f278c9a5cb77324"; + sha256 = "b8f85fdafff993e12e02cc9fda1c79e38c06a1cff6c04a75edfcf227e2e4b6f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ja/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ja/firefox-97.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "5fe015cc6d0250500912187edc04e697cbf62028b447e47e8d1532dfd0628d2c"; + sha256 = "2880b426221b983e92248e7e1a58e7b5940c6a782d6f6abe8679b3dce09b675b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ka/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ka/firefox-97.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a696df24f1b95e5b228f53328514c77639020a8719cdb23f88017be7e6d2a037"; + sha256 = "d2dd3f4061dce484eb40c4f7d8a3101bbf4e838e657c4cf3b7fd31efe5ac1556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/kab/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/kab/firefox-97.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "4d9c7c0cf22aacd5c18f75eb511db2ebffc393019af1f01fb5d1dbb837da96a6"; + sha256 = "c49cd9e7a5786fcd2d123bef197c1361b07644244e869bc038dd2ca1022da089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/kk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/kk/firefox-97.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "db9c1eee0cd6a696e24b7edb142aa3f04a89bb3b30ec46e76be3738e3787bbe4"; + sha256 = "466dbe14d44fcc547d5bba6d8475f908af0cc8fc5a788edcc9ea314b74e01aae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/km/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/km/firefox-97.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e05b5a315de970a2bb58276204a341870d0028214b2a402eef5db36ce8ca8190"; + sha256 = "67499ddaf97d90f07cbb8e7bec337287346d964630a73e99a192be94ac38f19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/kn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/kn/firefox-97.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "1c60915882ba74ddb257517036932c154a5081e9418b98e0fb533f1c71479eaf"; + sha256 = "1c661152b25860acd10d6ca039107957ce8811b448c88c55df0627436ef35955"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ko/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ko/firefox-97.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "1c69656cf1e302973ee92d9064388cd537b70ca8e36882b2aba5ba477522192b"; + sha256 = "d43000c9c03f855e2d3b061d085c4c1dddce06b511145370cacb0e11e272382e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/lij/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/lij/firefox-97.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "bef0d7289833480363ab76d610e2cfecb286f5ed614d910ee84c9016da358c1c"; + sha256 = "d330473b0a20100c9fcfbbb6488dbf367a21816683a1b21b861a729defbbcfc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/lt/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/lt/firefox-97.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "738746e5e17271ebc97963a890e6951c9338c7f9bdb6021c3db0de1f346eb66c"; + sha256 = "0d89e5bb389c6d4ab91965141d5f16bc6e34b1cf2a7022e4d97db135501b3cce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/lv/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/lv/firefox-97.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d16713a766aecb20428d6642805fdb94a70523c0eb557b4a143c60afbc7ab623"; + sha256 = "754b82aa04425353fb85a02fcfaa02a47f6f2e5218af4e814970c91282c77e82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/mk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/mk/firefox-97.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "f04eb09a5ccf6fb017a652ed8016d2e6f83202acb1f596a9f1b972caea8bc6ad"; + sha256 = "e554245a73bca28a816c1f4605164554a8a2680fb098aee3020c972c1e535541"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/mr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/mr/firefox-97.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8cb8bdfe8b57fde90425e242de2a6c6a2fd76341efe32017febce6eb8189595b"; + sha256 = "e3a0daf03fe745268e08a82b53a94c192dbf499d9f7fc556f835552a2002bf63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ms/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ms/firefox-97.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "785a87e3cbd7521913c47b9ba0f3838ee44e729df17680d780c78735c2ede188"; + sha256 = "dca49aebc098103f212a16ab135de42aa3a7eae98cf3775c9d3c8e48d27816e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/my/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/my/firefox-97.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "6a555d259acd118123630f2da9c82c72fb95208b6aa02cec36ee8f803a94db82"; + sha256 = "471986bf5b5aa0f63c9953a465cb2ce527699f497ed720defe80aef8b7dbe249"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/nb-NO/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/nb-NO/firefox-97.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "a095c6f9991033a60015416f049e39f403368aafd85b3eb63dc3b7ab1183b9a0"; + sha256 = "d184e4b06acca71983b6a075c5d4d70a5419162a96ba5ef612b9a7e9727759ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ne-NP/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ne-NP/firefox-97.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3e3d546d2c2671f026414c809ac29431e4497a609c429c549f3183b101282766"; + sha256 = "7a8ebb648a0aac4c7d101e99da6a396ed5f3bb7688b59cee94f67aa6f627d4aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/nl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/nl/firefox-97.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "5a0f987ddf354053e128a9c4d27b0eb73df227569643bfdca211aa2d4aef9208"; + sha256 = "6f24663da51d9c38b1e66e0064a161630da5f0a9e8a5920f63b76ef96d7d6a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/nn-NO/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/nn-NO/firefox-97.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "736ed19fe6aabe0db06c3b5ba8971b9f73ec7014d876ce5fc0b5caff491cdff9"; + sha256 = "9f02fb57edac62277fd649f5da56d14eb52940581adbcf6b970883cb020ad0c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/oc/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/oc/firefox-97.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "abde35c0c8ec426bdf5b35d0d19d2076fb72091939dded1318af90234efdc795"; + sha256 = "766c5f0ea370fc0c2fa3c39096a9bb1d0f1b71c6c0a410f34bdbd21469d932db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pa-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pa-IN/firefox-97.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f40fca6a7f15b21ed61ff1293f9ce26cd4331736c4f59dc3515fa895176a15af"; + sha256 = "d5f44b2116490596780d4af5e14f815e40e344a1b29cae556957a0b537aaa8cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pl/firefox-97.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "37dbcf64865442c1e42d22cb926888dee9aed8f3d99e08c8a8da3fc3bbcc18a0"; + sha256 = "5dab218cd9efe307e844913218769eb845b6abe4153191dad34b8f9853a2fd73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pt-BR/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pt-BR/firefox-97.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "60059b1fd78fd5dbf4df958274dc3c272142b4daaaf7fcd527491674bafbc234"; + sha256 = "20d3a3f3f3e037780de788f858d3c9c4d778219a9158cbb1496ba968e9f50b32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pt-PT/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pt-PT/firefox-97.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "958dd069404ef0b5aa3426c0436f7cc2fb0665d7aeb17b894f555baa875b1808"; + sha256 = "a97777d502c304541d1fb2c177198dc41d46e66052008f0adaa97141b4fb81c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/rm/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/rm/firefox-97.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "5d1379af25c004d0e16b3763fe2a78ddbd766a1ed8d3aa966a71bf44b65a8140"; + sha256 = "b008b8767060459644fe8a1221b6b02710393d8074d685dc60f188424c6272fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ro/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ro/firefox-97.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "11ac629ea7b38db0043e9563fc5d75ea26ad75b0a3565d12798d56d2c7256992"; + sha256 = "9716c8abba493f6f2f627276aeeb0e7a434301bf59142a0ec90a35f0d683df89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ru/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ru/firefox-97.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "2cc4cc849625dfc20a3dcdfa3a964218b521d4271c0cc166312b016948944b33"; + sha256 = "8cb413a6ca340356c9ba3500e6e683d7d6e807b56e44651f69252e82d31f2484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sco/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sco/firefox-97.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "956160210c34a207a129a08667c3c3a3f978ad444a3f524e5cf4ce3406205c3b"; + sha256 = "a6df0b4240863b6a41f8a10d3d73577e0391cb98fecc82b544ea33099cff2d15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/si/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/si/firefox-97.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "68b2d054ed0af6e2608b42f958e5790d22552882ae2c143fd5a35b755232577b"; + sha256 = "bc7bbe3c418d78afca0ab5f1907ee6d95e7e1488101e2adea56e4efc3ee53584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sk/firefox-97.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5e5f318c5783feedcdd155afd7b2755fe0db513766378d823bec141a34245d73"; + sha256 = "56f7be236c7d0135e6d3a9fe2e7d173c7f7c9c95dd46f170ed616dba8d1c4edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sl/firefox-97.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "75be9829bc9b3e9167eac5c24a9c1d091a7f932c99c496b7a07c0d438523ba13"; + sha256 = "eb4c4c11ef6f853d88447a96381093ac37130728ef131a6ec7f74a84803298df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/son/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/son/firefox-97.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "eb18e65b5ff61953e8a8a2eff766dd13b9ecc5ce66179108eeb919b64219efcc"; + sha256 = "49cad9188901a1fda74afab30dbc430c465c2a8f91b03499d5bf55f361ec9c97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sq/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sq/firefox-97.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "e21779796d19e344b518cc06106d9da298430dea03842c37e7856676999e57f4"; + sha256 = "c2080aa59871af97b1ebba2e25f32fc0ab88cf5c407c43f63406dcc3c2fa5087"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sr/firefox-97.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "12ff3eb22ea684b81909f9c03a4ce2ea802d6160bf1b7b939a808b28ad042d7e"; + sha256 = "e4c0723595f741bc306a066b96c11f8c125c1e7cf2c70998548a8b77375fa8ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sv-SE/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sv-SE/firefox-97.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ed48713a2c50e806fa4ecb082bf87765e00f4b496f7087ac642d4b7d5287a373"; + sha256 = "665d95546dbcf38e91102a559ad7063052b8554f5f8799c127231b93d0d75744"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/szl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/szl/firefox-97.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "0a8335399ff54640d374c0c1035a4ba74a0a88b3940c02e7351c0372be4efd3e"; + sha256 = "f85aca1b01a2ae08915c893d25ce6243c405fe3e32f18cc28e111451cae006b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ta/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ta/firefox-97.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "6d39220c2d88014acbfcb0d6ac93f1539a668b787a26acd31b80312f59f6be12"; + sha256 = "3d263a4ab9991f25cdc130f42f8bf37212f06fd614966cec0f42a9e5e3585a1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/te/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/te/firefox-97.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "f037e673f47ce4569eec2525be5c1b903ffe0df71e322eeda033c91cc92cdd0b"; + sha256 = "59ad98ba6c2b4f9eab95c200ca36d884fc7b7d99e0c121fc7bd8867a2a1cad05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/th/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/th/firefox-97.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "dc7aae98e8b4928f7b3b703aeca5d07aa1a820efb5bf34b1d07d9360b2eefbec"; + sha256 = "c1f73e025dad87d5314093abbeabef1e0107dd4f29c3a8cec2f7ab1c01d8a0e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/tl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/tl/firefox-97.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "1fac0d3b63677d85d1921a7b9a9e81bb45be52a63ddeaa679022a9178acb2081"; + sha256 = "a71fcb2727d70e02bb2d50e1284b4c783d227c2da3940c918c7e7eaa2cebbbda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/tr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/tr/firefox-97.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "d380b853b024daa0c11a34ce80c90b1840a2439b89b9f471ed1d483577c9e297"; + sha256 = "597a37f249f46ec9bedc4605afb5c13b213c4eee1d1544a1f74a645446d92e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/trs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/trs/firefox-97.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "4b143569552d987f05fa482c481b846398cc45fa98edb59b257764762198a5f2"; + sha256 = "f6a93b3835aabe44781fb73985193d6c704202cefdcc2823ea77cb13df8844ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/uk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/uk/firefox-97.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a6df28358b227cbc03887ecc6e3ef516a71b09050fed3ba19f13a7bba8fe7f3f"; + sha256 = "ba11ca8bf215bf0190b273374228db3019baa6db85a5acb372dbe550d94148fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ur/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ur/firefox-97.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "0eb5d0680e985acc6bd5dc9602080c953a0664260e0ad62ba697b9a13b0282ca"; + sha256 = "61e9becb283fdd38961bc79629e332946fc449d40b37163d46303de9dab2eb26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/uz/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/uz/firefox-97.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a1916a60680587dad773be1a63eb6a8959d84d08ffd3aaf9c062d12a7bb9f1fa"; + sha256 = "9e47cd99a5a5309c7b388a4e17e0101558bfdd397ad0caee82902e8d56d652e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/vi/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/vi/firefox-97.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b4072149b45d7514af7260f1f13605823dc3420c5f45198266503f3a9e42119f"; + sha256 = "e2fb08af58be123b81edf9d7ec0dd532388fb81a7cf9a2952012b5758f5329f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/xh/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/xh/firefox-97.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ed0c483448b2eeff1adac520be15dee6ecff162f0420669902e565eaf30e0dd2"; + sha256 = "cc19114d522b0e9bf00dd2293e80643919229262afb01316e95e34f4fc18dbca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/zh-CN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/zh-CN/firefox-97.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c1416988cbff23e6a68a04ff54b65fe11909dba59e9a0b2709a5ce4599a9d8aa"; + sha256 = "11c608bb9511dc12e8c55d31fbf322a2524aec99ce90fea35a5d83d7282976d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/zh-TW/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/zh-TW/firefox-97.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ee7b2c30ae3e685f631a132ef1992b6b59c189781385ef0823330ee24fd4d43e"; + sha256 = "6a0268efa615f9559d258cfc05f113d54700d81c5ca0546054c10b9879d76d2d"; } ]; } From 21a7a51f8266f94d160d1f499626993f70ea1925 Mon Sep 17 00:00:00 2001 From: Tomislav Markovski Date: Mon, 7 Feb 2022 16:09:16 -0500 Subject: [PATCH 037/194] trinsic-cli: 1.1.2 -> 1.3.0 --- pkgs/tools/admin/trinsic-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/trinsic-cli/default.nix b/pkgs/tools/admin/trinsic-cli/default.nix index fb129760dc2f..d8e084218d43 100644 --- a/pkgs/tools/admin/trinsic-cli/default.nix +++ b/pkgs/tools/admin/trinsic-cli/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "trinsic-cli"; - version = "1.1.2"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; - sha256 = "7e5377e8460ebb1253b9974e02d0077ffc58f2b4712cf7896f1bef7e9f580cd4"; + sha256 = "4ec8a02cf7cd31822668e97befe96f0a7a32b1103abfe27c1bff643d3bf16588"; }; cargoVendorDir = "vendor"; From d45c0bf61f9af1b0a0e060742bd8524dee6c3131 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Mon, 7 Feb 2022 22:48:58 +0100 Subject: [PATCH 038/194] qownnotes: 22.1.11 -> 22.2.1 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 50f74330ecc3..37099496b666 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.1.11"; + version = "22.2.1"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "7fa21ca9b8b0df6f1bda7a7dc21d53642eccf8de6a31a9a29a251e0a17c00c83"; + sha256 = "26dfd41430e9efa5cc93c2d67156387a564efd0843c2020284658100b298d54c"; }; nativeBuildInputs = [ qmake qttools ]; From 33a0ea3a3bde4cc9702007690b11f72761ed0f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20M=C3=BCller?= Date: Mon, 7 Feb 2022 22:01:54 -0300 Subject: [PATCH 039/194] tmuxPlugins.cpu: unstable-2020-07-25 -> unstable-2021-12-15 --- pkgs/misc/tmux-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index b04a54874571..9c7044922740 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -132,12 +132,12 @@ in rec { cpu = mkTmuxPlugin { pluginName = "cpu"; - version = "unstable-2020-07-25"; + version = "unstable-2021-12-15"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-cpu"; - rev = "20120a38ade17057441482b43eb5390e6ea2c1c1"; - sha256 = "1gdz2awyd9icvyiw2p40gwymh6ngjhb9mkiv63ix53snp9ii794i"; + rev = "9eb3dba66672c5b43065e144cc3a1031f77ad67e"; + sha256 = "sha256-v/jZxsa+JwsSKjmA32VK/4gBNHP/SyOzTaYSSz2c0+4="; }; }; From 08836b254e9bbb684d50b2320e0969466e2bda75 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 8 Feb 2022 02:33:52 +0100 Subject: [PATCH 040/194] gforth: enable swig bindings --- pkgs/development/compilers/gforth/default.nix | 37 +++++++------------ .../compilers/gforth/fix-install-txt.patch | 25 ------------- pkgs/development/compilers/gforth/swig.nix | 16 ++++++++ 3 files changed, 30 insertions(+), 48 deletions(-) delete mode 100644 pkgs/development/compilers/gforth/fix-install-txt.patch create mode 100644 pkgs/development/compilers/gforth/swig.nix diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index 22a7d35ec8f9..d184ec3748f7 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -1,40 +1,32 @@ -{ lib, stdenv, callPackage, autoreconfHook, texinfo, fetchFromGitHub -, swig, libffi +{ lib, stdenv, fetchFromGitHub, callPackage +, autoreconfHook, texinfo, libffi }: -let - version = "0.7.9_20211111"; - sha256 = "sha256-KwYPMWdsL9o8SVcNdENMs4C9ioFBEfyVMqe5bgIrfzs="; - ## FIXME build https://github.com/GeraldWodni/swig with gforth, then rebuild - #### This will get rid of the configuration warning - # swigf = swig.overrideDerivation (old: { - # configureFlags = old.configureFlags ++ [ - # "--enable-forth" - # ]; - # }); - bootForth = callPackage ./boot-forth.nix { }; -in stdenv.mkDerivation { - pname = "gforth"; - inherit version; +let + swig = callPackage ./swig.nix { }; + bootForth = callPackage ./boot-forth.nix { }; +in stdenv.mkDerivation rec { + + name = "gforth-${version}"; + version = "0.7.9_20220127"; + src = fetchFromGitHub { owner = "forthy42"; repo = "gforth"; rev = version; - inherit sha256; + sha256 = "sha256-3+ObHhsPvW44UFiN0GWOhwo7aiqhjwxNY8hw2Wv4MK0="; }; - patches = [ ./fix-install-txt.patch ]; nativeBuildInputs = [ - autoreconfHook texinfo bootForth + autoreconfHook texinfo bootForth swig ]; buildInputs = [ - swig libffi + libffi ]; passthru = { inherit bootForth; }; - configureFlags = - lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; + configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp @@ -47,5 +39,4 @@ in stdenv.mkDerivation { license = lib.licenses.gpl3; platforms = lib.platforms.all; }; - } diff --git a/pkgs/development/compilers/gforth/fix-install-txt.patch b/pkgs/development/compilers/gforth/fix-install-txt.patch deleted file mode 100644 index 71f67e6fe65e..000000000000 --- a/pkgs/development/compilers/gforth/fix-install-txt.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c03408921ee8f5592e19cfcb64132a320fbd6279 Mon Sep 17 00:00:00 2001 -From: Herwig Hochleitner -Date: Thu, 9 Sep 2021 18:19:42 +0200 -Subject: [PATCH 1/2] fix install-txt task - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 5fe49787..51ad67c6 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -839,7 +839,7 @@ install-gensources: - done - echo "\\ empty site-init" > $(siteforthdir)/siteinit.fs - --install-txt: doc -+install-txt: txt - $(INSTALL_DATA) doc/gforth.txt $(datadir)/gforth/$(VERSION)/doc/gforth.txt - - install-images: install-txt --- -2.33.0 - diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/development/compilers/gforth/swig.nix new file mode 100644 index 000000000000..8de29407cc46 --- /dev/null +++ b/pkgs/development/compilers/gforth/swig.nix @@ -0,0 +1,16 @@ +{ swig3, fetchFromGitHub }: + +## for updating to swig4, see +## https://github.com/GeraldWodni/swig/pull/6 +swig3.overrideDerivation (old: { + version = "3.0.9-forth"; + src = fetchFromGitHub { + owner = "GeraldWodni"; + repo = "swig"; + rev = "a45b807e5f9d8ca1a43649c8265d2741a393862a"; + sha256 = "sha256-6nOOPFGFNaQInEkul0ZAh+ks9n3wqCQ6/tbduvG/To0="; + }; + configureFlags = old.configureFlags ++ [ + "--enable-forth" + ]; +}) From a48d6c4cb8b16c8c7148674f8ad27497b1d38f17 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 01:08:49 +0100 Subject: [PATCH 041/194] python3Packages.python-ipmi: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/python-ipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index 7f8b8fe58a77..cbd68f387656 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kontron"; repo = pname; rev = version; - sha256 = "0rcix3q845zsmfj5857kq1r5b8m7m3sad34i23k65m0p58clwdqm"; + sha256 = "sha256-VXWSoVRfgJWf9rOT4SE1mTJdeNmzR3TRc2pc6Pp1M5U="; }; propagatedBuildInputs = [ From ecc4121b433bb1c4dbed328f945cb38163bc5c8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 01:03:55 +0100 Subject: [PATCH 042/194] python3Packages.motionblinds: 0.5.10 -> 0.5.11 --- pkgs/development/python-modules/motionblinds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 6e9946cce16b..9151bb736fec 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.5.10"; + version = "0.5.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = version; - sha256 = "0zz5ardnik370pdfpl77m0hln8rj7ikkvrkyc6fm0vd0w12sihmm"; + sha256 = "sha256-XvxEYOIYjr1NcviyQ6N8xHPCnUO+IgMKFsiRa5YnLDM="; }; propagatedBuildInputs = [ From c7b9a48569acdb4b8384528d2acc074907b7242d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 01:14:39 +0100 Subject: [PATCH 043/194] python3Packages.plexapi: 4.9.1 -> 4.9.2 --- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 4a21cebcabd2..ef702b93adb1 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.9.1"; + version = "4.9.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "0c0zhbq6ggn5ck4cgbr92440xhfk3iz5a8fm25909idlx8vw0s3q"; + sha256 = "sha256-93qMSOnCl18dRZQB8v2Cxv21vsdFzHefQ7zttQAuPKk="; }; propagatedBuildInputs = [ From 3b050bd9c3a972cf090211a0767dded75ab9a572 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 7 Feb 2022 21:50:20 -0500 Subject: [PATCH 044/194] gforth: use pname --- pkgs/development/compilers/gforth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index d184ec3748f7..3b60d9fb179f 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -7,7 +7,7 @@ let bootForth = callPackage ./boot-forth.nix { }; in stdenv.mkDerivation rec { - name = "gforth-${version}"; + pname = "gforth"; version = "0.7.9_20220127"; src = fetchFromGitHub { From ca402a454736274d75604a1a80c40a1cc1571140 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 00:34:08 +0100 Subject: [PATCH 045/194] python3Packages.pywizlight: 0.5 -> 0.5.2 --- pkgs/development/python-modules/pywizlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 620463c98638..7c94f232de65 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.5"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hw8fNguIqQslea44hiLgh6FntfKHFG1UeVYIvmu5nTw="; + sha256 = "sha256-/euT77CAcfM9gMBV4SQsJWn6+JWcmqGNN8NGGX93xSg="; }; propagatedBuildInputs = [ From 5e78d68b2dcbf5c020da12e41afecc26665a4bb5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 00:42:03 +0100 Subject: [PATCH 046/194] python3Packages.adafruit-platformdetect: 3.19.4 -> 3.19.5 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index c8caf18aa176..52ecac90b10b 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.4"; + version = "3.19.5"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-b/uAmrFdAtmXUjaW038mKeZgWHCSIEzCZvCy/9Z3ghw="; + sha256 = "sha256-vbiMD0En11VDJUGnEc5ww0AhQ12vkbTCm/pqF7wnywI="; }; nativeBuildInputs = [ From 26ca9776aae60d81721e242defa73cfe7a53e061 Mon Sep 17 00:00:00 2001 From: David Lewis Date: Wed, 19 Jan 2022 20:08:32 +0000 Subject: [PATCH 047/194] nixos/autorandr: added new KillMode Prevents Udev Rule from killing processes started by autorandr --- nixos/modules/services/misc/autorandr.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 95cee5046e81..a65c5c9d11cf 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -43,6 +43,7 @@ in { ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default ${cfg.defaultTarget}"; Type = "oneshot"; RemainAfterExit = false; + KillMode = "process"; }; }; From 9482d8e0606e1a2bfa1092dd8929099476bae002 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 00:57:05 +0100 Subject: [PATCH 048/194] python3Packages.whodap: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/whodap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index 6bd22c56b955..d4f6913105f2 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.3"; + version = "0.1.4"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "v${version}"; - sha256 = "1pcn2jwqfvp67wz19lcpwnw0dkbc61bnbkzxlmac1yf2pz9ndn6l"; + sha256 = "sha256-L8fSf9AhmWbRvLKvf0aowKoal+5dG1SJXcA7Ssrhj6o="; }; propagatedBuildInputs = [ From e859a7ce297cfdb2544107d78b39bf550056aad3 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Mon, 7 Feb 2022 22:44:07 +0000 Subject: [PATCH 049/194] python3Packages.python-i18n: init at 0.3.9 --- .../python-modules/python-i18n/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/python-i18n/default.nix diff --git a/pkgs/development/python-modules/python-i18n/default.nix b/pkgs/development/python-modules/python-i18n/default.nix new file mode 100644 index 000000000000..349532ac523e --- /dev/null +++ b/pkgs/development/python-modules/python-i18n/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pyyaml }: + +buildPythonPackage rec { + pname = "python-i18n"; + version = "0.3.9"; + + src = fetchFromGitHub { + owner = "danhper"; + repo = pname; + rev = "v${version}"; + sha256 = "6FahoHZqaOWYGaT9RqLARCm2kLfUIlYuauB6+0eX7jA="; + }; + + checkInputs = [ pytestCheckHook pyyaml ]; + + pytestFlagsArray = [ "i18n/tests/run_tests.py" ]; + + meta = with lib; { + description = "Easy to use i18n library"; + homepage = "https://github.com/danhper/python-i18n"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88feec617dde..b0dd74e7ac7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7966,6 +7966,8 @@ in { python-http-client = callPackage ../development/python-modules/python-http-client { }; + python-i18n = callPackage ../development/python-modules/python-i18n { }; + pythonix = callPackage ../development/python-modules/pythonix { nix = pkgs.nixVersions.nix_2_3; meson = pkgs.meson.override { python3 = self.python; }; From 6ea5ed2a7d1ab718f5d7528db10f131119379c31 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Mon, 7 Feb 2022 22:44:35 +0000 Subject: [PATCH 050/194] python3Packages.pygame-gui: 0.5.7 -> 0.6.4 --- .../python-modules/pygame-gui/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index 58f65b6d0f41..55cf1e36dec8 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -3,21 +3,23 @@ , buildPythonPackage , fetchFromGitHub , pygame +, python-i18n , pytestCheckHook }: buildPythonPackage rec { pname = "pygame-gui"; - version = "0.5.7"; + version = "0.6.4"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "v_${lib.replaceStrings ["."] [""] version}"; - sha256 = "4P2PT8/7oA5Q7H4+pm7BOET7w05pQYQltXVV3+YVrVE="; + sha256 = "13+fK1hYxiMh0T+xbbmHViZjyBoQfRyIDc05fIJ/46U="; }; - propagatedBuildInputs = [ pygame ]; + propagatedBuildInputs = [ pygame python-i18n ]; postPatch = '' substituteInPlace pygame_gui/core/utility.py \ @@ -44,6 +46,10 @@ buildPythonPackage rec { "test_process_event_text_ctrl_x" ]; + disabledTestPaths = [ + "tests/test_performance/test_text_performance.py" + ]; + meta = with lib; { description = "A GUI system for pygame"; homepage = "https://github.com/MyreMylar/pygame_gui"; From 22c9c238906e6f9374eb56884a8bdc90ee6a2694 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 00:46:47 +0100 Subject: [PATCH 051/194] python3Packages.cdcs: 0.1.5 -> 0.1.6 --- pkgs/development/python-modules/cdcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cdcs/default.nix b/pkgs/development/python-modules/cdcs/default.nix index 9dd8a272395b..ec11019cc9a7 100644 --- a/pkgs/development/python-modules/cdcs/default.nix +++ b/pkgs/development/python-modules/cdcs/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "0.1.5"; + version = "0.1.6"; pname = "cdcs"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = "pycdcs"; rev = "v${version}"; - sha256 = "0sd0s0mka2bvpxxiz98cjc2h5ncsb7d03af1q3w9w8pmvfsgj7pc"; + sha256 = "sha256-w9CBNOK9oXTIUa+SsnepRN0wAz7WPZGfUNDSbtVn1L8="; }; propagatedBuildInputs = [ From e7d968cab232703324c9fbc693c92b06f192ddbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 10:39:05 +0000 Subject: [PATCH 052/194] rofi-file-browser: 1.3.0 -> 1.3.1 --- pkgs/applications/misc/rofi-file-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix index 7a86ef0f2325..0dff62cca229 100644 --- a/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rofi-file-browser-extended"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "marvinkreis"; repo = pname; rev = version; - sha256 = "sha256-TNAAImQaIJRgvD8kFf2oHNj4bQiq1NhD8KkCgW5dSK8="; + sha256 = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw="; fetchSubmodules = true; }; From cb7ea19d9751f018280dbc5cbc5cc1947c9ae77f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Feb 2022 06:14:52 +0000 Subject: [PATCH 053/194] deep-translator: 1.6.1 -> 1.7.0 --- pkgs/development/python-modules/deep-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index cdc18f159fb9..0f67b2ae3529 100644 --- a/pkgs/development/python-modules/deep-translator/default.nix +++ b/pkgs/development/python-modules/deep-translator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "2611c54209b234730f3e5e6481cb875e120e49d9ec1a27a1fa89850150485975"; + sha256 = "sha256-k4RhUZN/aC9D1NKkmCGZGZNU9In577RobBnDagMYHbo="; }; propagatedBuildInputs = [ From f3de2598a91460bae912d99a7fbc769a016dad55 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 8 Feb 2022 02:17:47 +0100 Subject: [PATCH 054/194] spicetify-cli: 2.8.5 -> 2.9.0 --- pkgs/applications/misc/spicetify-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 539cebedcb63..a3aafaf4ef0c 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.8.5"; + version = "2.9.0"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cCIlKTHo+LyhIZkN6ncggBvZMwDBgXqDJVAfGWbUtj8="; + sha256 = "sha256-PHKmrLN/JVPqefcK1FQByPWvMzNxHG5htXzgZ1D+Eds="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; From 581e8e6011cbd86c281a5e65850436369d50bca2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 01:00:45 +0100 Subject: [PATCH 055/194] python3Packages.skodaconnect: 1.1.17 -> 1.1.18 --- pkgs/development/python-modules/skodaconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 16ffaf9393ad..3d1566bac470 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.1.17"; + version = "1.1.18"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = version; - hash = "sha256-aMyowz5+4Iu7bb8FSnHzx6QGp1WzzMXQZI23OZcr/kM="; + hash = "sha256-etcNdiuCgOe08HkOL+kXACoBAouDGUBqpaKUercud84="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 9dba1d065024ee708de867a8764cb2098198641b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 00:53:38 +0100 Subject: [PATCH 056/194] python3Packages.aionanoleaf: 0.1.1 -> 0.2.0 --- pkgs/development/python-modules/aionanoleaf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aionanoleaf/default.nix b/pkgs/development/python-modules/aionanoleaf/default.nix index 61b958d84486..40686bf7d113 100644 --- a/pkgs/development/python-modules/aionanoleaf/default.nix +++ b/pkgs/development/python-modules/aionanoleaf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aionanoleaf"; - version = "0.1.1"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "milanmeu"; repo = pname; rev = "v${version}"; - sha256 = "10gi8fpv3xkdjaqig84723m3j0kxgxvqwqvjxmysq2sw4cjmsvz6"; + sha256 = "sha256-bz568DlodWtSu2WTTd/QMhdiX9IkllW7UYVXuNlKFaY="; }; propagatedBuildInputs = [ From f109a5a01f94a8a7f0108c412fcc7086e00e4d90 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 8 Feb 2022 01:22:39 +0200 Subject: [PATCH 057/194] pmbootstrap: 1.40.0 -> 1.41.0 --- pkgs/tools/misc/pmbootstrap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix index 32595e17c06f..913bfc00a158 100644 --- a/pkgs/tools/misc/pmbootstrap/default.nix +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "pmbootstrap"; - version = "1.40.0"; + version = "1.41.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-b/9NEURp42d/j/Fk8NUS0ZAG99q56eg0pEU/xkFnvrM="; + sha256 = "sha256-go3EXmC9Vp0xXi1mH65p85FKsTe0CbyNXw3VVRrnpeQ="; }; repo = fetchFromGitLab { @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "postmarketOS"; repo = pname; rev = version; - sha256 = "sha256-2yyHAHoIlwHX2+LbwwK7AGrBDZlfkhtCcKAKHdJMBdQ="; + sha256 = "sha256-7Y4rxSdJQaIlq4yiadvrEro0JM5xoHeISDKHz69T4z8="; }; pmb_test = "${repo}/test"; From 5e7ec2c9adf6981a47396215b49c4690a043e8b3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 7 Feb 2022 21:01:38 +1000 Subject: [PATCH 058/194] nixos/doc/2205: add note for `go_1_17` `vendorSha256` --- .../doc/manual/from_md/release-notes/rl-2205.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 11 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 29aa70fd6165..2ec83dab09f7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -317,6 +317,15 @@ writers.writePyPy2 needs to be used. + + + buildGoModule was updated to use + go_1_17, third party derivations that + specify >= go 1.17 in the main go.mod + will need to regenerate their vendorSha256 + hash. + + The gnome-passwordsafe package updated to diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index c4ace1366f2f..ffb207503f84 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -105,6 +105,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter. Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used. +- `buildGoModule` was updated to use `go_1_17`, third party derivations that specify >= go 1.17 in the main `go.mod` will need to regenerate their `vendorSha256` hash. + - The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`. - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`. From b4ba1f9aa77f8fe58ed909bd5ae75b8b928dfb0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Feb 2022 09:35:30 +0000 Subject: [PATCH 059/194] rpm-ostree: 2022.1 -> 2022.2 --- pkgs/tools/misc/rpm-ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 4f3a4ef985b2..09422cd2d4bc 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2022.1"; + version = "2022.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-v7vAj045gLHdH1kQ9oMnLLBYXu/oWOW+MS+m7w2VoW0="; + sha256 = "sha256-wy6zmVy7+31+wadLldWdf/IyT0dyLArYLmGw/Kgd+sU="; }; nativeBuildInputs = [ From 33782d5c0a20a35413843c2507033b88f3b10e8e Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 7 Feb 2022 20:29:10 +0000 Subject: [PATCH 060/194] ginkgo: 2.1.0 -> 2.1.1 --- pkgs/development/tools/ginkgo/default.nix | 27 ++++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 49404d051344..e6c5c1ebf561 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,21 +2,36 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-GF96AOyQcVI01dP6yqMwyPmXMDRVxrScu1UL76jF2qA="; + sha256 = "sha256-iAXqPbNBNNR6PGhIjrDqTYUu0XYgvS5aM8n68qQNurQ="; }; vendorSha256 = "sha256-kMQ60HdsorZU27qoOY52DpwFwP+Br2bp8mRx+ZwnQlI="; - doCheck = false; + + # integration tests expect more file changes + # types tests are missing CodeLocation + excludedPackages = "\\(integration\\|types\\)"; meta = with lib; { - description = "BDD Testing Framework for Go"; - homepage = "https://github.com/onsi/ginkgo"; + homepage = "https://onsi.github.io/ginkgo/"; + changelog = "https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md"; + description = "A Modern Testing Framework for Go"; + longDescription = '' + Ginkgo is a testing framework for Go designed to help you write expressive + tests. It is best paired with the Gomega matcher library. When combined, + Ginkgo and Gomega provide a rich and expressive DSL + (Domain-specific Language) for writing tests. + + Ginkgo is sometimes described as a "Behavior Driven Development" (BDD) + framework. In reality, Ginkgo is a general purpose testing framework in + active use across a wide variety of testing contexts: unit tests, + integration tests, acceptance test, performance tests, etc. + ''; license = licenses.mit; - maintainers = with maintainers; [ saschagrunert ]; + maintainers = with maintainers; [ saschagrunert jk ]; }; } From c100cfcddaa99b3a46dc2fd0b2fe3b0ac53e3394 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 7 Feb 2022 13:33:47 -0800 Subject: [PATCH 061/194] cargo-fuzz: 0.10.2 -> 0.11.0 --- pkgs/development/tools/rust/cargo-fuzz/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index 22fe3a2b19ce..5893fd2c828c 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "rust-fuzz"; repo = "cargo-fuzz"; - rev = version; - sha256 = "sha256-5dHEUGn2CrEpSTJsbnSRx/hKXx6dLCDcuD1dPOH49d4="; + rev = "v${version}"; + sha256 = "sha256-vjKo0L7sYrC7qWdOGSJDWpL04tmNjO3QRwAIRHN/DiI="; }; - cargoSha256 = "sha256-vZPd8Zzyp0PgIdyp5qY57ex0cCihplw/FY+xf3etuu8="; + cargoSha256 = "sha256-8XVRMwrBEJ1duQtXzNpuN5wJPUgziJlka4n/nAIqeEc="; buildInputs = lib.optional stdenv.isDarwin libiconv; From 88a62d1cc8d913eba765a7a3e23476c45b58bf47 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 7 Feb 2022 17:40:56 +0000 Subject: [PATCH 062/194] =?UTF-8?q?wireplumber:=200.4.7=20=E2=86=92=200.4.?= =?UTF-8?q?8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/pipewire/wireplumber.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index dc14a4b8017d..9ab197278d0a 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -27,7 +27,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.7"; + version = "0.4.8"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -36,18 +36,9 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-yp4xtp+s+h+43LGVtYonoJ2tQaLRfwyMY4fp8z1l0CM="; + sha256 = "sha256-xwfggrjKHh5mZdvH6dKqQo6o1ltxuYdjoGYaWl31C/Y="; }; - patches = [ - # backport a fix for default device selection - # FIXME remove this after 0.4.8 - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317.patch"; - sha256 = "sha256-EGcbJ8Rq/5ft6SV0VC+mTkhVE7Ycze4TL6AVc9KH7+M="; - }) - ]; - nativeBuildInputs = [ meson pkg-config From fd3be5cd566457847333ff2f8fbfd1b07c8a2541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Feb 2022 18:03:20 +0100 Subject: [PATCH 063/194] gotests: 1.5.3 -> 1.6.0 --- pkgs/development/tools/gotests/default.nix | 26 +++++++++++----------- pkgs/development/tools/gotests/deps.nix | 12 ---------- 2 files changed, 13 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/tools/gotests/deps.nix diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index faa2e60aca40..d0d5025b31a4 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -1,25 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gotests"; - version = "1.5.3"; - rev = "v${version}"; - - goPackagePath = "github.com/cweill/gotests"; - excludedPackages = "testdata"; - goDeps = ./deps.nix; + version = "1.6.0"; src = fetchFromGitHub { - inherit rev; owner = "cweill"; repo = "gotests"; - sha256 = "1c0hly31ax0wk01zdx0l0yl40xybaizjfb3gjxia2z0mgx330dq9"; + rev = "v${version}"; + sha256 = "sha256-6IzUpAsFUgF2FwiC17OfDn1M+8WYFQPpRyXbkpHIztw="; }; - meta = { + vendorSha256 = "sha256-WMeHZN3s+8pIYEVaSLjI3Bz+rPTWHr1AkZ8lydjBwCw="; + + # tests are broken in nix environment + doCheck = false; + + meta = with lib; { description = "Generate Go tests from your source code"; homepage = "https://github.com/cweill/gotests"; - maintainers = with lib.maintainers; [ vdemeester ]; - license = lib.licenses.asl20; + maintainers = with maintainers; [ vdemeester ]; + license = licenses.asl20; }; } diff --git a/pkgs/development/tools/gotests/deps.nix b/pkgs/development/tools/gotests/deps.nix deleted file mode 100644 index df411303d944..000000000000 --- a/pkgs/development/tools/gotests/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "23463209683dad3f2b9cc7f7c2663e1847c59017"; - sha256 = "1shzfl4zixhj78v4f6y04bcmfl705yr5q8hp72ndbbma0mh09g8f"; - }; - } -] From 227e220be6dfec38eb733f614095debd95d3bf12 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 7 Feb 2022 17:36:47 +0100 Subject: [PATCH 064/194] pikchr -> unstable-2021-07-22 -> unstable-2022-01-30 --- pkgs/tools/graphics/pikchr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/tools/graphics/pikchr/default.nix index ca4f647dfa2d..6e2517beccec 100644 --- a/pkgs/tools/graphics/pikchr/default.nix +++ b/pkgs/tools/graphics/pikchr/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation { pname = "pikchr"; # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk - version = "unstable-2021-07-22"; + version = "unstable-2022-01-30"; src = fetchurl { - url = "https://pikchr.org/home/tarball/d9e1502ed74c6aab/pikchr.tar.gz"; - sha256 = "sha256-YSy95GiSodOS1YJgl9arBniqEJzYPrZ9CHNSCee9Yfg="; + url = "https://pikchr.org/home/tarball/5db3aa1d294dcd16/pikchr.tar.gz"; + sha256 = "sha256-xnT2oOx4LK9CElXeAuQIKlu6WvMB8Nv5+2kBzWQ5Gpc="; }; # can't open generated html files From 690c6dd1d3425eafe7b7d5d5ec80ba5fe241d33f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 7 Feb 2022 18:49:38 +0100 Subject: [PATCH 065/194] toppler: 1.1.6 -> 1.3 --- pkgs/games/toppler/default.nix | 57 +++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/pkgs/games/toppler/default.nix b/pkgs/games/toppler/default.nix index ffe807410bb4..890e13498747 100644 --- a/pkgs/games/toppler/default.nix +++ b/pkgs/games/toppler/default.nix @@ -1,34 +1,61 @@ -{ lib, stdenv -, fetchurl -, SDL -, SDL_mixer +{ lib +, stdenv +, fetchFromGitLab + +, pkg-config +, gettext +, povray +, imagemagick +, gimp + +, SDL2 +, SDL2_mixer +, SDL2_image +, libpng , zlib }: stdenv.mkDerivation rec { pname = "toppler"; - version = "1.1.6"; + version = "1.3"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ifccissd8sh78kpwh7dafx4ah7hkhqz6nf4z2hdnalw702jkg3x"; + src = fetchFromGitLab { + owner = "roever"; + repo = "toppler"; + rev = "v${version}"; + sha256 = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330="; }; + nativeBuildInputs = [ + pkg-config + gettext + povray + imagemagick + gimp + ]; + buildInputs = [ - SDL - SDL_mixer + SDL2 + SDL2_mixer + SDL2_image + libpng zlib ]; - # The conftest hangs on Hydra runners, because they are not logged in. - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + # GIMP needs a writable home + preBuild = '' + export HOME=$(mktemp -d) + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + hardeningDisable = [ "format" ]; meta = with lib; { description = "Jump and run game, reimplementation of Tower Toppler/Nebulus"; - homepage = "http://toppler.sourceforge.net/"; - license = licenses.gpl2; + homepage = "https://gitlab.com/roever/toppler"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; } - From 16a5e376afe71c0962c37cd6f3974cd7fdf6ce91 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 7 Feb 2022 22:21:51 +0300 Subject: [PATCH 066/194] =?UTF-8?q?gpxsee:=2010.1=20=E2=86=92=2010.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 75079967dbeb..ad568863d28c 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "10.1"; + version = "10.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-tU37dKBxzz+sxe4R7xbscpD28if8QOm6xpZEOdhK8lE="; + sha256 = "sha256-rKUj2XeVI2KdyCinwqipINg9OO0IhCSFBjSeYBSMLcQ="; }; patches = (substituteAll { From 135a653a1c64976307e8bcc17b7394bdf37443d8 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 7 Feb 2022 23:49:22 +0800 Subject: [PATCH 067/194] cargo-cache: 0.7.0 -> 0.8.1 --- pkgs/development/tools/rust/cargo-cache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 62c9f9b97e55..4b9819c1990e 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "sha256-MPU+hmYfmWftVEkdT/sZx9ESgCPTb7m4lEnYf5bOSYU="; + sha256 = "sha256-e9mT+OpPDTBtvQx3BVekr38azzD2DaT715wYLHYkjtk="; }; - cargoSha256 = "sha256-6Ffgg5/B1IFnTlSjzhAsnhxz8jBcgk01RIkwgLqlsvc="; + cargoSha256 = "sha256-pVa7OLRlWMy7ZlLGTeePt86kK5y0OULOLYrq9GtOFRA="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 8219ba4f50badfa7d805581e494b99fc8e74654b Mon Sep 17 00:00:00 2001 From: Lux Date: Mon, 7 Feb 2022 14:35:14 +0100 Subject: [PATCH 068/194] schildichat: 1.9.7-sc.1 -> 1.9.8-sc.1 --- .../networking/instant-messengers/schildichat/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 30ca1e9f475a..aceeec448fdf 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.7-sc.1", - "srcHash": "0qrjjwcxa141phsgdz325rrkfmjqdmxc3h917cs9c9kf6cblkxaq", - "webYarnHash": "19c594pql2yz1z15phfdlkwcvrcbm8k058fcq7p0k6840dhif5fd", - "desktopYarnHash": "058ihkljb1swjzvgf8gqci5ghvwapmpcf2bsab3yr66lhps7fhci" + "version": "1.9.8-sc.1", + "srcHash": "1ki4ccsa2i0mv10ypxg6bx9njikipdqkc5bsq5h7bi86scjm4lni", + "webYarnHash": "1za6r0snrflh2605xw4m19p88chx19ip8jj592bqjdagildqm50l", + "desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18" } From 1201006163a60312bc0a1d1c803b165adb2bf332 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 7 Feb 2022 23:27:29 +0800 Subject: [PATCH 069/194] apt: 2.3.14 -> 2.3.15 --- pkgs/tools/package-management/apt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index d87eb6f0c536..511643e38af4 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.3.14"; + version = "2.3.15"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-uQo87RUuzTiaVdoRFeBFZb/L9fWKgIzbcfa1LU0vC98="; + hash = "sha256-JWIAfREJk91+eobdgeplDmEhAXm1nqxytu3/Y2TAu6Y="; }; nativeBuildInputs = [ From c73ce48659efd337f23e64bc431ccf98f19ede16 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 7 Feb 2022 21:27:23 +0300 Subject: [PATCH 070/194] =?UTF-8?q?libosmium:=202.17.3=20=E2=86=92=202.18.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index f0ddd26900f3..c9b346936f49 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.17.3"; + version = "2.18.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "sha256-XpC5gb19jPakYS3QSgOU6WnGad+VEoEtxyT38d9Beug="; + sha256 = "sha256-IPdaBT6hRNHo8kuOsiKdyiQkRxA/l+44U3qGGG89BTo="; }; nativeBuildInputs = [ cmake ]; From 5469552b2f8eb31eb7cfd5b6db4a0805d3fea293 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 7 Feb 2022 21:28:21 +0300 Subject: [PATCH 071/194] =?UTF-8?q?osmium-tool:=201.13.2=20=E2=86=92=201.1?= =?UTF-8?q?4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/osmium-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 7e63bf04eef2..a2f2a676aba1 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.13.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "sha256-dLYmY2bS+DycYBLZdLw8CsRIIE8EfDJEx6RZ/r9yMS8="; + sha256 = "sha256-xedunFzar44o+b/45isXWacDcC81wWkxgGwnpLPH/n0="; }; nativeBuildInputs = [ From 14d355b7c0262cbaddfc3090b9a6ef5eea2ee7c5 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 23 Sep 2021 19:55:14 -0500 Subject: [PATCH 072/194] shunit2: use resholvePackage --- pkgs/tools/misc/shunit2/default.nix | 62 ++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/tools/misc/shunit2/default.nix index 1895acacac27..07265fb89cd0 100644 --- a/pkgs/tools/misc/shunit2/default.nix +++ b/pkgs/tools/misc/shunit2/default.nix @@ -1,6 +1,15 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, resholvePackage +, fetchFromGitHub +, bash +, coreutils +, gnused +, gnugrep +, findutils +, ncurses +}: -stdenv.mkDerivation { +resholvePackage { pname = "shunit2"; version = "2019-08-10"; @@ -22,6 +31,55 @@ stdenv.mkDerivation { $out/bin/shunit2 ''; + solutions = { + shunit = { + # Caution: see __SHUNIT_CMD_ECHO_ESC before changing + interpreter = "${bash}/bin/sh"; + scripts = [ "bin/shunit2" ]; + inputs = [ coreutils gnused gnugrep findutils ncurses ]; + # resholve's Nix API is analogous to the CLI flags + # documented in 'man resholve' + fake = { + # "missing" functions shunit2 expects the user to declare + function = [ + "oneTimeSetUp" + "oneTimeTearDown" + "setUp" + "tearDown" + "suite" + "noexec" + ]; + # shunit2 is both bash and zsh compatible, and in + # some zsh-specific code it uses this non-bash builtin + builtin = [ "setopt" ]; + }; + fix = { + # stray absolute path; make it resolve from coreutils + "/usr/bin/od" = true; + /* + Caution: this one is contextually debatable. shunit2 + sets this variable after testing whether `echo -e test` + yields `test` or `-e test`. Since we're setting the + interpreter, we can pre-test this. But if we go fiddle + the interpreter later, I guess we _could_ break it. + */ + "$__SHUNIT_CMD_ECHO_ESC" = [ "'echo -e'" ]; + "$SHUNIT_CMD_TPUT" = [ "tput" ]; # from ncurses + }; + keep = { + # dynamically defined in shunit2:_shunit_mktempFunc + eval = [ "shunit_condition_" "_shunit_test_" "_shunit_prepForSourcing" ]; + + # dynamic based on CLI flag + "$_SHUNIT_LINENO_" = true; + }; + execer = [ + # drop after https://github.com/abathur/binlore/issues/2 + "cannot:${ncurses}/bin/tput" + ]; + }; + }; + meta = with lib; { homepage = "https://github.com/kward/shunit2"; description = "A xUnit based unit test framework for Bourne based shell scripts"; From 3325d1bc6298ba50baf82836a9b67773d6d81a2f Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 23 Sep 2021 19:59:16 -0500 Subject: [PATCH 073/194] shunit2: 2019-08-10 (unstable) -> 2.1.8 --- pkgs/tools/misc/shunit2/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/tools/misc/shunit2/default.nix index 07265fb89cd0..a0ec572a409d 100644 --- a/pkgs/tools/misc/shunit2/default.nix +++ b/pkgs/tools/misc/shunit2/default.nix @@ -9,15 +9,15 @@ , ncurses }: -resholvePackage { +resholvePackage rec { pname = "shunit2"; - version = "2019-08-10"; + version = "2.1.8"; src = fetchFromGitHub { owner = "kward"; - repo = "shunit2"; - rev = "ba130d69bbff304c0c6a9c5e8ab549ae140d6225"; - sha256 = "1bsn8dhxbjfmh01lq80yhnld3w3fw1flh7nwx12csrp58zsvlmgk"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IZHkgkVqzeh+eEKCDJ87sqNhSA+DU6kBCNDdQaUEeiM="; }; installPhase = '' @@ -82,8 +82,8 @@ resholvePackage { meta = with lib; { homepage = "https://github.com/kward/shunit2"; - description = "A xUnit based unit test framework for Bourne based shell scripts"; - maintainers = with maintainers; [ cdepillabout utdemir ]; + description = "An xUnit based unit test framework for Bourne based shell scripts"; + maintainers = with maintainers; [ abathur utdemir ]; license = licenses.asl20; platforms = platforms.unix; }; From d49eefbe6adce501e1831bf628c621df42d8d2cb Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sun, 9 Jan 2022 12:44:08 -0600 Subject: [PATCH 074/194] bats: use resholvePackage --- .../development/interpreters/bats/default.nix | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index f8fe2a46cc70..9cdde90c41d3 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,6 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, coreutils, gnugrep, ncurses, doCheck ? true }: +{ resholvePackage +, lib +, fetchFromGitHub +, bash +, coreutils +, gnugrep +, ncurses +, doInstallCheck ? true +}: -stdenv.mkDerivation rec { +resholvePackage rec { pname = "bats"; version = "1.5.0"; @@ -11,20 +19,34 @@ stdenv.mkDerivation rec { sha256 = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk="; }; - nativeBuildInputs = [ makeWrapper ]; - patchPhase = '' patchShebangs . ''; installPhase = '' ./install.sh $out - wrapProgram $out/bin/bats --suffix PATH : "${lib.makeBinPath [ bash coreutils gnugrep ]}" ''; - inherit doCheck; - checkInputs = [ ncurses ]; - checkPhase = '' + solutions = { + bats = { + scripts = [ "bin/bats" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ bash coreutils gnugrep ]; + fake = { + external = [ "greadlink" ]; + }; + fix = { + "$BATS_ROOT" = [ "${placeholder "out"}" ]; + }; + keep = { + "${placeholder "out"}/libexec/bats-core/bats" = true; + }; + }; + }; + + inherit doInstallCheck; + installCheckInputs = [ ncurses ]; + installCheckPhase = '' # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows sed -i '/test works even if PATH is reset/a skip' test/bats.bats From 8cc0ddad31b635a1d844571de29be92030befe40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 03:53:48 +0000 Subject: [PATCH 075/194] python310Packages.cocotb: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/cocotb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 7cf357cc4c65..d24d3bc79822 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.6.1"; + version = "1.6.2"; # - we need to use the tarball from PyPi # or the full git checkout (with .git) @@ -20,7 +20,7 @@ buildPythonPackage rec { # because it does not include required metadata src = fetchPypi { inherit pname version; - sha256 = "b644a15ea1e62c55041176468976541cba30a8a5e99a5e9a2c07ee595c2b4e95"; + sha256 = "sha256-SY+1727DbWMg6CnmHw8k/VP0dwBRYszn+YyyvZXgvUs="; }; nativeBuildInputs = [ setuptools-scm ]; From 582c36f56384560b3d62dce36d3ead51389072c9 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Mon, 7 Feb 2022 21:56:33 -0600 Subject: [PATCH 076/194] cl-wordle: 0.1.2 -> 0.2.0 --- pkgs/games/cl-wordle/default.nix | 6 +++--- pkgs/games/cl-wordle/rust-1-57.diff | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/games/cl-wordle/default.nix b/pkgs/games/cl-wordle/default.nix index e80dacc6470e..6426c058c377 100644 --- a/pkgs/games/cl-wordle/default.nix +++ b/pkgs/games/cl-wordle/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cl-wordle"; - version = "0.1.2"; + version = "0.2.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-mcPC2Lj+Vsytfl3+ghYn74QRfM6U4dQLUybtCqkjKlk="; + sha256 = "sha256-M2ljFrfIOyM1Slwsk7ZJ+PhJIVSUvFcFck2Q2e9nOwc="; }; - cargoSha256 = "sha256-3Ef8gLFWIAYpKdPixvILvDee5Gezh68hc9TR5+zRX0I="; + cargoSha256 = "sha256-bB6MzpJc8QS2+8GSS8RbSF5QcJyRT8FkmChpf1x2i/E="; patches = [ ./rust-1-57.diff ]; diff --git a/pkgs/games/cl-wordle/rust-1-57.diff b/pkgs/games/cl-wordle/rust-1-57.diff index 32b95bdaae97..b4c5721d8509 100644 --- a/pkgs/games/cl-wordle/rust-1-57.diff +++ b/pkgs/games/cl-wordle/rust-1-57.diff @@ -1,13 +1,13 @@ -diff --git a/src/bin/wordle/game.rs b/src/bin/wordle/game.rs -index 8500732..6f26e2a 100644 ---- a/src/bin/wordle/game.rs -+++ b/src/bin/wordle/game.rs -@@ -235,7 +235,7 @@ impl Display for GameShare { - score = self.score - )?; - for m in &self.matches { -- write!(f, "\n{m}")?; -+ write!(f, "\n{}", m)?; +diff --git a/src/state.rs b/src/state.rs +index 5fac0a3..41cbde4 100644 +--- a/src/state.rs ++++ b/src/state.rs +@@ -74,7 +74,7 @@ impl State { + 'X' + }; + +- write!(w, "{score}/6",)?; ++ write!(w, "{:?}/6", score)?; + for Guess(_, m) in self.guesses() { + write!(w, "\n{}", m)?; } - Ok(()) - } From 8b0b5be13a2415b12b83f9e573565a46a204d06b Mon Sep 17 00:00:00 2001 From: Will Young Date: Tue, 8 Feb 2022 04:01:47 +0000 Subject: [PATCH 077/194] foundationdb61: pin Boost dep to boost168 (#157967) --- pkgs/servers/foundationdb/cmake.nix | 2 +- pkgs/servers/foundationdb/default.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 2a94008a4e9a..98fd6ca79813 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -123,7 +123,7 @@ let homepage = "https://www.foundationdb.org"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice lostnet ]; }; }; in makeFdb diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index b3a876546e78..69e4ad9bd018 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -2,7 +2,7 @@ , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk -, python2, python3, openjdk, mono, libressl, boost +, python2, python3, openjdk, mono, libressl, boost168 }@args: let @@ -10,6 +10,7 @@ let cmakeBuild = import ./cmake.nix (args // { gccStdenv = gccStdenv; llvmPackages = llvmPackages; + boost = boost168; }); python3-six-patch = fetchpatch { From a54eb24c7f8779d0208862264c8c2c0995582250 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 04:23:37 +0000 Subject: [PATCH 078/194] python310Packages.google-cloud-bigtable: 2.4.0 -> 2.5.0 --- .../python-modules/google-cloud-bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 747fdd07b041..555017bd4858 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b8472c91b05159f20121fcca6ebdc2a3b5648d68158ec747860914279b6b983b"; + sha256 = "sha256-R7HGbURhqOxPXUlKN3+mk5+qP6Em5HmxBAa7LHsjJJk="; }; propagatedBuildInputs = [ From fbe8be9a8cada3d0608222aa91aa4359ddd6b271 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 7 Feb 2022 03:18:05 +0000 Subject: [PATCH 079/194] electron_17: init at 17.0.0 https://github.com/electron/electron/releases/tag/v17.0.0 --- pkgs/development/tools/electron/default.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 7 +++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index cb209a45119a..e61c77b6151c 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -22,7 +22,7 @@ let in rec { - electron = electron_16; + electron = electron_17; electron_7 = mkElectron "7.3.3" { x86_64-linux = "a947228a859149bec5bd937f9f3c03eb0aa4d78cfe4dfa9aead60d3646a357f9"; @@ -119,4 +119,14 @@ rec { aarch64-darwin = "dc8414d7b9a967bda530c83a81720519931aebf541cfaed142ee2042c16e683a"; headers = "042gz036dzwbvvxvgbgkdb5nq7p8a7vcan6c35l7imgv1hd4g5v4"; }; + + electron_17 = mkElectron "17.0.0" { + armv7l-linux = "29b31c5e77d4d6d9e1a4340fdf08c28ae6698ea9e20d636cec8a59dc758815ef"; + aarch64-linux = "e7bf2ec09b8a7018ba417fc670a15594fb8f3e930626485f2423e9a89e2dcbd0"; + x86_64-linux = "dc74e28719a79f05dd741cda8c22c2bb164dec178c6d560af085910b37cf000b"; + i686-linux = "6f6fe5fa0452e871abe82dbd25d7cf92ab7011995b3b2b15d04d8691ddc9e9de"; + x86_64-darwin = "c35d81af3a3f156059a53436d7874a46770cbf6e4e5087f7caee269e66abb636"; + aarch64-darwin = "7dc5eabc7e582a031d5bd079eeadc9582f5605446085b4cbd1dc7e7c9e978c45"; + headers = "1i3sx1xy62i4f68zbsz1a7jgqw7shx0653w9fyvcdly2nraxldil"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5bc1adea522..a783c485fafe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1227,7 +1227,9 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; - logseq = callPackage ../applications/misc/logseq { }; + logseq = callPackage ../applications/misc/logseq { + electron = electron_16; + }; natls = callPackage ../tools/misc/natls { }; @@ -14290,7 +14292,8 @@ with pkgs; electron_13 electron_14 electron_15 - electron_16; + electron_16 + electron_17; autobuild = callPackage ../development/tools/misc/autobuild { }; From 88fec5f29ec03031ce6b8c0d38ee0d1b6f0ca048 Mon Sep 17 00:00:00 2001 From: Brandon Weeks Date: Mon, 7 Feb 2022 20:45:12 -0800 Subject: [PATCH 080/194] electron: depend on libglvnd Despite shipping libGLES.v2.so, Chromium also expect libGLESv2.so.2 to exist as a system library. This is the same fix as 9086ae6 was for Chrome. --- pkgs/development/tools/electron/default.nix | 1 + pkgs/development/tools/electron/generic.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index e61c77b6151c..b2204775f7ae 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -15,6 +15,7 @@ , libxkbcommon , libappindicator-gtk3 , libxshmfence +, libglvnd }@args: let diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 004774334b91..c8fd96416952 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -15,6 +15,7 @@ , libxkbcommon , libappindicator-gtk3 , libxshmfence +, libglvnd }: version: hashes: @@ -64,6 +65,7 @@ let ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ] ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ] ++ optionals (! versionOlder version "12.0.0") [ libxshmfence ] + ++ optionals (! versionOlder version "17.0.0") [ libglvnd ] ); linux = { From f3cb640d5823ab2b5415241698e395d6a58ae155 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 20:40:11 -0800 Subject: [PATCH 081/194] release.nix: fix packages.json.br for tarball --- pkgs/top-level/make-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index c5a5a4376999..a63432236471 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -64,7 +64,7 @@ pkgs.releaseTools.sourceTarball { header "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp - nix-env -f . -I nixpkgs=$src -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp + nix-env -f . -I nixpkgs=$src -qa --meta --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp echo -n '}' >> tmp packages=$out/packages.json.br < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages From ddbcd7568f92f57b61ca934ce3a6de4b56779f56 Mon Sep 17 00:00:00 2001 From: rikhuijzer Date: Tue, 8 Feb 2022 07:20:51 +0100 Subject: [PATCH 082/194] julia_17-bin: 1.7.1 -> 1.7.2 --- pkgs/development/compilers/julia/1.7-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/1.7-bin.nix b/pkgs/development/compilers/julia/1.7-bin.nix index dab58674f9d2..788825d90be9 100644 --- a/pkgs/development/compilers/julia/1.7-bin.nix +++ b/pkgs/development/compilers/julia/1.7-bin.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.7.1"; + version = "1.7.2"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "04czipzai5628v1npa2y2xff0bd4rj8d2fcjnnsvkqj5gff8wra4"; + sha256 = "15dsfdcxvx0wizkkn85ldz0mg0h7cjziz1lw4kky0b9v9xr48lm7"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From 0184f0e0a546ca7d78d0d3201b0e53b595f9c12f Mon Sep 17 00:00:00 2001 From: Brandon Weeks Date: Mon, 7 Feb 2022 22:26:44 -0800 Subject: [PATCH 083/194] electron: mark versions <= 13 as EOL --- pkgs/development/tools/electron/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 004774334b91..24abeebf1425 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -28,7 +28,7 @@ let maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ] ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]; - knownVulnerabilities = optional (versionOlder version "13.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "14.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { From 19485de0a9927f67e881af6a068226c0ee755dc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 07:09:54 +0000 Subject: [PATCH 084/194] python310Packages.zigpy-zigate: 0.7.4 -> 0.8.0 --- pkgs/development/python-modules/zigpy-zigate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 5ebb17dd498b..b44a385fd933 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.7.4"; + version = "0.8.0"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = version; - sha256 = "0xl8qgljvmypi602f52m89iv9pcrzsdal3jw619vrcavp40rc04d"; + sha256 = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM="; }; propagatedBuildInputs = [ From adb08ddf379e903efd5cd7aadaf1a89f1ce86151 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 08:31:53 +0100 Subject: [PATCH 085/194] tfsec: 1.0.11 -> 1.1.2 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 35bb86cfdaca..0a001ca50cd5 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "1.0.11"; + version = "1.1.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YdoEPU0qXBJ6kD9mWNFxdeQE9e4vkrtVdEOcuFVDpOk="; + sha256 = "sha256-RoXk/wzizlND+WuFy5ZFfryKC9vS31b6SgZH7dPt3Ds="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 07ee6debee984e6b5c4d73b79bc9589dc16b6a73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 08:37:11 +0100 Subject: [PATCH 086/194] checkov: 2.0.795 -> 2.0.805 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 93263d411f03..7722e50d4613 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,13 +22,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.795"; + version = "2.0.805"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-Mlyjw9ngLlzhhgtNARWaA1KCuZkKUEcElPIH8tjmlBQ="; + hash = "sha256-vQ5BJUwjik9Wfh4eFGuefpMuTcEV83hYEJKa5/n+kRc="; }; nativeBuildInputs = with py.pkgs; [ From b246a82ed309cc9b0528b368e62cf782c3962596 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 08:27:21 +0000 Subject: [PATCH 087/194] python310Packages.heatzypy: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/heatzypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 39d970272b14..08a5c8f08fe9 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = pname; rev = version; - sha256 = "sha256-PnDsgTfr2F/fgbONP2qvuPhbw3X50AqriEmsFFjll2Y="; + sha256 = "sha256-VdvgrTZLFTtOu34lWxoPkHAI6Z2Me1/3xauQxzIBJNs="; }; propagatedBuildInputs = [ From 5e89ca2dacd322f56de696c313d9cd1e55b9c154 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 09:50:55 +0100 Subject: [PATCH 088/194] python3Packages.hwi: relax typing-extensions constraint --- pkgs/development/python-modules/hwi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index 1bd1e6650c8d..332521d07040 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -39,7 +39,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' \ - --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4'," + --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4'," \ + --replace 'typing-extensions>=3.7,<4.0' 'typing-extensions>=3.7' ''; # tests require to clone quite a few firmwares From 032d5f183718fd92366bc4b3b12dfbe62a305e36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 08:51:57 +0000 Subject: [PATCH 089/194] python310Packages.google-cloud-spanner: 3.12.1 -> 3.13.0 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 62bba685417d..d78766907191 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.12.1"; + version = "3.13.0"; src = fetchPypi { inherit pname version; - sha256 = "98e53298a7c79f0af351c80e6fc0b57bc735afdec764424e459179ef04f5a40f"; + sha256 = "sha256-Y+MA7Nlx3+8eaBptI6eZgSPGc4MvxSrA9YA+K+VSblw="; }; propagatedBuildInputs = [ From 4ec82ab922bfcd437b4ef6cf620c051de5afd8ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 08:57:55 +0000 Subject: [PATCH 090/194] python310Packages.nagiosplugin: 1.3.2 -> 1.3.3 --- pkgs/development/python-modules/nagiosplugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nagiosplugin/default.nix b/pkgs/development/python-modules/nagiosplugin/default.nix index 6b6e889b5d5d..14d76cde4c16 100644 --- a/pkgs/development/python-modules/nagiosplugin/default.nix +++ b/pkgs/development/python-modules/nagiosplugin/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "nagiosplugin"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1vr3zy0zfvbrqc4nf81zxv4gs2q82sv5sjamdm4573ld529mk2nv"; + sha256 = "sha256-vOr67DWfAyOT3dVgrizI0WNhODPsY8k85xifhZBOU9Y="; }; nativeBuildInputs = [ twine ]; From 833bcbc84438c1f4182f2887d4bcfc47c4b43fbc Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 8 Feb 2022 10:31:09 +0100 Subject: [PATCH 091/194] nixos/firewall: make 'networking.firewall.package' example less confusing pkgs.iptables-nftables-compat == pkgs.iptables (default) since cf9ac2b5. --- nixos/modules/services/networking/firewall.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index ff023a888f26..2aa3be16f6e9 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -326,7 +326,7 @@ in type = types.package; default = pkgs.iptables; defaultText = literalExpression "pkgs.iptables"; - example = literalExpression "pkgs.iptables-nftables-compat"; + example = literalExpression "pkgs.iptables-legacy"; description = '' The iptables package to use for running the firewall service." From 26b1df8a99c99b7e2d0d058c453ea3b00de1b4d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 10:24:01 +0000 Subject: [PATCH 092/194] python310Packages.atlassian-python-api: 3.18.1 -> 3.19.0 --- .../python-modules/atlassian-python-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 4186ad210c92..8846778ba401 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.18.1"; + version = "3.19.0"; src = fetchFromGitHub { owner = "atlassian-api"; repo = pname; rev = version; - sha256 = "09xvkbdfhkrdkn8axb6bhi7p12lm2z1z84rx1wksfw9mffqk90v9"; + sha256 = "sha256-SJsqk8TM+5UztN1ZDyYrOjNIWDLhm5XtLxPflIGPxKQ="; }; checkInputs = [ From e509500c7370554deb9c3ca66368d8ed92d876fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 11:25:26 +0100 Subject: [PATCH 093/194] python3Packages.graphene: disable failing tests on Python 3.10 --- .../python-modules/graphene/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index 7a28bc08cda4..e975bff8fee4 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -1,14 +1,16 @@ { lib +, aniso8601 , buildPythonPackage , fetchFromGitHub -, aniso8601 , graphql-core , graphql-relay , promise -, pytestCheckHook , pytest-asyncio , pytest-benchmark , pytest-mock +, pytestCheckHook +, pythonAtLeast +, pythonOlder , pytz , snapshottest }: @@ -16,6 +18,9 @@ buildPythonPackage rec { pname = "graphene"; version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "graphql-python"; @@ -40,15 +45,22 @@ buildPythonPackage rec { snapshottest ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlagsArray = [ + "--benchmark-disable" + ]; disabledTests = [ # Expects different Exeception classes, but receives none of them # https://github.com/graphql-python/graphene/issues/1346 "test_unexpected_error" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_objecttype_as_container_extra_args" + "test_objecttype_as_container_invalid_kwargs" ]; - pythonImportsCheck = [ "graphene" ]; + pythonImportsCheck = [ + "graphene" + ]; meta = with lib; { description = "GraphQL Framework for Python"; From 6d18192b31ff34fb3b5ee60421f150f16f0c1313 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 11:53:31 +0100 Subject: [PATCH 094/194] python3Packages.nagiosplugin: switch to pytestCheckHook --- .../python-modules/nagiosplugin/default.nix | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/nagiosplugin/default.nix b/pkgs/development/python-modules/nagiosplugin/default.nix index 14d76cde4c16..fab05cd4acde 100644 --- a/pkgs/development/python-modules/nagiosplugin/default.nix +++ b/pkgs/development/python-modules/nagiosplugin/default.nix @@ -1,31 +1,45 @@ { lib , buildPythonPackage -, twine -, numpy -, pytest , fetchPypi +, numpy +, pytestCheckHook +, pythonOlder +, twine }: buildPythonPackage rec { pname = "nagiosplugin"; version = "1.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vOr67DWfAyOT3dVgrizI0WNhODPsY8k85xifhZBOU9Y="; + hash = "sha256-vOr67DWfAyOT3dVgrizI0WNhODPsY8k85xifhZBOU9Y="; }; - nativeBuildInputs = [ twine ]; - checkInputs = [ pytest numpy ]; + nativeBuildInputs = [ + twine + ]; - checkPhase = '' - # this test relies on who, which does not work in the sandbox - pytest -k "not test_check_users" tests/ - ''; + checkInputs = [ + numpy + pytestCheckHook + ]; + + disabledTests = [ + # Test relies on who, which does not work in the sandbox + "test_check_users" + ]; + + pythonImportsCheck = [ + "nagiosplugin" + ]; meta = with lib; { - description = "A Python class library which helps with writing Nagios (Icinga) compatible plugins"; - homepage = "https://github.com/mpounsett/nagiosplugin"; + description = "Python class library which helps with writing Nagios (Icinga) compatible plugins"; + homepage = "https://github.com/mpounsett/nagiosplugin"; license = licenses.zpl21; maintainers = with maintainers; [ symphorien ]; }; From b4cd49fcf9c4f20639137d229a6df65935a1fc4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 12:04:25 +0100 Subject: [PATCH 095/194] duf: 0.8.0 -> 0.8.1 --- pkgs/tools/misc/duf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 9df8b37f7032..3bcb4cdfeb29 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duf"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "sha256-FZ4NplvCc1c+wPy1NSs2qwfWVtCPNHs6JquubGnwiEY="; + sha256 = "sha256-bVuqX88KY+ky+fd1FU9GWP78jQc4fRDk9yRSeIesHyI="; }; - vendorSha256 = "sha256-VLGsfazTD7hSNXPxuGJJwyqvUlqk5wuz8NqFHs/jyZc="; + vendorSha256 = "sha256-oihi7E67VQmym9U1gdD802AYxWRrSowhzBiKg0CBDPc="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From 15dfa560c1b5a983b8f767835b65f0a6d96a02be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 11:19:33 +0000 Subject: [PATCH 096/194] python310Packages.flux-led: 0.28.21 -> 0.28.22 --- pkgs/development/python-modules/flux-led/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index a35f95d9e8f1..46e47b497a29 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.21"; + version = "0.28.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-Vt+vlJlOznGShPUUQUt4zL9ht52TvNWbRRO9v9C0cqg="; + sha256 = "sha256-GNuc8WAiC0S4WFFUYgayU6c0treWCPfPhbyteZ68eWs="; }; propagatedBuildInputs = [ From cf5cccc798005545ee99ca4507a8887dca3e5d31 Mon Sep 17 00:00:00 2001 From: John Rinehart Date: Tue, 8 Feb 2022 13:25:51 +0200 Subject: [PATCH 097/194] slack: changed download URL --- .../networking/instant-messengers/slack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index d3321a9ea72e..cd4a8824b668 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -69,7 +69,7 @@ let sha256 = x86_64-darwin-sha256; }; x86_64-linux = fetchurl { - url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; + url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb"; sha256 = x86_64-linux-sha256; }; aarch64-darwin = fetchurl { From 57e73ca3ec6248576bf9822b7a265dbc1ecac13a Mon Sep 17 00:00:00 2001 From: pasqui23 Date: Tue, 8 Feb 2022 11:36:06 +0000 Subject: [PATCH 098/194] jamesdsp: init at 2.3 (#154158) --- pkgs/applications/audio/jamesdsp/default.nix | 64 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/audio/jamesdsp/default.nix diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix new file mode 100644 index 000000000000..b4d4a02878d3 --- /dev/null +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -0,0 +1,64 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, pipewire +, glibmm +, qmake +, makeDesktopItem +, pkg-config +, libarchive +, fetchpatch +}: + +mkDerivation rec{ + pname = "jamesdsp"; + version = "2.3"; + src = fetchFromGitHub rec{ + owner = "Audio4Linux"; + repo = "JDSP4Linux"; + fetchSubmodules = true; + rev = version; + hash = "sha256-Hkzurr+s+vvSyOMCYH9kHI+nIm6mL9yORGNzY2FXslc="; + }; + + patches = [ + # fixing /usr install assumption, remove on version bump + (fetchpatch { + url = "https://github.com/Audio4Linux/JDSP4Linux/commit/003c9e9fc426f83e269aed6e05be3ed55273931a.patch"; + hash = "sha256-crll/a7C9pUq9eL5diq8/YgC5bNC6SrdijZEBxZpJ8E="; + }) + ]; + + nativeBuildInputs = [ qmake pkg-config ]; + buildInputs = [ + glibmm + libarchive + pipewire + ]; + + desktopItems = [ + (makeDesktopItem { + name = "jamesdsp.desktop"; + desktopName = "JamesDSP"; + genericName = "Audio effects processor"; + exec = "jamesdsp"; + icon = "jamesdsp"; + comment = "JamesDSP for Linux"; + categories = "AudioVideo;Audio"; + startupNotify = false; + terminal = false; + type = "Application"; + extraDesktopEntries = { + Keywords = "equalizer;audio;effect"; + }; + }) + ]; + + meta = with lib;{ + description = "An audio effect processor for PipeWire clients"; + homepage = "https://github.com/Audio4Linux/JDSP4Linux"; + license = licenses.gpl3Only; + maintainers = with maintainers;[ pasqui23 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 348f07b4a30a..454bbf667807 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6733,6 +6733,8 @@ with pkgs; jadx = callPackage ../tools/security/jadx { }; + jamesdsp = libsForQt5.callPackage ../applications/audio/jamesdsp { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; From fae4895e11885ca16bf22cbbd17f990920ed24e5 Mon Sep 17 00:00:00 2001 From: Andreas Date: Thu, 3 Feb 2022 18:50:42 +0100 Subject: [PATCH 099/194] Falkon: 3.1.0 -> 3.2.0 --- .../networking/browsers/falkon/default.nix | 12 ++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index f39ae2f16691..6b525fbca9f7 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -8,23 +8,15 @@ mkDerivation rec { pname = "falkon"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; rev = "v${version}"; - sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7"; + sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE="; }; - patches = [ - # fixes build with qt5 5.14 - (fetchpatch { - url = "https://github.com/KDE/falkon/commit/bbde5c6955c43bc744ed2c4024598495de908f2a.diff"; - sha256 = "0f7qcddvvdnij3di0acg7jwvwfwyd0xizlav4wccclbj8x7qp5ld"; - }) - ]; - preConfigure = '' export NONBLOCK_JS_DIALOGS=true export KDE_INTEGRATION=true diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 454bbf667807..4b063b21c37a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28356,7 +28356,7 @@ with pkgs; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; + falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; From 8c27f7a2bd3ce539f6441123c41376a591ab3395 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 27 Jan 2022 09:42:51 +0100 Subject: [PATCH 100/194] haskellPackages.ghcWithPackages: throw on old override interface Adding a fake override function via passthru will at least give users of the old override interface a more helpful error message. Additionally we also document the changes in the changelog. --- .../from_md/release-notes/rl-2205.section.xml | 13 +++++++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 6 ++++++ .../haskell-modules/with-packages-wrapper.nix | 15 +++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 2ec83dab09f7..04bb7ec12d3e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -240,6 +240,19 @@ haskellPackages.callPackage). + + + pkgs.ghc.withPackages as well as + haskellPackages.ghcWithPackages etc. now + needs be overridden directly, as opposed to overriding the + result of calling it. Additionally, the + withLLVM parameter has been renamed to + useLLVM. So instead of + (ghc.withPackages (p: [])).override { withLLVM = true; }, + one needs to use + (ghc.withPackages.override { useLLVM = true; }) (p: []). + + pkgs.emacsPackages.orgPackages is removed diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index ffb207503f84..a2e8038ae1f8 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -81,6 +81,12 @@ In addition to numerous new and upgraded packages, this release has the followin instead to ensure cross compilation keeps working (or switch to `haskellPackages.callPackage`). +- `pkgs.ghc.withPackages` as well as `haskellPackages.ghcWithPackages` etc. + now needs be overridden directly, as opposed to overriding the result of + calling it. Additionally, the `withLLVM` parameter has been renamed to + `useLLVM`. So instead of `(ghc.withPackages (p: [])).override { withLLVM = true; }`, + one needs to use `(ghc.withPackages.override { useLLVM = true; }) (p: [])`. + - `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated. The packages in the top level of `pkgs.emacsPackages`, such as org and org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 3c645999a1a3..7c7add61679d 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -164,5 +164,20 @@ symlinkJoin { passthru = { preferLocalBuild = true; inherit (ghc) version meta; + + # Inform users about backwards incompatibilities with <= 21.05 + override = _: throw '' + The ghc.withPackages wrapper itself can now be overridden, but no longer + the result of calling it (as before). Consequently overrides need to be + adjusted: Instead of + + (ghc.withPackages (p: [ p.my-package ])).override { withLLLVM = true; } + + use + + (ghc.withPackages.override { useLLVM = true; }) (p: [ p.my-package ]) + + Also note that withLLVM has been renamed to useLLVM for consistency with + the GHC Nix expressions.''; }; } From 547809e2be04bff715b225eff27abcbd3a3a5d7c Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Tue, 8 Feb 2022 13:50:36 +0100 Subject: [PATCH 101/194] btcpayserver: 1.4.3 -> 1.4.4 --- pkgs/applications/blockchains/btcpayserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 87347f8b1f16..39203e60c78d 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-CMa0+Djx07q77W/ezMhU+JP5EPXz4nfZ35TN8O6R/nc="; + sha256 = "sha256-PW5a1Bw21skpboWDtlZHGWtFwfImznD7nYI92RT7GGQ="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; From 1a417bc1dda28270baa23ddaa1aba15cdaf2a92f Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Tue, 8 Feb 2022 08:10:09 -0500 Subject: [PATCH 102/194] nixos/cloud-init: fix trivial error that prevents deploy --- nixos/modules/services/system/cloud-init.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index d05dfcfc42d8..8c6a6e294ebb 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -143,7 +143,7 @@ in "sshd.service" "sshd-keygen.service" ]; after = [ "network-online.target" "cloud-init-local.service" ]; before = [ "sshd.service" "sshd-keygen.service" ]; - requires = [ "network.target "]; + requires = [ "network.target"]; path = path; serviceConfig = { Type = "oneshot"; From 46f01a5ea4e5598af6e2b387c5bb3727df0f7325 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 13:20:55 +0000 Subject: [PATCH 103/194] python310Packages.google-resumable-media: 2.1.0 -> 2.2.0 --- .../python-modules/google-resumable-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 0b10fbab29b5..0e17a81d4a73 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "725b989e0dd387ef2703d1cc8e86217474217f4549593c477fd94f4024a0f911"; + sha256 = "sha256-nzDOf80TuO8Vmyy5WD1Km7mef3uFgWsRIFmwMvLwhKA="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; From 2c9572c86268edd3240f27d80d3b5a270eadbc00 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Tue, 8 Feb 2022 13:45:43 +0100 Subject: [PATCH 104/194] lightning-loop: 0.16.0-beta -> 0.17.0-beta --- pkgs/applications/blockchains/lightning-loop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index 85ec49f3be50..2f4caad32553 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.16.0-beta"; + version = "0.17.0-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "0q4lk338mr30frilgnjr43gd55z7ryj2s260437b4pnp03hmbf10"; + sha256 = "0hjawagn1dfgj67i52bvf3phvm9f9708z3jqs6cvyz0w7vp107py"; }; - vendorSha256 = "14862603rrss14p537j9i7iwflaaprwrnslmqm9hpb7hj52bxqfv"; + vendorSha256 = "1fpc73hwdn3baz5ykrykvqdr5861gj9p6liy8qll5525kdv560f6"; subPackages = [ "cmd/loop" "cmd/loopd" ]; From 84c1ce02241ce01cc214b78b153901edc6c84997 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 13:38:28 +0000 Subject: [PATCH 105/194] python310Packages.deezer-python: 5.1.0 -> 5.1.1 --- pkgs/development/python-modules/deezer-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 0e2a465843c9..e4bffd93eb24 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.1.0"; + version = "5.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hBZBbREPxfAkGf2KRZtO3BpscFGlYiecQjM5l1/Edo0="; + sha256 = "sha256-gzavZ6/8k/JfcOlwWuMV+4AQxbkfWWgbBrHNcnuU51E="; }; nativeBuildInputs = [ From a061b27b2d65121f294cff9e784c9172fd57c1fb Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 8 Feb 2022 15:51:20 +0100 Subject: [PATCH 106/194] displaylink: add dependency on required-file source to avoid unchanged manual interactions needed --- pkgs/os-specific/linux/displaylink/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 965a3e7e523f..f1e942a43993 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dt $out/lib/displaylink *.spkg install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager - mkdir -p $out/lib/udev/rules.d + mkdir -p $out/lib/udev/rules.d $out/share cp ${./99-displaylink.rules} $out/lib/udev/rules.d/99-displaylink.rules patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { $out/bin/DisplayLinkManager wrapProgram $out/bin/DisplayLinkManager \ --run "cd $out/lib/displaylink" + + # We introduce a dependency on the source file so that it need not be redownloaded everytime + echo $src >> "$out/share/workspace_dependencies.pin" ''; dontStrip = true; From 58f58c8de6c7aebd4df1f5080bcef7b7cb7b673b Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 8 Feb 2022 12:24:19 -0300 Subject: [PATCH 107/194] lean: 3.39.0 -> 3.39.1 --- pkgs/applications/science/logic/lean/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 6da8b1cdc429..806a3c34df15 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.39.0"; + version = "3.39.1"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "85c581588857624e9cd562aaa0301a951c497833"; - sha256 = "1v9rqvpgm2hw0mvsg1arp7xp4r9h9p286364hn3if55pg3h8bjzn"; + rev = "1781ded0d0062f40a7eaf3ead8dcbef4429c6321"; + sha256 = "0xdpbfjfa1q4cnf87nl7l760ivr4agpqmy3i1f2b132sgbjzm1xx"; }; nativeBuildInputs = [ cmake ]; From 2fcfc72e682fa7d1e5c7dc33d5cda16188b48112 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 8 Feb 2022 19:41:03 +0300 Subject: [PATCH 108/194] terraform-providers: wrap mkProvider in lib.makeOverridable (#158618) This allows for an easier interface for doing things like overriding the version of a specific Terraform provider, which is a fairly common use-case. --- .../cluster/terraform-providers/default.nix | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 8690e65be88c..53e3aab63491 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -10,42 +10,42 @@ let # Our generic constructor to build new providers. # # Is designed to combine with the terraform.withPlugins implementation. - mkProvider = - { owner - , repo - , rev - , version - , sha256 - , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ - , deleteVendor ? false - , proxyVendor ? false - , # Looks like "registry.terraform.io/vancluever/acme" - provider-source-address - }@attrs: - buildGoModule { - pname = repo; - inherit vendorSha256 version deleteVendor proxyVendor; - subPackages = [ "." ]; - doCheck = false; - # https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml - # goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled - CGO_ENABLED = 0; - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ]; - src = fetchFromGitHub { - inherit owner repo rev sha256; - }; + mkProvider = lib.makeOverridable + ({ owner + , repo + , rev + , version + , sha256 + , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ + , deleteVendor ? false + , proxyVendor ? false + , # Looks like "registry.terraform.io/vancluever/acme" + provider-source-address + }@attrs: + buildGoModule { + pname = repo; + inherit vendorSha256 version deleteVendor proxyVendor; + subPackages = [ "." ]; + doCheck = false; + # https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml + # goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled + CGO_ENABLED = 0; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ]; + src = fetchFromGitHub { + inherit owner repo rev sha256; + }; - # Move the provider to libexec - postInstall = '' - dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} - mkdir -p "$dir" - mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}" - rmdir $out/bin - ''; + # Move the provider to libexec + postInstall = '' + dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} + mkdir -p "$dir" + mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}" + rmdir $out/bin + ''; - # Keep the attributes around for later consumption - passthru = attrs; - }; + # Keep the attributes around for later consumption + passthru = attrs; + }); list = lib.importJSON ./providers.json; From f25944439889667110b7e0f4236234a0515d0365 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 8 Feb 2022 19:41:58 +0300 Subject: [PATCH 109/194] terraform: fix overrideAttrs with passthru attributes (#158632) If plugins are specified in a call to `terraform.withPlugins`, the standard override functions do not act on the wrapper derivation that a user sees but on the underlying Terraform derivation. Due to this, overriding attributes does nothing as they are not passed through to the "outer" wrapper derivation. This change fixes this for at least passthru attributes, but other applications of `.overrideAttrs` (and potentially of the other overrides) will do nothing (except compute a bit internally). This fixes #158620 at least partially. --- .../networking/cluster/terraform/default.nix | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5c0a1d669164..07302ddc1ef3 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -86,7 +86,26 @@ let withPlugins (x: newplugins x ++ actualPlugins); full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p)); - # Ouch + # Expose wrappers around the override* functions of the terraform + # derivation. + # + # Note that this does not behave as anyone would expect if plugins + # are specified. The overrides are not on the user-visible wrapper + # derivation but instead on the function application that eventually + # generates the wrapper. This means: + # + # 1. When using overrideAttrs, only `passthru` attributes will + # become visible on the wrapper derivation. Other overrides that + # modify the derivation *may* still have an effect, but it can be + # difficult to follow. + # + # 2. Other overrides may work if they modify the terraform + # derivation, or they may have no effect, depending on what + # exactly is being changed. + # + # 3. Specifying overrides on the wrapper is unsupported. + # + # See nixpkgs#158620 for details. overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins; overrideAttrs = f: @@ -105,6 +124,12 @@ let inherit (terraform) name meta; nativeBuildInputs = [ makeWrapper ]; + # Expose the passthru set with the override functions + # defined above, as well as any passthru values already + # set on `terraform` at this point (relevant in case a + # user overrides attributes). + passthru = terraform.passthru // passthru; + buildCommand = '' # Create wrappers for terraform plugins because Terraform only # walks inside of a tree of files. @@ -128,8 +153,6 @@ let --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ --prefix PATH : "${lib.makeBinPath wrapperInputs}" ''; - - inherit passthru; }); in withPlugins (_: [ ]); From a0a6c43b2a1e007c6c4883541717694704ecc710 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Tue, 8 Feb 2022 16:49:00 +0000 Subject: [PATCH 110/194] dbeaver: fix mavenDeps sha256Hash --- pkgs/applications/misc/dbeaver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index fc498194f701..43bcef4c8df6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-pfYNHue7tZKYgU16kypZEfr2bXuDoPc4KorIAVjSylo="; + outputHash = "sha256-fJs/XM8PZqm/CrhShtcy4R/4s8dCc1WdXIvYSCYZ4dw="; }; nativeBuildInputs = [ From 092fe80925dc09e2fd187d90f5f21712381e72e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 17:55:18 +0100 Subject: [PATCH 111/194] python3Packages.atlassian-python-api: add pythonImportsCheck --- .../atlassian-python-api/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 8846778ba401..399926c5e05f 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -7,11 +7,15 @@ , requests_oauthlib , six , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "atlassian-python-api"; version = "3.19.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "atlassian-api"; @@ -20,16 +24,26 @@ buildPythonPackage rec { sha256 = "sha256-SJsqk8TM+5UztN1ZDyYrOjNIWDLhm5XtLxPflIGPxKQ="; }; + propagatedBuildInputs = [ + deprecated + oauthlib + requests + requests_oauthlib + six + ]; + checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ]; + pythonImportsCheck = [ + "atlassian" + ]; meta = with lib; { description = "Python Atlassian REST API Wrapper"; homepage = "https://github.com/atlassian-api/atlassian-python-api"; license = licenses.asl20; - maintainers = [ maintainers.arnoldfarkas ]; + maintainers = with maintainers; [ arnoldfarkas ]; }; } From 1fc7d47cb46ec90802ebac81fa77e692610bfbdf Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 8 Feb 2022 11:00:36 -0600 Subject: [PATCH 112/194] python3Packages.fastnumbers: disable tests on ARM --- pkgs/development/python-modules/fastnumbers/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix index 12c3175424d3..779949b38fd7 100644 --- a/pkgs/development/python-modules/fastnumbers/default.nix +++ b/pkgs/development/python-modules/fastnumbers/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fastnumbers , fetchFromGitHub @@ -26,6 +27,10 @@ buildPythonPackage rec { typing-extensions ]; + # Tests fail due to numeric precision differences on ARM + # See https://github.com/SethMMorton/fastnumbers/issues/28 + doCheck = !(stdenv.isAarch64 || stdenv.isAarch32); + checkInputs = [ hypothesis pytestCheckHook From bb89d8d9eefc138e03466e8a0464ecd384edef0a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 2 Feb 2022 13:52:12 +0100 Subject: [PATCH 113/194] =?UTF-8?q?ocamlPackages.core:=200.11.2=20?= =?UTF-8?q?=E2=86=92=200.11.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 679ef4a58e48..ee906a722501 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -299,9 +299,9 @@ with self; }; core = janePackage { - version = "0.11.2"; + version = "0.11.3"; pname = "core"; - hash = "0vpsvd75lxb09il2rnzyib9mlr51v1hzqdc9fdxgx353pb5agh8a"; + hash = "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq"; propagatedBuildInputs = [ core_kernel spawn ]; meta.description = "Jane Street's standard library overlay"; }; From 36be2dd24023cfc44e92d482298997cf70cd3235 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 18:34:02 -0800 Subject: [PATCH 114/194] python3Packages.thinc: fix relax dependencies --- pkgs/development/python-modules/thinc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 9524f7e44970..bb408e0efbff 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { sha256 = "sha256-R2YqOuM9RFp3tup7dyREgFx7uomR8SLjUNr3Le3IFxo="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pydantic>=1.7.4,!=1.8,!=1.8.1,<1.9.0" "pydantic" + ''; + buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin [ From ce92a609bdc89bbb633c54cc8a2e1fe55b2070a9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 18:42:20 -0800 Subject: [PATCH 115/194] python3Packages.thinc: enable tests --- pkgs/development/python-modules/thinc/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index bb408e0efbff..55bf72aec769 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, python , fetchPypi , pytestCheckHook , blis @@ -78,12 +79,14 @@ buildPythonPackage rec { pytestCheckHook ]; - # Cannot find cython modules. - doCheck = false; + # Add native extensions. + preCheck = '' + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH - pytestFlagsArray = [ - "thinc/tests" - ]; + # avoid local paths, relative imports wont resolve correctly + mv thinc/tests tests + rm -r thinc + ''; pythonImportsCheck = [ "thinc" From 48a98a84e0c488e4ec21a20377b3f3b665468b27 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Feb 2022 09:46:53 -0800 Subject: [PATCH 116/194] python3Packages.tomli: add downstream dependency tests --- pkgs/development/python-modules/tomli/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index c593e1e4cb19..551655eebf0d 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -3,6 +3,12 @@ , callPackage , fetchFromGitHub , flit-core + +# important downstream dependencies +, flit +, black +, mypy +, setuptools-scm }: buildPythonPackage rec { @@ -41,6 +47,7 @@ buildPythonPackage rec { passthru.tests = { pytest = callPackage ./tests.nix { }; + inherit flit black mypy setuptools-scm; }; meta = with lib; { From 210ef18b57a651e6f185d2c4fefd1359c14046fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 18:17:01 +0100 Subject: [PATCH 117/194] python39Packages.cartopy: fix version number --- .../python-modules/cartopy/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index d55c1e9b0c53..e2eac2dd0726 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, lib, fetchPypi , pytestCheckHook, filelock, mock, pep8 -, cython +, cython, setuptools-scm , six, pyshp, shapely, geos, numpy , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona , proj, flufl_lock @@ -23,6 +23,13 @@ buildPythonPackage rec { --replace "test_epsg(" "dont_test_epsg(" ''; + nativeBuildInputs = [ + cython + geos # for geos-config + proj + setuptools-scm + ]; + buildInputs = [ geos proj ]; @@ -48,12 +55,6 @@ buildPythonPackage rec { "test_gridliner_labels_bbox_style" ]; - nativeBuildInputs = [ - cython - geos # for geos-config - proj - ]; - meta = with lib; { description = "Process geospatial data to create maps and perform analyses"; license = licenses.lgpl3Plus; From 3307d70562ae081c515955a95aa770346ee7cc53 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 Feb 2022 09:45:42 -0600 Subject: [PATCH 118/194] vimPlugins: add a few plugins for completion and misc other bits --- pkgs/misc/vim-plugins/vim-plugin-names | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 91979fd08665..159fcb565607 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -3,6 +3,7 @@ aca/completion-tabnine AckslD/nvim-neoclip.lua AckslD/nvim-whichkey-setup.lua ackyshake/Spacegray.vim +ackyshake/VimCompletesMe ahmedkhalf/lsp-rooter.nvim ahmedkhalf/project.nvim airblade/vim-gitgutter @@ -222,6 +223,7 @@ guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp guns/xterm-color-table.vim +gyim/vim-boxdraw haringsrob/nvim_context_vt hashivim/vim-packer hashivim/vim-terraform @@ -362,6 +364,7 @@ kdheepak/cmp-latex-symbols kdheepak/lazygit.nvim kdheepak/tabline.nvim KeitaNakamura/neodark.vim +KeitaNakamura/tex-conceal.vim keith/investigate.vim keith/rspec.vim keith/swift.vim @@ -432,6 +435,7 @@ lumiliet/vim-twig luochen1990/rainbow luukvbaal/stabilize.nvim lyokha/vim-xkbswitch +m-pilia/vim-ccls machakann/vim-highlightedyank machakann/vim-sandwich machakann/vim-swap @@ -629,6 +633,7 @@ posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 prabirshrestha/async.vim +prabirshrestha/asyncomplete-lsp.vim prabirshrestha/asyncomplete.vim prabirshrestha/vim-lsp preservim/nerdcommenter From 9b014bdb4793f1e1817b8415aa73bffd3dfe0543 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 Feb 2022 09:53:51 -0600 Subject: [PATCH 119/194] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 184 ++++++++++++++++++---------- 1 file changed, 122 insertions(+), 62 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a707ecd18227..414ffc47805a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-02-04"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "91350456c176fe5ef72e342dd3a75f726805454d"; - sha256 = "18kj8rb6zdqaw255zi767si84jk5lbr3k1vhqjfi265399iwgii7"; + rev = "ee369de02aebc52e7d34506298556e15030c52dc"; + sha256 = "0d31lkaiqn5f8rg1asinp72hlngmfbih7rffb4q4zm5hwayyqi3p"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-02-06"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "6d9399d863e6e921c87c1a95795109b872bd3925"; - sha256 = "0rdrdli1fqqasp3jl508ikv0g6qp5y8fzrn8sq9x7fkmg4sazqg3"; + rev = "82a3e444b299cff3127809b02ea63c819486f285"; + sha256 = "0y18dpf5c5xria1wxxgsqf0wb5cmkm1k3ydyk885mcyjkzy9s8yk"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -171,6 +171,18 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/async.vim/"; }; + asyncomplete-lsp-vim = buildVimPluginFrom2Nix { + pname = "asyncomplete-lsp.vim"; + version = "2021-12-17"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "asyncomplete-lsp.vim"; + rev = "f6d6a6354ff279ba707c20292aef0dfaadc436a3"; + sha256 = "1y0wpq982nw0ibqhvcvb7md58jvadygkxc1ibg99zxw1kznfpla6"; + }; + meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/"; + }; + asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete.vim"; version = "2021-12-06"; @@ -473,12 +485,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-02-04"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "d48d3926b10ac1f9ef77cbcac35a4c7160cff6bf"; - sha256 = "1vvn4qh849rdswvz4cnqci3ahp0z6jppqzg6rlavh8aayppw89lk"; + rev = "406fdf2f2d2372df52d503e9f7bef96d89901c9f"; + sha256 = "17b07krgc9pzqhmwls2d50xbiqs4fgzmdi61qrz1v5n0bgs011mr"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -497,12 +509,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-02-07"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7287befe22ee7fac9b83c3b3499571f6fc8143ae"; - sha256 = "16rfwpmrz7y8d0s8xn8fx90q9b3gnnmnrm9ls7ss83ay7mfvsriy"; + rev = "aa250cb8dbe80792e32d45d1bd4d63850652f771"; + sha256 = "1ykj74ysla1vqq6qjdb593w7r26rapffv2jav6kipigna71bg6j8"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1182,12 +1194,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-02-07"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "98bc8a70b66c4ac05f6e648c43a278a6ff46b7a4"; - sha256 = "15p77qk7a6p9viczl0ym5izdvfbq2d67pgv597zcy7cxmxf5vgcs"; + rev = "47988a87e9dc594b590f820250784ebc2f7cd4fb"; + sha256 = "0qsdwvr518vlm3w5xhayh7ahdnazxh7xyvjcmljby3scdcdsfjfn"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2327,12 +2339,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-02-07"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "11425117a9dcd533e5d42e083248ee0caea88b04"; - sha256 = "0lsd4c446q8f6ylf5g5vyi0gb81v59a4zlcwasvxw29giwxz3grv"; + rev = "e2b2730254df7648c79794555978f10fceb4b163"; + sha256 = "1kmbhfphf128psrxps7iyb1kb2s1lbc63qkxwla1cl3ywnl7f8gl"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3240,12 +3252,12 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-01-20"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "be1c8d67ef80dc4cdfc164d3a95a45d8d551b3eb"; - sha256 = "0qqyws79a4d4kn1vgb7p8iw7vlx2flb3ra2y2xvjilyvzz4ppqrq"; + rev = "ba1a0f49e71849863b4212ca0ac1974aeb7c7032"; + sha256 = "1y55p429rd7z8jph30ils2g35vmqam4qk1ii9s88jwfl545g7qga"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; @@ -3264,12 +3276,12 @@ final: prev: litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-01-13"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "9baa027c79abdadc0a63bdd14d248241a1333b99"; - sha256 = "0lr203px4ydakqnqavymd2f08gj5mid1nhb63rww72i7i959hz7v"; + rev = "07545e1c5bd5c081c7e28540591275cbb46b7d02"; + sha256 = "0pld9i7db4w4wqwc1nnmymfgr7miia60l1rj0pakfkgyf1g5w61s"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; @@ -3371,12 +3383,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-02-02"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "ca8bc243e6ae36fa3eeab53191f302ca84660a3c"; - sha256 = "1967vi3an7f5gp6hdwbkrd5nm71nb1i82jh3ygy1k7i2y4fa6apr"; + rev = "d8073a0e4d19d71da900fb77dcc5f23d72bb8707"; + sha256 = "0f5qzi9kk02z6siqzwz2zak687zb4q2nkg66x3pnnqvhfqazjb5q"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; @@ -3419,12 +3431,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-02-06"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "0997bc216a136f2847343d96040c9b0c90b661c9"; - sha256 = "1iyjbk6l7y35f72cpffddsj97j140vgg0kk5iyaq6mg8rcsq49lq"; + rev = "132eff7cb39d9aeeceb80c816ccbda5bca2d60bb"; + sha256 = "1day60kqq1fgdwcvwm3nx9y2ibkv33c5s75ndv22ajk8cmdrrzdw"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3551,12 +3563,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-02-05"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "6cb7cdb1cd7f111784d5d971fa41a655e11df4b3"; - sha256 = "1jsn2vf8gn61qzzibxngsf29cm4xhr2nidzsjg02l6ayhd7rlhgl"; + rev = "f2ccb9339c979968b19db48b5f8b31c6f0ee7481"; + sha256 = "0f7yw2mjdimmi70liya75wnbbrk37xi2sncpsg0awh15sibynq05"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4295,12 +4307,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-02-05"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "e8a666829a3d803844f24daa4932e4f5fe76cbeb"; - sha256 = "0inl9dizwq2j3r2z7jsxdqmrq5iyq7b123x2n23dfzsvvv5s3279"; + rev = "b1dbbc3807fcb82d6f562145debe6321610bef98"; + sha256 = "1jbi3lxpbky9y0k7c80shq451l5l3pbbr4wwaqrr76mjwrh49vq7"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4667,12 +4679,12 @@ final: prev: nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-01-26"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "64d233a8859e27139c55472248147114e0be1652"; - sha256 = "1isnz4pys9wdf7w4qfiyjl4a2h66b0iwnxlbs88pn0r7hc8kgr74"; + rev = "337e4fa31d88e5553edeb05ac572bacd4a24d867"; + sha256 = "1xa2zxyqfgzp4zjccrjnj9djdb4f4i9gr2m4gxa6cqz01b21xwmq"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; @@ -4815,20 +4827,20 @@ final: prev: src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "e42a4337d0d9de4de5c0d4ab960f2101ef33f273"; - sha256 = "125j1ng5xr12wpqg9wymxlxgzw9v2alqb9fmpwg0mbf9aybip27k"; + rev = "ea92e7bf7ccd1815b60342706356c373bb7df216"; + sha256 = "0dj0kcawslqv6iczgkr4b31449zplpz8k4xw5vw327mh9ciyb0xm"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-02-07"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "d6e6581a256061449a8a039c792a93a4b4e86b85"; - sha256 = "1m1cm1lynaa8wslpy01hkxdp5kxnwxx570wpj2wy5x1xjl5pglgz"; + rev = "c867d483a5daee60ba6fb7ec9151c5578e4e96ed"; + sha256 = "03m6wljyh4rqzjzir22q71hmcrijvk6rylyqmz088fsh214mss5l"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4871,12 +4883,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-02-04"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "438d2cfa3922a58ef828803d6ca9c944b4b4c996"; - sha256 = "0lycnr6q304z1n146phcyjsv4z2rr02yxpq9aj2gvybqljb16m18"; + rev = "fea609aa58b3390a09e8df0e96902fd4b094d8b7"; + sha256 = "0221ax71334ghsr8xznp9jk2iv9r0bin47ch8r7hsfh4r0wgc5w7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6616,6 +6628,18 @@ final: prev: meta.homepage = "https://github.com/ternjs/tern_for_vim/"; }; + tex-conceal-vim = buildVimPluginFrom2Nix { + pname = "tex-conceal.vim"; + version = "2022-01-15"; + src = fetchFromGitHub { + owner = "KeitaNakamura"; + repo = "tex-conceal.vim"; + rev = "93ae39d9222b0892684d02324b85ee9d3647bf8e"; + sha256 = "05nqqfxkxd8f9xky9mnfxw9g16z1005ka8zxaw52i0n35dg4gg8y"; + }; + meta.homepage = "https://github.com/KeitaNakamura/tex-conceal.vim/"; + }; + thesaurus_query-vim = buildVimPluginFrom2Nix { pname = "thesaurus_query.vim"; version = "2022-01-30"; @@ -7267,12 +7291,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2022-02-05"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "12468bc4271a6e3373662e9b9f9d59b30e4ccdea"; - sha256 = "04ilkr2gl96471hp6cxcqhqn3mm25hkaw0vgbzi1izpi6fqkps00"; + rev = "e9d03b12378b173b39d416df6469ca417b9cac9d"; + sha256 = "1r7jcd8q41v1v0syy097qd34ydx0bczgad9ihsmsz83bdbx51dbl"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -7315,12 +7339,12 @@ final: prev: vim-argwrap = buildVimPluginFrom2Nix { pname = "vim-argwrap"; - version = "2022-02-06"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "FooSoft"; repo = "vim-argwrap"; - rev = "0c03483702ca3ded88653c1762ba3b25ab8a6393"; - sha256 = "0bl5aiycch25jq9vkv6j3xrz56adlb7jhvzz82hc9h0fiwzshjzn"; + rev = "0faba07179f96cae2ab49cf2cc22ebeb922c1532"; + sha256 = "1lb1rjp1q25gqpzbjix9anjxvx7cqw1qlacvc693f59gl8s8nbf4"; }; meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; }; @@ -7457,6 +7481,18 @@ final: prev: meta.homepage = "https://github.com/MattesGroeger/vim-bookmarks/"; }; + vim-boxdraw = buildVimPluginFrom2Nix { + pname = "vim-boxdraw"; + version = "2021-01-28"; + src = fetchFromGitHub { + owner = "gyim"; + repo = "vim-boxdraw"; + rev = "b7f789f305b1c5b0b4623585e0f10adb417f2966"; + sha256 = "0zr3r4dgpdadaz3g9hzn7vyv0rids0k1wdywk9yywfp6q9m0ygj8"; + }; + meta.homepage = "https://github.com/gyim/vim-boxdraw/"; + }; + vim-bracketed-paste = buildVimPluginFrom2Nix { pname = "vim-bracketed-paste"; version = "2018-05-22"; @@ -7541,6 +7577,18 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/"; }; + vim-ccls = buildVimPluginFrom2Nix { + pname = "vim-ccls"; + version = "2022-01-29"; + src = fetchFromGitHub { + owner = "m-pilia"; + repo = "vim-ccls"; + rev = "93ac5dbdeaaaed8fdfd6d850f1e57fb28d204886"; + sha256 = "15dr487baghlhl559a4zqpm8vnpm77aci4gw9x95v4kds9g4g51k"; + }; + meta.homepage = "https://github.com/m-pilia/vim-ccls/"; + }; + vim-choosewin = buildVimPluginFrom2Nix { pname = "vim-choosewin"; version = "2021-04-22"; @@ -7603,12 +7651,12 @@ final: prev: vim-closer = buildVimPluginFrom2Nix { pname = "vim-closer"; - version = "2021-03-28"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "rstacruz"; repo = "vim-closer"; - rev = "26bba80f4d987f12141da522d69aa1fa4aff4436"; - sha256 = "1pyi5akzvvkdngm577m1c1210r0yypdwsvp1y7ag6gdfnls75xws"; + rev = "43acc7c59fca861cb92cc47f01f184d9d342a73b"; + sha256 = "1q03kz5ffyz8ifxdn7bgf3r7jlqa8vya13pnjyqda15wly1fl0k8"; }; meta.homepage = "https://github.com/rstacruz/vim-closer/"; }; @@ -8299,12 +8347,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-02-07"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "d38f75fdc237ed8ff2864b9e481ce2ec5b5504a0"; - sha256 = "1h3am33r40ssih8j1n3l939qmqgh7f7awwrqdpkvgj1wisiq2v21"; + rev = "237787fe2206f8ebec1293aa5730eef71b04c69b"; + sha256 = "1qr9cf8yk6kjm3q7pgcp2pkbli31x94vgxxzd4xx7f4ssfv8l0bl"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -8539,12 +8587,12 @@ final: prev: vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2022-01-31"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "5ce866172da4b90f77b8371423dc031fe2f4ece7"; - sha256 = "07rl7il0aqirmrg720c3k96v0rfwj4njmx2pnql3wd8nbl2w5czb"; + rev = "15c5937688490af8dde09e90c9a5585c840ba81c"; + sha256 = "07j704ysc2klqfjk3918b1kjq16pw1yb1fykdsi2a0lamndn9l04"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -11349,6 +11397,18 @@ final: prev: meta.homepage = "https://github.com/jreybert/vimagit/"; }; + VimCompletesMe = buildVimPluginFrom2Nix { + pname = "VimCompletesMe"; + version = "2020-12-30"; + src = fetchFromGitHub { + owner = "ackyshake"; + repo = "VimCompletesMe"; + rev = "2c69e30675d2a30208099742d14bd661d99fc5f2"; + sha256 = "0gjzl0027xjkq0mbqs9grab38ghwnixr57b4wicl113yd76hyb5i"; + }; + meta.homepage = "https://github.com/ackyshake/VimCompletesMe/"; + }; + vimelette = buildVimPluginFrom2Nix { pname = "vimelette"; version = "2019-05-02"; From 4b13f83bf08e52174565843fb25c672ef1e350ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 15:32:36 +0000 Subject: [PATCH 120/194] python310Packages.od: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/od/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix index e2dd2f4bf990..de64e2f8fdc8 100644 --- a/pkgs/development/python-modules/od/default.nix +++ b/pkgs/development/python-modules/od/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "od"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "180fb0d13c3af1384047b8296c95683816b5d0c68a60c22d07c703be8bd755cb"; + sha256 = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; }; # repeated_test no longer exists in nixpkgs From 3d8dd6bbd9b7f8bcb9f5e015a13a2a3773c1d4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 17:59:36 +0100 Subject: [PATCH 121/194] python39Packages.adguardhome: fix version number --- .../python-modules/adguardhome/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index 8521aa91d7ce..134132f9931e 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -23,6 +23,15 @@ buildPythonPackage rec { sha256 = "sha256-HAgt52Bo2NOUkpr5xvWTcRyrLKpfcBDlVAZxgDNI7hY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov" "" \ + --replace '"0.0.0"' '"${version}"' + + substituteInPlace tests/test_adguardhome.py \ + --replace 0.0.0 ${version} + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -36,10 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml --replace "--cov" "" - ''; - pythonImportsCheck = [ "adguardhome" ]; meta = with lib; { From dacbe2de52dbcd04d5fb77d777dd7391c5097c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 18:01:20 +0100 Subject: [PATCH 122/194] python39Packages.aiomusiccast: fix version number --- pkgs/development/python-modules/aiomusiccast/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 6d1116bfefa8..02d7f565c3c1 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -11,7 +11,6 @@ buildPythonPackage rec { version = "0.14.3"; format = "pyproject"; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { @@ -21,6 +20,11 @@ buildPythonPackage rec { hash = "sha256-ELdNxeU9dajWr4VeOyuvNrSi7B+ImVJM/BlZsw3tcKE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' + ''; + nativeBuildInputs = [ poetry-core ]; From 0d79bd66999ae23fb13abd08cf312b5b0ad3e492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 18:08:13 +0100 Subject: [PATCH 123/194] python39Packages.boost-histogram: fix version number, remove default meta.platforms --- pkgs/development/python-modules/boost-histogram/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index f428dc788bf9..b56ebbf50a7e 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark, setuptools-scm }: buildPythonPackage rec { pname = "boost-histogram"; @@ -11,7 +11,10 @@ buildPythonPackage rec { sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579"; }; + nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ boost ]; + propagatedBuildInputs = [ numpy ]; checkInputs = [ pytestCheckHook pytest-benchmark ]; @@ -20,7 +23,6 @@ buildPythonPackage rec { description = "Python bindings for the C++14 Boost::Histogram library"; homepage = "https://github.com/scikit-hep/boost-histogram"; license = licenses.bsd3; - platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; } From 3d6eb1487ea7d3dc736127d21ed31653c8f207be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 18:20:55 +0100 Subject: [PATCH 124/194] python39Packages.casa-formats-io: fix version number, update homepage --- pkgs/development/python-modules/casa-formats-io/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/casa-formats-io/default.nix b/pkgs/development/python-modules/casa-formats-io/default.nix index 53ee89c5f941..beb6dc351420 100644 --- a/pkgs/development/python-modules/casa-formats-io/default.nix +++ b/pkgs/development/python-modules/casa-formats-io/default.nix @@ -4,6 +4,7 @@ , astropy , dask , numpy +, setuptools-scm }: buildPythonPackage rec { @@ -16,6 +17,8 @@ buildPythonPackage rec { sha256 = "16rypj65wdfxxrilxfhbk563lxv86if4vvs9zfq3f8bkzdr8xl9s"; }; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ astropy dask numpy ]; # Tests require a large (800 Mb) dataset @@ -25,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Dask-based reader for CASA data"; - homepage = "http://radio-astro-tools.github.io"; + homepage = "https://casa-formats-io.readthedocs.io/"; license = lib.licenses.lgpl2Only; maintainers = with lib.maintainers; [ smaret ]; }; From fc7550d33c5eaac554ac4f2cb8d345d1df1be7cb Mon Sep 17 00:00:00 2001 From: Las Safin Date: Mon, 7 Feb 2022 22:48:12 +0000 Subject: [PATCH 125/194] secp256k1: unstable-2021-06-06 -> unstable-2022-02-06 --- pkgs/tools/security/secp256k1/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index e88187f84651..890518126d84 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -7,15 +7,13 @@ stdenv.mkDerivation { pname = "secp256k1"; - # I can't find any version numbers, so we're just using the date of the - # last commit. - version = "unstable-2021-06-06"; + version = "unstable-2022-02-06"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; - rev = "7973576f6e3ab27d036a09397152b124d747f4ae"; - sha256 = "0vjk55dv0mkph4k6bqgkykmxn05ngzvhc4rzjnvn33xzi8dzlvah"; + rev = "5dcc6f8dbdb1850570919fc9942d22f728dbc0af"; + sha256 = "x9qG2S6tBSRseWaFIN9N2fRpY1vkv8idT3d3rfJnmaU="; }; nativeBuildInputs = [ autoreconfHook ]; From 2a285d4d68d18a9ec08c477b7570f2595d240497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 18:44:05 +0100 Subject: [PATCH 126/194] python39Packages.doc8: fix version number --- pkgs/development/python-modules/doc8/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index dbfb857614e1..61c4ca6890a1 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -8,6 +8,7 @@ , pytestCheckHook , pythonOlder , restructuredtext_lint +, setuptools-scm , stevedore }: @@ -23,6 +24,10 @@ buildPythonPackage rec { sha256 = "376e50f4e70a1ae935416ddfcf93db35dd5d4cc0e557f2ec72f0667d0ace4548"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + buildInputs = [ pbr ]; From 2376811b2b392a3b261ec38ce4cde4a3f200d35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 18:38:56 +0100 Subject: [PATCH 127/194] python39Packages.django-auth-ldap: fix version number --- .../python-modules/django-auth-ldap/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index ab329cd37aba..9e58f1eaab8a 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage -, fetchPypi, isPy27 -, ldap , django +, fetchPypi +, isPy27 +, ldap +, django , mock +, setuptools-scm }: buildPythonPackage rec { @@ -14,7 +17,10 @@ buildPythonPackage rec { sha256 = "1f2d5c562d9ba9a5e9a64099ae9798e1a63840a11afe4d1c4a9c74121f066eaa"; }; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ ldap django ]; + checkInputs = [ mock ]; # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings From b28a3d56b14ce9a5f0b5565203c764451087b6c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 16:32:55 +0100 Subject: [PATCH 128/194] python3Packages.velbus-aio: 2022.02.1 -> 2022.2.3 --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index d9622cc15131..65fdfc297b56 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2022.02.1"; + version = "2022.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-YVihR7XSI2Ve1Tur4mnNfFKzs8PN1DWO8JYUrYTL4xo="; + sha256 = "sha256-EgykuIz/IGFy4GTZZYpY3D5QvsCmY4H9d9Wxbof3DyQ="; fetchSubmodules = true; }; From d24b8431aaed3f7e959bef5cf155cc58a9e6be07 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 8 Feb 2022 18:28:35 +0100 Subject: [PATCH 129/194] packages-config.nix: ignore haskellPackages.hs-mesos This attribute will necessarily cause an evaluation failures without aliases, but removing the reliance on aliases will remove the error message for users trying to use this attribute. Thus we'll work around this for now. --- pkgs/top-level/packages-config.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 1602eaf9f45f..c33f8b2dc2aa 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -13,7 +13,6 @@ fdbPackages fusePackages gns3Packages - haskellPackages idrisPackages nodePackages nodePackages_latest @@ -31,6 +30,15 @@ zeroadPackages ; + haskellPackages = super.haskellPackages // { + # mesos, which this depends on, has been removed from nixpkgs. We are keeping + # the error message for now, so users will get an error message they can make + # sense of, but need to work around it here. + # TODO(@sternenseemann): remove this after branch-off of 22.05, along with the + # override in configuration-nix.nix + hs-mesos = null; + }; + # Make sure haskell.compiler is included, so alternative GHC versions show up, # but don't add haskell.packages.* since they contain the same packages (at # least by name) as haskellPackages. From d47ad69e7accd840d16d2c72c4912c79ea4753a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 19:13:29 +0100 Subject: [PATCH 130/194] python39Packages.drms: fix version number --- pkgs/development/python-modules/drms/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 1bc5d380b08e..a081a7445c4a 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -8,6 +8,7 @@ , pytestCheckHook , pytest-doctestplus , pythonOlder +, setuptools-scm }: buildPythonPackage rec { @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ numpy pandas From 2179d25d38a7a56c51008209811a84b91231dc1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 19:14:45 +0100 Subject: [PATCH 131/194] python39Packages.forecast-solar: fix version number --- pkgs/development/python-modules/forecast-solar/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix index 3f776c970659..6a77f57acf92 100644 --- a/pkgs/development/python-modules/forecast-solar/default.nix +++ b/pkgs/development/python-modules/forecast-solar/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { sha256 = "sha256-UrLy+j8YDWuS9pciEDKb/+UoCcw54XWiIUAEYC72/W0="; }; + PACKAGE_VERSION = version; + propagatedBuildInputs = [ aiodns aiohttp From 6ddaba62ad693e587a3887f11a6bda61a114f52b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Feb 2022 10:17:24 -0800 Subject: [PATCH 132/194] python3Packages.secp256k1: fix build --- pkgs/development/python-modules/secp256k1/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 1637814cadd2..cfcc235f1500 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -36,7 +36,8 @@ buildPythonPackage rec { ''; postPatch = '' - sed -i '38,45d' setup.py + # don't do hacky tarball download + setuptools check + sed -i '38,54d' setup.py substituteInPlace setup.py --replace ", 'pytest-runner==2.6.2'" "" ''; From f5499849e25b80fc988ae0196cbbf6889e2a3fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 19:27:26 +0100 Subject: [PATCH 133/194] python39Packages.moonraker-api: fix version number --- pkgs/development/python-modules/moonraker-api/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix index 2888ff1e06d1..9f6ca7e91a78 100644 --- a/pkgs/development/python-modules/moonraker-api/default.nix +++ b/pkgs/development/python-modules/moonraker-api/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { sha256 = "1hhm3jnl9qm44y4k927fzw1n32c3551kgsk7i57qw25nca9x3k61"; }; + postPatch = '' + # see comment on https://github.com/cmroche/moonraker-api/commit/e5ca8ab60d2839e150a81182fbe65255d84b4e4e + substituteInPlace setup.py \ + --replace 'name="moonraker-api",' 'name="moonraker-api",version="${version}",' + ''; + propagatedBuildInputs = [ aiohttp ]; From bcec18a34572a5f72091eb22b9a544e4094a4684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Pa=C5=9Bnikowski?= Date: Tue, 8 Feb 2022 19:29:15 +0100 Subject: [PATCH 134/194] =?UTF-8?q?easyeffects:=206.1.3=20=E2=86=92=206.2.?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixes compatibility with pipewire 0.3.44 - Dependency changes https://github.com/wwmm/easyeffects/blob/v6.2.3/CHANGELOG.md --- .../applications/audio/easyeffects/default.nix | 18 ++++++++++-------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index e1366d38bafa..23ca109c6b48 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -4,14 +4,15 @@ , fetchFromGitHub , calf , fftwFloat +, fmt , glib -, glibmm , gtk4 -, gtkmm4 , itstool +, libadwaita , libbs2b , libebur128 , libsamplerate +, libsigcxx30 , libsndfile , lilv , lsp-plugins @@ -26,6 +27,7 @@ , rnnoise , rubberband , speexdsp +, tbb , wrapGAppsHook4 , zam-plugins , zita-convolver @@ -33,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.1.3"; + version = "6.2.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-1UfeqPJxY4YT98UdqTZtG+QUBOZlKfK+7WbszhO22A0="; + sha256 = "sha256-A1UanrAbmZFGCmDNIr1h+v5RVMsIl4qgM/veBirudQM="; }; nativeBuildInputs = [ @@ -54,13 +56,14 @@ stdenv.mkDerivation rec { buildInputs = [ fftwFloat + fmt glib - glibmm gtk4 - gtkmm4 + libadwaita libbs2b libebur128 libsamplerate + libsigcxx30 libsndfile lilv lv2 @@ -69,14 +72,13 @@ stdenv.mkDerivation rec { rnnoise rubberband speexdsp + tbb zita-convolver ]; postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py - # https://github.com/wwmm/easyeffects/pull/1205 - substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; preFixup = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1718b7f10e72..a4c3329cd244 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21468,9 +21468,7 @@ with pkgs; libpulseaudio = libpulseaudio-vanilla; - easyeffects = callPackage ../applications/audio/easyeffects { - glibmm = glibmm_2_68; - }; + easyeffects = callPackage ../applications/audio/easyeffects { }; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { boost = boost172; From 5658eeea776423b8374f97a8fbd206233e39402f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 19:05:36 +0100 Subject: [PATCH 135/194] python3Packages.click-configfile: adjust install_requires --- .../python-modules/click-configfile/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/click-configfile/default.nix b/pkgs/development/python-modules/click-configfile/default.nix index 0d87aa890d2a..62e0ed2d3b60 100644 --- a/pkgs/development/python-modules/click-configfile/default.nix +++ b/pkgs/development/python-modules/click-configfile/default.nix @@ -4,15 +4,19 @@ , click , six , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "click-configfile"; version = "0.2.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE="; + hash = "sha256-lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE="; }; propagatedBuildInputs = [ @@ -24,6 +28,15 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "install_requires=install_requires," 'install_requires=["click >= 6.6", "six >= 1.10"],' + ''; + + pythonImportsCheck = [ + "click_configfile" + ]; + disabledTests = [ "test_configfile__with_unbound_section" "test_matches_section__with_bad_arg" From f32afc87762efe4cc5e80ba5bfa32880c09150eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 18:04:05 +0100 Subject: [PATCH 136/194] python39Packages.astropy-extension-helpers: fix version number --- .../python-modules/astropy-extension-helpers/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index a3ea5cd4cf2f..8e5a2fda3301 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -3,6 +3,7 @@ , fetchPypi , findutils , pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + patches = [ ./permissions.patch ]; checkInputs = [ findutils pytestCheckHook ]; From 590b57dda619501e85224ff2b931e277482ac086 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 19:30:23 +0100 Subject: [PATCH 137/194] python3Packages.flowlogs_reader: 3.1.0 -> 3.2.0 --- .../flowlogs_reader/default.nix | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index 885c688225ca..7045841245d3 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -1,32 +1,48 @@ { lib -, buildPythonPackage -, fetchPypi -, isPy27 -, botocore , boto3 -, docutils -, unittest2 -, mock +, botocore +, buildPythonPackage +, fetchFromGitHub +, parquet +, pytestCheckHook +, python-dateutil +, pythonOlder }: buildPythonPackage rec { - pname = "flowlogs_reader"; - version = "3.1.0"; - disabled = isPy27; + pname = "flowlogs-reader"; + version = "3.2.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "d99636423abc83bb4042d63edd56852ede9e2949cadcc3339eda8f3367826dd4"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "obsrvbl"; + repo = pname; + # https://github.com/obsrvbl/flowlogs-reader/issues/57 + rev = "fac4c6c63348ff67fd0a8f51d391ba7c9f59e5ed"; + hash = "sha256-bGb2CLp33aIr0R/lBPWAF3CbtVTWpqmcvYgZ6bcARTc="; }; - propagatedBuildInputs = [ botocore boto3 docutils ]; - buildInputs = [ unittest2 mock ]; + propagatedBuildInputs = [ + botocore + boto3 + parquet + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flowlogs_reader" + ]; meta = with lib; { description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier"; homepage = "https://github.com/obsrvbl/flowlogs-reader"; - maintainers = with maintainers; [ cransom ]; license = licenses.asl20; + maintainers = with maintainers; [ cransom ]; }; - } From 686db44ab6695f61e82096c6ca6e98c639bda19e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 17:10:59 +0100 Subject: [PATCH 138/194] python3Packages.warrant-lite: init at 1.0.4 --- .../python-modules/warrant-lite/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/warrant-lite/default.nix diff --git a/pkgs/development/python-modules/warrant-lite/default.nix b/pkgs/development/python-modules/warrant-lite/default.nix new file mode 100644 index 000000000000..4d5d77c2e84d --- /dev/null +++ b/pkgs/development/python-modules/warrant-lite/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, boto3 +, envs +, python-jose +, requests +}: + +buildPythonPackage rec { + pname = "warrant-lite"; + version = "1.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FunWoslZn3o0WHet2+LtggO3bbbe2ULMXW93q07GxJ4="; + }; + + propagatedBuildInputs = [ + boto3 + envs + python-jose + requests + ]; + + postPatch = '' + # requirements.txt is not part of the source + substituteInPlace setup.py \ + --replace "parse_requirements('requirements.txt')," "[]," + ''; + + # Tests require credentials + doCheck = false; + + pythonImportsCheck = [ + "warrant_lite" + ]; + + meta = with lib; { + description = "Module for process SRP requests for AWS Cognito"; + homepage = "https://github.com/capless/warrant-lite"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0dd74e7ac7b..96d29d52f59a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10376,6 +10376,8 @@ in { warrant = callPackage ../development/python-modules/warrant { }; + warrant-lite = callPackage ../development/python-modules/warrant-lite { }; + waqiasync = callPackage ../development/python-modules/waqiasync { }; wasabi = callPackage ../development/python-modules/wasabi { }; From d336e2596fa3e1e37aa0aea9e617280e481db3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 20:09:03 +0100 Subject: [PATCH 139/194] python39Packages.prance: fix version number, update homepage --- pkgs/development/python-modules/prance/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index cbc931d5c59e..26cfada4296e 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -4,6 +4,7 @@ , chardet , requests , ruamel-yaml +, setuptools-scm , six , semver , pytestCheckHook @@ -22,6 +23,12 @@ buildPythonPackage rec { sha256 = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ chardet requests @@ -51,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; - homepage = "https://github.com/jfinkhaeuser/prance"; + homepage = "https://github.com/RonnyPfannschmidt/prance"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; From 0a21b2930d00a45da9e8f51834893ea667eaf912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 20:12:13 +0100 Subject: [PATCH 140/194] python39Packages.pysiaalarm: fix version number, remove unused setuptools --- pkgs/development/python-modules/pysiaalarm/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix index 2345529b1185..c06e1ed32ac8 100644 --- a/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -4,7 +4,7 @@ , fetchPypi , dataclasses-json , pycryptodome -, setuptools +, setuptools-scm , pytest-asyncio , pytest-cases , pytestCheckHook @@ -28,10 +28,13 @@ buildPythonPackage rec { --replace "--cov pysiaalarm --cov-report term-missing" "" ''; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ dataclasses-json pycryptodome - setuptools ]; checkInputs = [ From e9a32bb715147e5698e86cf8c7b749013874f65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 20:01:42 +0100 Subject: [PATCH 141/194] python39Packages.plumbum: fix version, enable tests, add meta --- .../python-modules/plumbum/default.nix | 60 ++++++++++++++++--- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index e571f276f28f..ae3c4941f684 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -1,19 +1,61 @@ -{ buildPythonPackage -, fetchPypi -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, openssh +, ps +, psutil +, pytest-mock +, pytest-timeout +, pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "plumbum"; version = "1.7.2"; - checkInputs = [ pytest ]; + src = fetchFromGitHub { + owner = "tomerfiliba"; + repo = "plumbum"; + rev = "v${version}"; + sha256 = "sha256-bCCcNFz+ZsbKSF7aCfy47lBHb873tDYN0qFuSCxJp1w="; + }; - # No tests in archive - doCheck = false; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-config=setup.cfg" "" + ''; - src = fetchPypi { - inherit pname version; - sha256 = "0d1bf908076bbd0484d16412479cb97d6843069ee19f99e267e11dd980040523"; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + openssh + ps + psutil + pytest-mock + pytest-timeout + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMP + ''; + + disabledTests = [ + # broken in nix env + "test_change_env" + "test_dictlike" + "test_local" + ]; + + meta = with lib; { + description = " Plumbum: Shell Combinators "; + homepage = " https://github.com/tomerfiliba/plumbum "; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From fb0ddd271ebf49498fedbcdb873294fd417a3320 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 17:08:10 +0100 Subject: [PATCH 142/194] python3Packages.pyhumps: init at 3.5.0 --- .../python-modules/pyhumps/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/pyhumps/default.nix diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix new file mode 100644 index 000000000000..0d5ed18cfdb7 --- /dev/null +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyhumps"; + version = "3.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nficano"; + repo = "humps"; + rev = "v${version}"; + hash = "sha256-dnNtx0VTD2e89yXMz0+acDhOaLBSkAA7n2io6qypN5E="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + # https://github.com/nficano/humps/pull/240 + substituteInPlace pyproject.toml \ + --replace 'version = "3.0.2"' 'version = "${version}"' + ''; + + pythonImportsCheck = [ + "humps" + ]; + + meta = with lib; { + description = "Module to convert strings (and dictionary keys) between snake case, camel case and pascal case"; + homepage = "https://github.com/nficano/humps"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96d29d52f59a..a65feb8a37bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6104,6 +6104,8 @@ in { pyhiveapi = callPackage ../development/python-modules/pyhiveapi { }; + pyhumps = callPackage ../development/python-modules/pyhumps { }; + pyisy = callPackage ../development/python-modules/pyisy { }; pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; From fee3df437fabb571a7095b47efc221f19ea57509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 19:17:14 +0100 Subject: [PATCH 143/194] python39Packages.garages-amsterdam: fix version number, update homepage --- .../python-modules/garages-amsterdam/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix index 3276934e65b2..01ff36e63795 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -19,6 +19,11 @@ buildPythonPackage rec { sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -34,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; - homepage = "https://github.com/klaasnicolaas/garages_amsterdam"; + homepage = "https://github.com/klaasnicolaas/python-garages-amsterdam"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 39d8c4866f600bbdd7ac3383f42563a31b1ce34d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 13:46:11 +0000 Subject: [PATCH 144/194] python310Packages.azure-mgmt-iothubprovisioningservices: 1.0.0 -> 1.1.0 --- .../azure-mgmt-iothubprovisioningservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index 39f09b28241c..dfd8581af1aa 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothubprovisioningservices"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; + sha256 = "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; }; propagatedBuildInputs = [ From 59be16611c6cd0674081f0c45cc83aeb8b1d1122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 26 Jan 2022 16:21:53 +0100 Subject: [PATCH 145/194] rPackages: fix evaluation Removes uses of aliases --- pkgs/development/r-modules/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index edddcf70765e..500bbe91aa5d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -321,13 +321,13 @@ let Biostrings = [ pkgs.zlib ]; bnpmr = [ pkgs.gsl ]; cairoDevice = [ pkgs.gtk2.dev ]; - Cairo = with pkgs; [ libtiff libjpeg cairo.dev x11 fontconfig.lib ]; + Cairo = with pkgs; [ libtiff libjpeg cairo.dev xlibsWrapper fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw ]; ChemmineOB = with pkgs; [ openbabel pkg-config ]; curl = [ pkgs.curl.dev ]; data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; - devEMF = with pkgs; [ xorg.libXft.dev x11 ]; + devEMF = with pkgs; [ xorg.libXft.dev xlibsWrapper ]; diversitree = with pkgs; [ gsl fftw ]; exactextractr = [ pkgs.geos ]; EMCluster = [ pkgs.lapack ]; @@ -346,7 +346,7 @@ let haven = with pkgs; [ libiconv zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl ]; - imager = [ pkgs.x11 ]; + imager = [ pkgs.xlibsWrapper ]; iBMQ = [ pkgs.gsl ]; igraph = with pkgs; [ gmp libxml2.dev ]; JavaGD = [ pkgs.jdk ]; @@ -644,7 +644,7 @@ let PING = [ pkgs.gsl ]; RcppAlgos = [ pkgs.gmp.dev ]; RcppBigIntAlgos = [ pkgs.gmp.dev ]; - HilbertVisGUI = [ pkgs.gnome2.gtkmm.dev ]; + HilbertVisGUI = [ pkgs.gtkmm2.dev ]; textshaping = with pkgs; [ harfbuzz.dev freetype.dev fribidi libpng ]; DropletUtils = [ pkgs.zlib.dev ]; RMariaDB = [ pkgs.libmysqlclient.dev ]; @@ -1114,7 +1114,7 @@ let patchShebangs configure ''; - R_MAKEVARS_SITE = lib.optionalString (pkgs.system == "aarch64-linux") + R_MAKEVARS_SITE = lib.optionalString (pkgs.stdenv.system == "aarch64-linux") (pkgs.writeText "Makevars" '' CXX14PICFLAGS = -fPIC ''); From f6b1790dbea4a9c66f8f543193cda4fa77ec4fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 20:22:30 +0100 Subject: [PATCH 146/194] python39Packages.rxv: fix version number --- pkgs/development/python-modules/rxv/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 728d56527bbe..9d59efd9bd35 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -10,6 +10,7 @@ , pythonOlder , requests , requests-mock +, setuptools-scm }: buildPythonPackage rec { @@ -26,6 +27,12 @@ buildPythonPackage rec { sha256 = "0jldnlzbfg5jm1nbgv91mlvcqkswd9f2n3qj9aqlbmj1cxq19yz8"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ defusedxml requests From 08aec5fbdca153a2de313fafb0f8a5272c54719a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 19:42:28 +0100 Subject: [PATCH 147/194] python39Packages.pijuice: fix version number, disable tests --- pkgs/development/python-modules/pijuice/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pijuice/default.nix b/pkgs/development/python-modules/pijuice/default.nix index f46ddfca1be2..1c0a71bf2854 100644 --- a/pkgs/development/python-modules/pijuice/default.nix +++ b/pkgs/development/python-modules/pijuice/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { ]; PIJUICE_BUILD_BASE = 1; + PIJUICE_VERSION = version; preBuild = '' cd Software/Source @@ -50,7 +51,10 @@ buildPythonPackage rec { rm $out/bin/pijuice_sys.py rm $out/bin/pijuiceboot mv $out/bin/pijuice_cli.py $out/bin/pijuice_cli - ''; + ''; + + # no tests + doCheck = false; meta = with lib; { description = "Library and resources for PiJuice HAT for Raspberry Pi"; From 9b9e2d3469ce39ecc327b4d20b55921cd3e61d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 19:24:05 +0100 Subject: [PATCH 148/194] python39Packages.greeclimate: fix version number --- pkgs/development/python-modules/greeclimate/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 5a17b4679e10..408fd93f1f6e 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -22,6 +22,12 @@ buildPythonPackage rec { hash = "sha256-Y8IgqrU8zzV020qwyyb57Tp2j7laQ3JsCOCYBuf8vsQ="; }; + postPatch = '' + # upstream issue for proper solution https://github.com/cmroche/greeclimate/issues/46 + substituteInPlace setup.py \ + --replace 'name="greeclimate",' 'name="greeclimate",version="${version}",' + ''; + propagatedBuildInputs = [ netifaces pycryptodome From 7c393884f1ff512358aea42a33ac606f227fd18b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 12:09:50 +0000 Subject: [PATCH 149/194] python310Packages.pymavlink: 2.4.19 -> 2.4.20 --- pkgs/development/python-modules/pymavlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 4bb3cabac384..6f846481b039 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.19"; + version = "2.4.20"; src = fetchPypi { inherit pname version; - sha256 = "8518f71c221c263770322355d0745da2fffc48238d04eb48bcf3ef6c35e5f722"; + sha256 = "sha256-QdYlmlDZzVH8tErGdgAz6FjT/L7jexduvrffKVEqMfY="; }; propagatedBuildInputs = [ future lxml ]; From 75e29573a8c5fb0608b999ed80035c8572b21b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 20:25:22 +0100 Subject: [PATCH 150/194] python39Packages.scikit-survival: fix version number --- pkgs/development/python-modules/scikit-survival/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index e490d5029434..69b9bf05467c 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -8,6 +8,7 @@ , numpy , osqp , pandas +, setuptools-scm , scikit-learn , scipy , pytestCheckHook @@ -24,6 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython + setuptools-scm ]; propagatedBuildInputs = [ From 4ff59329ded0e9296d09e485ca77996d467e3851 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 11:25:15 +0000 Subject: [PATCH 151/194] python310Packages.packageurl-python: 0.9.6 -> 0.9.7 --- pkgs/development/python-modules/packageurl-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 564a08b4eb79..7af22d0ddd56 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "c01fbaf62ad2eb791e97158d1f30349e830bee2dd3e9503a87f6c3ffae8d1cf0"; + sha256 = "sha256-1D22r2o1AJnjLp4F5zcBPQQJKHt2H6WcWKA+VdvDZIo="; }; checkInputs = [ pytestCheckHook ]; From dc9a5b5985cfb6fad69eb1b88730473111fa1fc9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 09:16:43 +0100 Subject: [PATCH 152/194] python3Packages.csvw: disable failing tests on Python 3.10 --- .../python-modules/csvw/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 67342d9eccc8..7ae79f4ec59f 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder , attrs , isodate , python-dateutil , rfc3986 , uritemplate -, mock , pytestCheckHook , pytest-mock }: @@ -15,6 +15,8 @@ buildPythonPackage rec { pname = "csvw"; version = "1.11.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -24,10 +26,6 @@ buildPythonPackage rec { sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg"; }; - patchPhase = '' - substituteInPlace setup.cfg --replace "--cov" "" - ''; - propagatedBuildInputs = [ attrs isodate @@ -37,15 +35,28 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook pytest-mock ]; + patchPhase = '' + substituteInPlace setup.cfg \ + --replace "--cov" "" + ''; + disabledTests = [ # this test is flaky on darwin because it depends on the resolution of filesystem mtimes # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257 "test_write_file_exists" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/cldf/csvw/issues/58 + "test_roundtrip_escapechar" + "test_escapequote_escapecharquotechar_final" + "test_doubleQuote" + ]; + + pythonImportsCheck = [ + "csvw" ]; meta = with lib; { From 2a5eece23131bd1637d991eba8ee250938142669 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 11:02:31 +0100 Subject: [PATCH 153/194] python3Packages.nats-py: 0.11.5 -> 2.0.0 --- .../default.nix | 30 ++++++++++++++----- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +-- 3 files changed, 25 insertions(+), 10 deletions(-) rename pkgs/development/python-modules/{asyncio-nats-client => nats-py}/default.nix (56%) diff --git a/pkgs/development/python-modules/asyncio-nats-client/default.nix b/pkgs/development/python-modules/nats-py/default.nix similarity index 56% rename from pkgs/development/python-modules/asyncio-nats-client/default.nix rename to pkgs/development/python-modules/nats-py/default.nix index 46dbcdbacd5e..f87eb269da7a 100644 --- a/pkgs/development/python-modules/asyncio-nats-client/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -9,15 +9,17 @@ }: buildPythonPackage rec { - pname = "asyncio-nats-client"; - version = "0.11.5"; - disabled = pythonOlder "3.6"; + pname = "nats-py"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.py"; rev = "v${version}"; - sha256 = "0zwiijaswmfdk71diqmdpb6nx54fmgi8hy0vwx2m3ihhsyjxj82h"; + hash = "sha256-BraT30J7OIcW2NXAwjcg9PYu+kgf8f1iDjKiN9J6l7Y="; }; propagatedBuildInputs = [ @@ -38,12 +40,24 @@ buildPythonPackage rec { disabledTests = [ # RuntimeError: Event loop is closed "test_subscribe_no_echo" - "test_reconnect_to_new_server_with_auth" - "test_drain_connection" - "test_discover_servers_on_first_connect" + "test_publish" + "test_publish_verbose" + "test_fetch_max_waiting_fetch_one" + "test_fetch_n" + "test_consumer_management" + "test_ephemeral_subscribe" + "test_queue_subscribe_deliver_group" + "test_subscribe_push_bound" + "test_double_acking_subscribe" + "test_flow_control" + "test_ordered_consumer" + "test_ordered_consumer_single_loss" + "test_kv_simple" ]; - pythonImportsCheck = [ "nats.aio" ]; + pythonImportsCheck = [ + "nats" + ]; meta = with lib; { description = "Python client for NATS.io"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a70285d5755e..f688e9a36bde 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,6 +33,7 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + asyncio-nats-client = nats-py; # added 2022-02-08 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a65feb8a37bb..223ba7aaa6bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -692,8 +692,6 @@ in { asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; - asyncio-nats-client = callPackage ../development/python-modules/asyncio-nats-client { }; - asyncio-rlock = callPackage ../development/python-modules/asyncio-rlock { }; asyncmy = callPackage ../development/python-modules/asyncmy { }; @@ -5319,6 +5317,8 @@ in { nassl = callPackage ../development/python-modules/nassl { }; + nats-py = callPackage ../development/python-modules/nats-py { }; + nats-python = callPackage ../development/python-modules/nats-python { }; natsort = callPackage ../development/python-modules/natsort { }; From 0a15821ee7fba4d90a277283a30e6016dfb685bc Mon Sep 17 00:00:00 2001 From: neirenoir Date: Tue, 8 Feb 2022 19:59:05 +0100 Subject: [PATCH 154/194] ledger-live-desktop: 2.37.2 -> 2.38.2 They had to update it. Again. --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index b8ca5c33595d..aa2485e1772c 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.37.2"; + version = "2.38.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-etbMd0qUAsd5B3QH+DBVI9QLROjZXkGr4sAUlO8cRek="; + hash = "sha256-k6Rbxpe5BpRmlE+WL7iiFUtRCs5KlrLH2c3iSucUhqo"; }; appimageContents = appimageTools.extractType2 { From 948603bb9760c28772f5a9d63bae285d89a46a2c Mon Sep 17 00:00:00 2001 From: neirenoir Date: Tue, 8 Feb 2022 20:00:21 +0100 Subject: [PATCH 155/194] ledger-live-desktop: 2.37.2 -> 2.38.2 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index aa2485e1772c..5afdf959cc52 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -7,7 +7,7 @@ let src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-k6Rbxpe5BpRmlE+WL7iiFUtRCs5KlrLH2c3iSucUhqo"; + hash = "sha256-k6Rbxpe5BpRmlE+WL7iiFUtRCs5KlrLH2c3iSucUhqo="; }; appimageContents = appimageTools.extractType2 { From 7ab67fdaeb59cc86e6c555f6aac685a7c0c57f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Tue, 8 Feb 2022 18:14:31 +0100 Subject: [PATCH 156/194] omnisharp-roslyn: 1.37.15 -> 1.38.0 --- .../tools/omnisharp-roslyn/create-deps.sh | 4 +- .../tools/omnisharp-roslyn/default.nix | 28 +- .../tools/omnisharp-roslyn/deps.nix | 1002 ++++++++++++----- 3 files changed, 752 insertions(+), 282 deletions(-) diff --git a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh index 37fdb0d91010..46cbb06951b0 100755 --- a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh +++ b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../.. -i bash -p msbuild dotnet-sdk_3 jq xmlstarlet curl +#!nix-shell -I nixpkgs=../../../../.. -i bash -p dotnet-sdk_6 jq xmlstarlet curl set -euo pipefail cat << EOL @@ -18,7 +18,7 @@ mapfile -t repos < <( done ) -msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \ +dotnet msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \ -p:RestoreNoCache=true -p:RestoreForce=true \ src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2 diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index dad26f583a36..7fd1fff89d20 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,8 +1,6 @@ { lib, stdenv , fetchFromGitHub , fetchurl -, mono6 -, msbuild , dotnetCorePackages , makeWrapper , unzip @@ -11,7 +9,7 @@ let - dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0; deps = map (package: stdenv.mkDerivation (with package; { inherit pname version src; @@ -67,21 +65,21 @@ let in stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.37.15"; + version = "1.38.0"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - sha256 = "070wqs667si3f78fy6w4rrfm8qncnabg0yckjhll0yv1pzbj9q42"; + sha256 = "00V+7Z1IoCSuSM0RClM81IslzCzC/FNYxHIKtnI9QDg="; }; - nativeBuildInputs = [ makeWrapper msbuild ]; + nativeBuildInputs = [ makeWrapper dotnet-sdk ]; buildPhase = '' runHook preBuild - HOME=$(pwd)/fake-home msbuild -r \ + HOME=$(pwd)/fake-home dotnet msbuild -r \ -p:Configuration=Release \ -p:RestoreConfigFile=${nuget-config} \ src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj @@ -91,18 +89,10 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -r bin/Release/OmniSharp.Stdio.Driver/net472 $out/src - cp bin/Release/OmniSharp.Host/net472/SQLitePCLRaw* $out/src - mkdir $out/src/.msbuild - ln -s ${msbuild}/lib/mono/xbuild/* $out/src/.msbuild/ - rm $out/src/.msbuild/Current - mkdir $out/src/.msbuild/Current - ln -s ${msbuild}/lib/mono/xbuild/Current/* $out/src/.msbuild/Current/ - ln -s ${msbuild}/lib/mono/msbuild/Current/bin $out/src/.msbuild/Current/Bin - - makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \ - --suffix PATH : ${dotnet-sdk}/bin \ - --add-flags "$out/src/OmniSharp.exe" + cp -r bin/Release/OmniSharp.Stdio.Driver/net6.0 $out/src + makeWrapper $out/src/OmniSharp $out/bin/omnisharp \ + --prefix DOTNET_ROOT : ${dotnet-sdk} \ + --suffix PATH : ${dotnet-sdk}/bin ''; meta = with lib; { diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index 32786d324084..47af76fdd4ac 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -1,18 +1,18 @@ { fetchurl }: [ { pname = "cake.scripting.abstractions"; - version = "0.6.4"; + version = "0.8.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.6.4/cake.scripting.abstractions.0.6.4.nupkg"; - sha256 = "14fcixlj2xazf6cb46gw8jgbsz89c6s8fnhvppxs8q12pygmkx0l"; + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.8.1/cake.scripting.abstractions.0.8.1.nupkg"; + sha256 = "0hrr7a3z1qddfm21pp21wr94q2f85w5kq1gavn5dylajiaqz505c"; }; } { pname = "cake.scripting.transport"; - version = "0.6.4"; + version = "0.8.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.6.4/cake.scripting.transport.0.6.4.nupkg"; - sha256 = "08cwj572mvmlagj5jry11j2l2fqc6yl4sw0szvql4ard9cx7j51n"; + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.8.1/cake.scripting.transport.0.8.1.nupkg"; + sha256 = "0pfpgyr62r74s9h4i3kdxb92d21x14pmvwa1bfk3v2s5qdb3fxj8"; }; } { @@ -64,43 +64,27 @@ }; } { - pname = "messagepack"; - version = "2.1.152"; + pname = "microsoft.aspnetcore.app.runtime.win-arm64"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/messagepack/2.1.152/messagepack.2.1.152.nupkg"; - sha256 = "1ks1w6pn96zm8nhz3ff6qdrmf0abppglwaa6vw83kj3d2qw74sw1"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-arm64/6.0.0/microsoft.aspnetcore.app.runtime.win-arm64.6.0.0.nupkg"; + sha256 = "0k2011d3jbfblfm4qspwjyv5pg1xqac408vblshgmf4sz7hlyzb3"; }; } { - pname = "messagepackanalyzer"; - version = "2.1.152"; + pname = "microsoft.aspnetcore.app.runtime.win-x64"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/messagepackanalyzer/2.1.152/messagepackanalyzer.2.1.152.nupkg"; - sha256 = "18iacmw5v3dp8lma9c0rh5jh8g1hkxnkq78kx7n00wkwxa58badx"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x64/6.0.0/microsoft.aspnetcore.app.runtime.win-x64.6.0.0.nupkg"; + sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }; } { - pname = "messagepack.annotations"; - version = "2.1.152"; + pname = "microsoft.aspnetcore.app.runtime.win-x86"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/messagepack.annotations/2.1.152/messagepack.annotations.2.1.152.nupkg"; - sha256 = "196swfxaz7l26hiyfv1mix0y80amhlq48krc4g5p9894wx1az3c3"; - }; - } - { - pname = "microsoft.aspnetcore.app.ref"; - version = "3.1.10"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"; - sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; - }; - } - { - pname = "microsoft.bcl.asyncinterfaces"; - version = "1.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x86/6.0.0/microsoft.aspnetcore.app.runtime.win-x86.6.0.0.nupkg"; + sha256 = "0l64rphcqjwlbsxvfc8albzs494xyhl3bgw6ll68h3imhml193k5"; }; } { @@ -120,19 +104,27 @@ }; } { - pname = "microsoft.build"; - version = "16.10.0"; + pname = "microsoft.bcl.asyncinterfaces"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.10.0/microsoft.build.16.10.0.nupkg"; - sha256 = "1ran3fp016wvj8d2ahv0cmwhm6hjjh64w82s7cy52s7qffrgjk46"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/6.0.0/microsoft.bcl.asyncinterfaces.6.0.0.nupkg"; + sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; + }; + } + { + pname = "microsoft.build"; + version = "17.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/17.0.0/microsoft.build.17.0.0.nupkg"; + sha256 = "166brl88y8xn9llc0hmn911k6y74gapmk1mrnfxbv73qj77jxsn1"; }; } { pname = "microsoft.build.framework"; - version = "16.10.0"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.10.0/microsoft.build.framework.16.10.0.nupkg"; - sha256 = "17a8qxgq0jzxpjannhxkcg0941b64yb7z0yq75gz6hsq9ln3agja"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/17.0.0/microsoft.build.framework.17.0.0.nupkg"; + sha256 = "08c257dmfa6n41lq4fxb34khi8jbwlqfy1168x7h7zsbh3wss7yq"; }; } { @@ -145,10 +137,10 @@ } { pname = "microsoft.build.tasks.core"; - version = "16.10.0"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.10.0/microsoft.build.tasks.core.16.10.0.nupkg"; - sha256 = "0yc3p4bksxmbq1n8wfqgn6b6x9ccyzq229f0mn08z4jfima3cnxg"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/17.0.0/microsoft.build.tasks.core.17.0.0.nupkg"; + sha256 = "087mn3rz5plnj7abjqk2di5is35mmfgmdjf0kcdn7jld8rbhk5hx"; }; } { @@ -161,10 +153,10 @@ } { pname = "microsoft.build.utilities.core"; - version = "16.10.0"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.10.0/microsoft.build.utilities.core.16.10.0.nupkg"; - sha256 = "1rh3gzrz8mmzilvs33cxngv0a805nb47s615rvj4xk5igm384w14"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/17.0.0/microsoft.build.utilities.core.17.0.0.nupkg"; + sha256 = "0b7kylnvdqs81nmxdw7alwij8b19wm00iqicb9gkiklxjfyd8xav"; }; } { @@ -185,82 +177,90 @@ } { pname = "microsoft.codeanalysis.common"; - version = "4.0.0-4.21427.11"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-4.21427.11/microsoft.codeanalysis.common.4.0.0-4.21427.11.nupkg"; - sha256 = "15q6a2z3ms2vyrfk4y7biniygy0brr3ddb8mn700zg4sl84vphcz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-6.21526.21/microsoft.codeanalysis.common.4.0.0-6.21526.21.nupkg"; + sha256 = "0sv5hxadf9pbclssc9kq2cnvfkrnb0f2f4gmqhp2cy4xkr9fjn92"; }; } { pname = "microsoft.codeanalysis.csharp"; - version = "4.0.0-4.21427.11"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.4.0.0-4.21427.11.nupkg"; - sha256 = "0x3l774higkpbbk4f1naf57c039g8qvvdvb3963m7g54qn4zhvdh"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-6.21526.21/microsoft.codeanalysis.csharp.4.0.0-6.21526.21.nupkg"; + sha256 = "0cgp6rjw0lj3hr19sg5xvb5g29amrnng6y23rzcv5knw7a6zavs7"; }; } { pname = "microsoft.codeanalysis.csharp.features"; - version = "4.0.0-4.21427.11"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.features.4.0.0-4.21427.11.nupkg"; - sha256 = "0w0wrssv0ix4z9609a34k6a5kc4p85gy76p676fdg6hyf6pzd78m"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-6.21526.21/microsoft.codeanalysis.csharp.features.4.0.0-6.21526.21.nupkg"; + sha256 = "1a8xhrc4g2xlhmangcj0hv9872fw3zv1bcq52b54vczm6aym39pj"; }; } { pname = "microsoft.codeanalysis.csharp.scripting"; - version = "4.0.0-4.21427.11"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.scripting.4.0.0-4.21427.11.nupkg"; - sha256 = "0lmfbkxqp8p52wg2lsyxpavabk318s6ci02cxzgmxydc2pd9r70v"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-6.21526.21/microsoft.codeanalysis.csharp.scripting.4.0.0-6.21526.21.nupkg"; + sha256 = "1mlf75v2nabfi9hwx9q2d14mcxlz3n8gdkczpyvvyfh3f72pl4x3"; }; } { pname = "microsoft.codeanalysis.csharp.workspaces"; - version = "4.0.0-4.21427.11"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.workspaces.4.0.0-4.21427.11.nupkg"; - sha256 = "0j5c9v4nfahvnasz895czk1cp46b2d98px1gdar2ik9c5630vxwi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-6.21526.21/microsoft.codeanalysis.csharp.workspaces.4.0.0-6.21526.21.nupkg"; + sha256 = "04r6crnqml1c8mabsfrjzxc6bq6ndc9wwqwy8zsal80gwa54yj3v"; }; } { pname = "microsoft.codeanalysis.externalaccess.omnisharp"; - version = "4.0.0-4.21427.11"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-4.21427.11/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-4.21427.11.nupkg"; - sha256 = "0qy8xiv1j8awmbbgy16b2y9rhymxhx8kcmfylhxi1ryqql4mrpg2"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-6.21526.21/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-6.21526.21.nupkg"; + sha256 = "1f7wp5829wz8nrafqwlr74p3xgw86591cl2d9dnhs8cp9p6y5ah9"; }; } { pname = "microsoft.codeanalysis.externalaccess.omnisharp.csharp"; - version = "4.0.0-4.21427.11"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-4.21427.11/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-4.21427.11.nupkg"; - sha256 = "0mp1gkfdrdjcryqdj76ilpmjh0w8z4h313djjplcawwk76369mnc"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-6.21526.21/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-6.21526.21.nupkg"; + sha256 = "1mc9h0svsqdrmr8bk1zgvjn1awc06mwhsp34q8grcb6n1w641hsp"; }; } { pname = "microsoft.codeanalysis.features"; - version = "4.0.0-4.21427.11"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-4.21427.11/microsoft.codeanalysis.features.4.0.0-4.21427.11.nupkg"; - sha256 = "03vclmmxch3jrjamr9lg899s9wsfxw9yf53p9yfwvcr8wml4cwpz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-6.21526.21/microsoft.codeanalysis.features.4.0.0-6.21526.21.nupkg"; + sha256 = "0bg93pzv89v0s74mn52ng4cz2ys2bk8z96b3ml06r9wa3piz08la"; }; } { pname = "microsoft.codeanalysis.scripting.common"; - version = "4.0.0-4.21427.11"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-4.21427.11/microsoft.codeanalysis.scripting.common.4.0.0-4.21427.11.nupkg"; - sha256 = "15fkbw651v9lliqdmg1k61dqzasrssahyhrhwg24m111rgh86fbn"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-6.21526.21/microsoft.codeanalysis.scripting.common.4.0.0-6.21526.21.nupkg"; + sha256 = "0s5h10zj2qyfs0a09agdba06vc09pcq2wamr7pf8dx415vkjswyj"; }; } { pname = "microsoft.codeanalysis.workspaces.common"; - version = "4.0.0-4.21427.11"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-4.21427.11/microsoft.codeanalysis.workspaces.common.4.0.0-4.21427.11.nupkg"; - sha256 = "0k4qjkkg4mllizialzm463ssm3faqcqjnw19kbcnrzm5cd72i7cy"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-6.21526.21/microsoft.codeanalysis.workspaces.common.4.0.0-6.21526.21.nupkg"; + sha256 = "0kp2l72zpfydfqv5cm8wqvk86wpgh946j8sw9hvhm3xwzflchl7b"; + }; + } + { + pname = "microsoft.csharp"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.0.1/microsoft.csharp.4.0.1.nupkg"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }; } { @@ -289,18 +289,18 @@ } { pname = "microsoft.extensions.caching.abstractions"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/5.0.0/microsoft.extensions.caching.abstractions.5.0.0.nupkg"; - sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/6.0.0/microsoft.extensions.caching.abstractions.6.0.0.nupkg"; + sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }; } { pname = "microsoft.extensions.caching.memory"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/5.0.0/microsoft.extensions.caching.memory.5.0.0.nupkg"; - sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/6.0.0/microsoft.extensions.caching.memory.6.0.0.nupkg"; + sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; }; } { @@ -313,10 +313,10 @@ } { pname = "microsoft.extensions.configuration"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/5.0.0/microsoft.extensions.configuration.5.0.0.nupkg"; - sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/6.0.0/microsoft.extensions.configuration.6.0.0.nupkg"; + sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }; } { @@ -329,10 +329,10 @@ } { pname = "microsoft.extensions.configuration.abstractions"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/5.0.0/microsoft.extensions.configuration.abstractions.5.0.0.nupkg"; - sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/6.0.0/microsoft.extensions.configuration.abstractions.6.0.0.nupkg"; + sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }; } { @@ -345,42 +345,42 @@ } { pname = "microsoft.extensions.configuration.binder"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/5.0.0/microsoft.extensions.configuration.binder.5.0.0.nupkg"; - sha256 = "0sld0bh2k5kss32i3nf8mwqkjagmw0d1cdfmxm87ckiicwm413a0"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/6.0.0/microsoft.extensions.configuration.binder.6.0.0.nupkg"; + sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }; } { pname = "microsoft.extensions.configuration.commandline"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/5.0.0/microsoft.extensions.configuration.commandline.5.0.0.nupkg"; - sha256 = "084hnz5l0vr15ay23rksqipslqnz3pp30w9hsirpx1iqdm5688mc"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/6.0.0/microsoft.extensions.configuration.commandline.6.0.0.nupkg"; + sha256 = "1hb4qrq9xdxzh2px515pv1vkz1jigwaxw1hfg9w8s6pgl8z04l4c"; }; } { pname = "microsoft.extensions.configuration.environmentvariables"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/5.0.0/microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg"; - sha256 = "03gvckj10ljk1mir9g8cf3cajsnihhvmh8z8341gkr9h5653qkv0"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/6.0.0/microsoft.extensions.configuration.environmentvariables.6.0.0.nupkg"; + sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }; } { pname = "microsoft.extensions.configuration.fileextensions"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/5.0.0/microsoft.extensions.configuration.fileextensions.5.0.0.nupkg"; - sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/6.0.0/microsoft.extensions.configuration.fileextensions.6.0.0.nupkg"; + sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }; } { pname = "microsoft.extensions.configuration.json"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/5.0.0/microsoft.extensions.configuration.json.5.0.0.nupkg"; - sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/6.0.0/microsoft.extensions.configuration.json.6.0.0.nupkg"; + sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }; } { @@ -393,10 +393,10 @@ } { pname = "microsoft.extensions.dependencyinjection"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/5.0.0/microsoft.extensions.dependencyinjection.5.0.0.nupkg"; - sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/6.0.0/microsoft.extensions.dependencyinjection.6.0.0.nupkg"; + sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }; } { @@ -409,42 +409,42 @@ } { pname = "microsoft.extensions.dependencyinjection.abstractions"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/5.0.0/microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg"; - sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/6.0.0/microsoft.extensions.dependencyinjection.abstractions.6.0.0.nupkg"; + sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }; } { pname = "microsoft.extensions.dependencymodel"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/5.0.0/microsoft.extensions.dependencymodel.5.0.0.nupkg"; - sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/6.0.0/microsoft.extensions.dependencymodel.6.0.0.nupkg"; + sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }; } { pname = "microsoft.extensions.fileproviders.abstractions"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/5.0.0/microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg"; - sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/6.0.0/microsoft.extensions.fileproviders.abstractions.6.0.0.nupkg"; + sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }; } { pname = "microsoft.extensions.fileproviders.physical"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/5.0.0/microsoft.extensions.fileproviders.physical.5.0.0.nupkg"; - sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/6.0.0/microsoft.extensions.fileproviders.physical.6.0.0.nupkg"; + sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }; } { pname = "microsoft.extensions.filesystemglobbing"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/5.0.0/microsoft.extensions.filesystemglobbing.5.0.0.nupkg"; - sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/6.0.0/microsoft.extensions.filesystemglobbing.6.0.0.nupkg"; + sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }; } { @@ -457,10 +457,10 @@ } { pname = "microsoft.extensions.logging"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/5.0.0/microsoft.extensions.logging.5.0.0.nupkg"; - sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/6.0.0/microsoft.extensions.logging.6.0.0.nupkg"; + sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }; } { @@ -481,26 +481,26 @@ } { pname = "microsoft.extensions.logging.abstractions"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/5.0.0/microsoft.extensions.logging.abstractions.5.0.0.nupkg"; - sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/6.0.0/microsoft.extensions.logging.abstractions.6.0.0.nupkg"; + sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }; } { pname = "microsoft.extensions.logging.configuration"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/5.0.0/microsoft.extensions.logging.configuration.5.0.0.nupkg"; - sha256 = "1kmjax24w0ph362jr64rr6f8pyn6ayq39k502q9yrgr7zgrv65pa"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/6.0.0/microsoft.extensions.logging.configuration.6.0.0.nupkg"; + sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }; } { pname = "microsoft.extensions.logging.console"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/5.0.0/microsoft.extensions.logging.console.5.0.0.nupkg"; - sha256 = "162akclrhk5r62fza8yr30p5824inwmrpq2s510c3a64v76v9cqz"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/6.0.0/microsoft.extensions.logging.console.6.0.0.nupkg"; + sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }; } { @@ -513,10 +513,10 @@ } { pname = "microsoft.extensions.options"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/5.0.0/microsoft.extensions.options.5.0.0.nupkg"; - sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/6.0.0/microsoft.extensions.options.6.0.0.nupkg"; + sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }; } { @@ -529,10 +529,10 @@ } { pname = "microsoft.extensions.options.configurationextensions"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/5.0.0/microsoft.extensions.options.configurationextensions.5.0.0.nupkg"; - sha256 = "1085yrfgc70am43v8i5rxh14kal3bhdd5q85vgny5qp7y1rw0xyw"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/6.0.0/microsoft.extensions.options.configurationextensions.6.0.0.nupkg"; + sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }; } { @@ -545,18 +545,58 @@ } { pname = "microsoft.extensions.primitives"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/5.0.0/microsoft.extensions.primitives.5.0.0.nupkg"; - sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/6.0.0/microsoft.extensions.primitives.6.0.0.nupkg"; + sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }; } { - pname = "microsoft.netcore.app.ref"; - version = "3.1.0"; + pname = "microsoft.netcore.app.host.win-arm64"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"; - sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-arm64/6.0.0/microsoft.netcore.app.host.win-arm64.6.0.0.nupkg"; + sha256 = "1cbqpyha0ys7f6pm90mxmr0f070imhqfnn9kgvi3hqszbv9fv808"; + }; + } + { + pname = "microsoft.netcore.app.host.win-x64"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x64/6.0.0/microsoft.netcore.app.host.win-x64.6.0.0.nupkg"; + sha256 = "1016ld3kg4dav2yxxh0i32cy0ixv7s0wl9czydbhkbs2d8669kfx"; + }; + } + { + pname = "microsoft.netcore.app.host.win-x86"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x86/6.0.0/microsoft.netcore.app.host.win-x86.6.0.0.nupkg"; + sha256 = "19fyd762mhgjw6zr65hms0gi32pg0iinsrzz88i00n75y6cmyg36"; + }; + } + { + pname = "microsoft.netcore.app.runtime.win-arm64"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-arm64/6.0.0/microsoft.netcore.app.runtime.win-arm64.6.0.0.nupkg"; + sha256 = "0jd3h6q09v4wfam9dbl6yfkjy6b7y1wn87gqv2gzf088q9hfc1mc"; + }; + } + { + pname = "microsoft.netcore.app.runtime.win-x64"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x64/6.0.0/microsoft.netcore.app.runtime.win-x64.6.0.0.nupkg"; + sha256 = "13x1nkigy3nhbr8gxalij7krmzxpciyq4i8k7jdy9278zs1lm5a6"; + }; + } + { + pname = "microsoft.netcore.app.runtime.win-x86"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x86/6.0.0/microsoft.netcore.app.runtime.win-x86.6.0.0.nupkg"; + sha256 = "0p0y3njb618l4ihbsh033jhd8yn1sp8gfhwn722my2166saisjg5"; }; } { @@ -591,6 +631,14 @@ sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }; } + { + pname = "microsoft.netcore.platforms"; + version = "3.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.0.0/microsoft.netcore.platforms.3.0.0.nupkg"; + sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; + }; + } { pname = "microsoft.netcore.platforms"; version = "3.1.0"; @@ -657,26 +705,18 @@ } { pname = "microsoft.testplatform.objectmodel"; - version = "16.9.4"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.9.4/microsoft.testplatform.objectmodel.16.9.4.nupkg"; - sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/17.0.0/microsoft.testplatform.objectmodel.17.0.0.nupkg"; + sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }; } { pname = "microsoft.testplatform.translationlayer"; - version = "16.9.4"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.9.4/microsoft.testplatform.translationlayer.16.9.4.nupkg"; - sha256 = "0y5w2zflvq06jim2i6d49qi45ix0b8vlyf024w29n5g1lb570qf0"; - }; - } - { - pname = "microsoft.visualstudio.debugger.contracts"; - version = "17.2.0-beta.21417.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21417.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21417.1.nupkg"; - sha256 = "14v8d0hp6p1jn4i6b12r6vx4cvxycpb37a0zh0amz0qkg4afr12d"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/17.0.0/microsoft.testplatform.translationlayer.17.0.0.nupkg"; + sha256 = "08c6d9aiicpj8hsjb77rz7d2vmw7ivkcc0l1vgdgxddzjhjpy0pi"; }; } { @@ -775,6 +815,14 @@ sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }; } + { + pname = "netstandard.library"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.0/netstandard.library.2.0.0.nupkg"; + sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; + }; + } { pname = "netstandard.library"; version = "2.0.3"; @@ -793,10 +841,10 @@ } { pname = "newtonsoft.json"; - version = "12.0.3"; + version = "13.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/12.0.3/newtonsoft.json.12.0.3.nupkg"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg"; + sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }; } { @@ -807,14 +855,6 @@ sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }; } - { - pname = "nuget.common"; - version = "5.10.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.common/5.10.0/nuget.common.5.10.0.nupkg"; - sha256 = "0qy6blgppgvxpfcricmvva3qzddk18dza5vy851jrbqshvf9g7kx"; - }; - } { pname = "nuget.common"; version = "5.2.0"; @@ -824,11 +864,11 @@ }; } { - pname = "nuget.configuration"; - version = "5.10.0"; + pname = "nuget.common"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/5.10.0/nuget.configuration.5.10.0.nupkg"; - sha256 = "0xb1n94lrwa6k83i9xcsq68202086p2gj74gzlbhlvb8c2pw6lbb"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.common/6.0.0/nuget.common.6.0.0.nupkg"; + sha256 = "0vbvmx2zzg54fv6617afi3z49cala70qj7jfxqnldjbc1z2c4b7r"; }; } { @@ -840,11 +880,11 @@ }; } { - pname = "nuget.dependencyresolver.core"; - version = "5.10.0"; + pname = "nuget.configuration"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/5.10.0/nuget.dependencyresolver.core.5.10.0.nupkg"; - sha256 = "0dhhclm281ihpfsjzxw34l6zlw49nwzyjiynkmsbcj9icfkp3y4r"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/6.0.0/nuget.configuration.6.0.0.nupkg"; + sha256 = "1qnrahn4rbb55ra4zg9c947kbm9wdiv344f12c3b4c5i7bfmivx3"; }; } { @@ -855,6 +895,14 @@ sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r"; }; } + { + pname = "nuget.dependencyresolver.core"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/6.0.0/nuget.dependencyresolver.core.6.0.0.nupkg"; + sha256 = "04w7wbfsb647apqrrzx3gj2jjlg09wdzmxj62bx43ngr34i4q83n"; + }; + } { pname = "nuget.frameworks"; version = "5.0.0"; @@ -863,14 +911,6 @@ sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }; } - { - pname = "nuget.frameworks"; - version = "5.10.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.10.0/nuget.frameworks.5.10.0.nupkg"; - sha256 = "0gb6n8rg2jpjp52icgpb3wjdfs3qllh5vbcz8hbcix3l7dncy3v2"; - }; - } { pname = "nuget.frameworks"; version = "5.2.0"; @@ -880,11 +920,11 @@ }; } { - pname = "nuget.librarymodel"; - version = "5.10.0"; + pname = "nuget.frameworks"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/5.10.0/nuget.librarymodel.5.10.0.nupkg"; - sha256 = "0b6mmq2mqfr06ypc772dmcd8bz55gkyfrgn0j3nrgkcdww4fzf9q"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/6.0.0/nuget.frameworks.6.0.0.nupkg"; + sha256 = "11p6mhh36s3vmnylfzw125fqivjk1xj75bvcxdav8n4sbk7d3gqs"; }; } { @@ -896,11 +936,11 @@ }; } { - pname = "nuget.packaging"; - version = "5.10.0"; + pname = "nuget.librarymodel"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/5.10.0/nuget.packaging.5.10.0.nupkg"; - sha256 = "11g0v061axhp0nisclq5cm2mc92d69z92giz9l40ih478c5nishw"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/6.0.0/nuget.librarymodel.6.0.0.nupkg"; + sha256 = "0pg4m6v2j5vvld7s57fvx28ix7wlah6dakhi55qpavmkmnzp6g3f"; }; } { @@ -912,19 +952,19 @@ }; } { - pname = "nuget.packaging.core"; - version = "5.10.0"; + pname = "nuget.packaging"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/5.10.0/nuget.packaging.core.5.10.0.nupkg"; - sha256 = "1frxwwl583qwsj84rjgvd7il6icgxzxxps6yng75qx8ppf99dsr6"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/6.0.0/nuget.packaging.6.0.0.nupkg"; + sha256 = "0vlcda74h6gq3q569kbbz4n3d26vihxaldvvi2md3phqf8jpvhjb"; }; } { - pname = "nuget.projectmodel"; - version = "5.10.0"; + pname = "nuget.packaging.core"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/5.10.0/nuget.projectmodel.5.10.0.nupkg"; - sha256 = "1cqg319n986wciskrqsfawfhqp1d7a7i2qjd0qplpckyw8msng2i"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/6.0.0/nuget.packaging.core.6.0.0.nupkg"; + sha256 = "1kk7rf7cavdicxb4bmwcgwykr53nrk38m6r49hvs85jhhvg9jmyf"; }; } { @@ -936,11 +976,11 @@ }; } { - pname = "nuget.protocol"; - version = "5.10.0"; + pname = "nuget.projectmodel"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/5.10.0/nuget.protocol.5.10.0.nupkg"; - sha256 = "0cs9qp169zx6g2w5bzrlhxv0q1i8mb8dxlb2nkiq7pkvah86rxkc"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/6.0.0/nuget.projectmodel.6.0.0.nupkg"; + sha256 = "1fldxlw88jqgy0cfgfa7drqpxf909kfchcvk4nxj7vyhza2q715y"; }; } { @@ -952,11 +992,11 @@ }; } { - pname = "nuget.versioning"; - version = "5.10.0"; + pname = "nuget.protocol"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/5.10.0/nuget.versioning.5.10.0.nupkg"; - sha256 = "10vvw6vjpx0c26rlxh7dnpyp4prahn25717ccd8bzkjmyzhm90cs"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/6.0.0/nuget.protocol.6.0.0.nupkg"; + sha256 = "16rs9hfra4bly8jp0lxsg0gbpi9wvxh7nrxrdkbjm01vb0azw823"; }; } { @@ -967,6 +1007,14 @@ sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k"; }; } + { + pname = "nuget.versioning"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/6.0.0/nuget.versioning.6.0.0.nupkg"; + sha256 = "0xxrz0p9vd2ax8hcrdxcp3h6gv8qcy6mngp49dvg1ijjjr1jb85k"; + }; + } { pname = "omnisharp.extensions.jsonrpc"; version = "0.19.0"; @@ -1007,6 +1055,142 @@ sha256 = "0s3h9v5p043ip27g9jcvd0np9q3hn2pfv6gn539m45yb5d74a6i5"; }; } + { + pname = "runtime.any.system.collections"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }; + } + { + pname = "runtime.any.system.diagnostics.tools"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tools/4.3.0/runtime.any.system.diagnostics.tools.4.3.0.nupkg"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }; + } + { + pname = "runtime.any.system.diagnostics.tracing"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }; + } + { + pname = "runtime.any.system.globalization"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }; + } + { + pname = "runtime.any.system.globalization.calendars"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }; + } + { + pname = "runtime.any.system.io"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }; + } + { + pname = "runtime.any.system.reflection"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }; + } + { + pname = "runtime.any.system.reflection.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.extensions/4.3.0/runtime.any.system.reflection.extensions.4.3.0.nupkg"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }; + } + { + pname = "runtime.any.system.reflection.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }; + } + { + pname = "runtime.any.system.resources.resourcemanager"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }; + } + { + pname = "runtime.any.system.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }; + } + { + pname = "runtime.any.system.runtime.handles"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }; + } + { + pname = "runtime.any.system.runtime.interopservices"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }; + } + { + pname = "runtime.any.system.text.encoding"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }; + } + { + pname = "runtime.any.system.text.encoding.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }; + } + { + pname = "runtime.any.system.threading.tasks"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }; + } + { + pname = "runtime.any.system.threading.timer"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.timer/4.3.0/runtime.any.system.threading.timer.4.3.0.nupkg"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }; + } { pname = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; @@ -1135,6 +1319,94 @@ sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }; } + { + pname = "runtime.win10-arm64.runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win10-arm64.runtime.native.system.io.compression/4.3.0/runtime.win10-arm64.runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "1jrmrmqscn8cn2n3piar8n85gfsra7vlai23w9ldzprh0y4dw3v1"; + }; + } + { + pname = "runtime.win7.system.private.uri"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win7.system.private.uri/4.3.0/runtime.win7.system.private.uri.4.3.0.nupkg"; + sha256 = "0bxkcmklp556dc43bra8ngc8wymcbbflcydi0xwq0j22gm66xf2m"; + }; + } + { + pname = "runtime.win7-x64.runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win7-x64.runtime.native.system.io.compression/4.3.0/runtime.win7-x64.runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "1dmbmksnxg12fk2p0k7rzy16448mddr2sfrnqs0rhhrzl0z22zi5"; + }; + } + { + pname = "runtime.win7-x86.runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win7-x86.runtime.native.system.io.compression/4.3.0/runtime.win7-x86.runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "08ppln62lcq3bz2kyxqyvh98payd5a7w8fzmb53mznkcfv32n55b"; + }; + } + { + pname = "runtime.win.microsoft.win32.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.microsoft.win32.primitives/4.3.0/runtime.win.microsoft.win32.primitives.4.3.0.nupkg"; + sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; + }; + } + { + pname = "runtime.win.system.console"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.console/4.3.0/runtime.win.system.console.4.3.0.nupkg"; + sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; + }; + } + { + pname = "runtime.win.system.diagnostics.debug"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.diagnostics.debug/4.3.0/runtime.win.system.diagnostics.debug.4.3.0.nupkg"; + sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; + }; + } + { + pname = "runtime.win.system.io.filesystem"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.io.filesystem/4.3.0/runtime.win.system.io.filesystem.4.3.0.nupkg"; + sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; + }; + } + { + pname = "runtime.win.system.net.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.net.primitives/4.3.0/runtime.win.system.net.primitives.4.3.0.nupkg"; + sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; + }; + } + { + pname = "runtime.win.system.net.sockets"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.net.sockets/4.3.0/runtime.win.system.net.sockets.4.3.0.nupkg"; + sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; + }; + } + { + pname = "runtime.win.system.runtime.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.runtime.extensions/4.3.0/runtime.win.system.runtime.extensions.4.3.0.nupkg"; + sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; + }; + } { pname = "sqlitepclraw.bundle_green"; version = "2.0.4"; @@ -1199,14 +1471,6 @@ sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }; } - { - pname = "system.buffers"; - version = "4.5.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; - sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; - }; - } { pname = "system.buffers"; version = "4.5.1"; @@ -1271,6 +1535,14 @@ sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }; } + { + pname = "system.componentmodel.annotations"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/5.0.0/system.componentmodel.annotations.5.0.0.nupkg"; + sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; + }; + } { pname = "system.componentmodel.composition"; version = "4.5.0"; @@ -1343,6 +1615,14 @@ sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }; } + { + pname = "system.diagnostics.debug"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }; + } { pname = "system.diagnostics.debug"; version = "4.3.0"; @@ -1361,10 +1641,26 @@ } { pname = "system.diagnostics.diagnosticsource"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/5.0.0/system.diagnostics.diagnosticsource.5.0.0.nupkg"; - sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/6.0.0/system.diagnostics.diagnosticsource.6.0.0.nupkg"; + sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; + }; + } + { + pname = "system.diagnostics.process"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }; + } + { + pname = "system.diagnostics.tools"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }; } { @@ -1391,6 +1687,14 @@ sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; }; } + { + pname = "system.dynamic.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }; + } { pname = "system.formats.asn1"; version = "5.0.0"; @@ -1463,6 +1767,14 @@ sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }; } + { + pname = "system.io.filesystem"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }; + } { pname = "system.io.filesystem"; version = "4.3.0"; @@ -1471,6 +1783,14 @@ sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }; } + { + pname = "system.io.filesystem.primitives"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }; + } { pname = "system.io.filesystem.primitives"; version = "4.3.0"; @@ -1495,6 +1815,14 @@ sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }; } + { + pname = "system.linq"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.linq/4.1.0/system.linq.4.1.0.nupkg"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }; + } { pname = "system.linq"; version = "4.3.0"; @@ -1503,6 +1831,14 @@ sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }; } + { + pname = "system.linq.expressions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.1.0/system.linq.expressions.4.1.0.nupkg"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }; + } { pname = "system.linq.expressions"; version = "4.3.0"; @@ -1535,6 +1871,22 @@ sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }; } + { + pname = "system.net.http"; + version = "4.3.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.4/system.net.http.4.3.4.nupkg"; + sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; + }; + } + { + pname = "system.net.nameresolution"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }; + } { pname = "system.net.primitives"; version = "4.3.0"; @@ -1575,6 +1927,14 @@ sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }; } + { + pname = "system.objectmodel"; + version = "4.0.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }; + } { pname = "system.objectmodel"; version = "4.3.0"; @@ -1583,6 +1943,14 @@ sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }; } + { + pname = "system.private.uri"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; + }; + } { pname = "system.reactive"; version = "4.4.1"; @@ -1615,6 +1983,14 @@ sha256 = "0cdnl4i9mfk7kx2ylglayqwqw7kl5k1xr8siaxch45hfyc2cpds8"; }; } + { + pname = "system.reflection.emit"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }; + } { pname = "system.reflection.emit"; version = "4.3.0"; @@ -1624,11 +2000,11 @@ }; } { - pname = "system.reflection.emit"; - version = "4.6.0"; + pname = "system.reflection.emit.ilgeneration"; + version = "4.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.6.0/system.reflection.emit.4.6.0.nupkg"; - sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }; } { @@ -1640,11 +2016,11 @@ }; } { - pname = "system.reflection.emit.ilgeneration"; - version = "4.6.0"; + pname = "system.reflection.emit.lightweight"; + version = "4.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.6.0/system.reflection.emit.ilgeneration.4.6.0.nupkg"; - sha256 = "0jxc26k5q0rwrldi30bfbrfw4jh3kvribzwc8ryzr24kmhr3vv96"; + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }; } { @@ -1656,11 +2032,11 @@ }; } { - pname = "system.reflection.emit.lightweight"; - version = "4.6.0"; + pname = "system.reflection.extensions"; + version = "4.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.6.0/system.reflection.emit.lightweight.4.6.0.nupkg"; - sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }; } { @@ -1703,6 +2079,14 @@ sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }; } + { + pname = "system.reflection.typeextensions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }; + } { pname = "system.reflection.typeextensions"; version = "4.3.0"; @@ -1775,14 +2159,6 @@ sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }; } - { - pname = "system.runtime.compilerservices.unsafe"; - version = "4.7.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.0/system.runtime.compilerservices.unsafe.4.7.0.nupkg"; - sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; - }; - } { pname = "system.runtime.compilerservices.unsafe"; version = "4.7.1"; @@ -1799,6 +2175,14 @@ sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }; } + { + pname = "system.runtime.compilerservices.unsafe"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg"; + sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; + }; + } { pname = "system.runtime.extensions"; version = "4.1.0"; @@ -1879,6 +2263,14 @@ sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }; } + { + pname = "system.runtime.serialization.primitives"; + version = "4.1.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }; + } { pname = "system.security.accesscontrol"; version = "4.5.0"; @@ -1903,6 +2295,14 @@ sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }; } + { + pname = "system.security.claims"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.claims/4.3.0/system.security.claims.4.3.0.nupkg"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }; + } { pname = "system.security.cryptography.algorithms"; version = "4.3.0"; @@ -1991,6 +2391,14 @@ sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }; } + { + pname = "system.security.cryptography.protecteddata"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.3.0/system.security.cryptography.protecteddata.4.3.0.nupkg"; + sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; + }; + } { pname = "system.security.cryptography.protecteddata"; version = "4.4.0"; @@ -2039,6 +2447,22 @@ sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; }; } + { + pname = "system.security.principal"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }; + } + { + pname = "system.security.principal.windows"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }; + } { pname = "system.security.principal.windows"; version = "4.5.0"; @@ -2095,6 +2519,14 @@ sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }; } + { + pname = "system.text.encoding.extensions"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }; + } { pname = "system.text.encoding.extensions"; version = "4.3.0"; @@ -2105,34 +2537,42 @@ } { pname = "system.text.encodings.web"; - version = "4.7.0"; + version = "5.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; - sha256 = "0sd3bihfar5rwm6nib4lhyys306nkm02qvk6p6sgzmnlfmma2wn3"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.1/system.text.encodings.web.5.0.1.nupkg"; + sha256 = "00yg63qnp94q2qryxxggzigi276bibb8b3b96gcvsyrxy7b703n9"; }; } { pname = "system.text.encodings.web"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.0/system.text.encodings.web.5.0.0.nupkg"; - sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/6.0.0/system.text.encodings.web.6.0.0.nupkg"; + sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }; } { pname = "system.text.json"; - version = "4.7.0"; + version = "5.0.2"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; - sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.2/system.text.json.5.0.2.nupkg"; + sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }; } { pname = "system.text.json"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.0/system.text.json.5.0.0.nupkg"; - sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/6.0.0/system.text.json.6.0.0.nupkg"; + sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; + }; + } + { + pname = "system.text.regularexpressions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }; } { @@ -2159,6 +2599,14 @@ sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }; } + { + pname = "system.threading.overlapped"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg"; + sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; + }; + } { pname = "system.threading.tasks"; version = "4.0.11"; @@ -2185,18 +2633,18 @@ } { pname = "system.threading.tasks.extensions"; - version = "4.3.0"; + version = "4.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }; } { pname = "system.threading.tasks.extensions"; - version = "4.5.2"; + version = "4.3.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; - sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }; } { @@ -2215,6 +2663,22 @@ sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }; } + { + pname = "system.threading.thread"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }; + } + { + pname = "system.threading.threadpool"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }; + } { pname = "system.threading.timer"; version = "4.3.0"; @@ -2239,6 +2703,14 @@ sha256 = "11dmyx3j0jafjx5r9mkj1v4w2a4rzrdn8fgwm2d1g7fs1ayqcvy9"; }; } + { + pname = "system.xml.readerwriter"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }; + } { pname = "system.xml.readerwriter"; version = "4.3.0"; @@ -2247,6 +2719,14 @@ sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }; } + { + pname = "system.xml.xdocument"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }; + } { pname = "system.xml.xdocument"; version = "4.3.0"; From 095370811e5a69e9b0290e773a288f2699181430 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 8 Feb 2022 14:31:41 -0300 Subject: [PATCH 157/194] fluxcd: 0.26.1 -> 0.26.2 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index dde508cb12fc..35da4e2fbe2b 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.26.1"; - sha256 = "10l02cw0ypci9vaman1nm9z36fshqwwf0gk16rvsc82d02lv4iq5"; - manifestsSha256 = "0gffjmcxsf9c4f6g60nwq88snm6lar0qd53xp0csr4n5sy7zg6dm"; + version = "0.26.2"; + sha256 = "1p99bjqlwyibycpby9fnzfmfd826zaw7k7d4f4p4gjpd7dphlrp1"; + manifestsSha256 = "1s1hx754xa63s7in7gcrr146nkyvadba6vmy1bagjcxibxc3qdqy"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-IJGp4QWZbTzPHeawyjJI0aN4LP5ZV2mb5pUusfQ4rfE="; + vendorSha256 = "sha256-9MMEqJiplg7kmMmbHnTBEQ+GF+dBL7bpzs5Q0IYcMXU="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From 80fba0e5d31a593b320d7cac03e6e936ee177289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 20:31:35 +0100 Subject: [PATCH 158/194] python39Packages.setupmeta: fix version number --- .../python-modules/setupmeta/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index 07b521ee9495..c42565082cfd 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -23,14 +23,25 @@ buildPythonPackage rec { sha256 = "21hABRiY8CTKkpFjePgBAtjs4/G5eFS3aPNMCBC41CY="; }; + preBuild = '' + export PYGRADLE_PROJECT_VERSION=${version}; + ''; + + nativeBuildInputs = [ + setuptools-scm + ]; + checkInputs = [ git mock pep440 pytestCheckHook - setuptools-scm ]; + preCheck = '' + unset PYGRADLE_PROJECT_VERSION + ''; + disabledTests = [ # Tests want to scan site-packages "test_check_dependencies" From 1c7214f164f2430093999c33b592778948fa4657 Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Sat, 5 Feb 2022 22:48:25 +0000 Subject: [PATCH 159/194] vscode-extensions.vadimcn.vscode-lldb: 1.6.8 -> 1.6.10 Upgrade to the newest version. --- pkgs/misc/vscode-extensions/vscode-lldb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 2bc9321353d2..725c3b8fc15c 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.6.8"; + version = "1.6.10"; vscodeExtUniqueId = "${publisher}.${pname}"; @@ -13,7 +13,7 @@ let owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-/2iyWJfNjvk5n7KwWIu2gc24/21KWibU6IAPN/tJ8Q4="; + sha256 = "sha256-4PM/818UFHRZekfbdhS/Rz0Pu6HOjJEldi4YuBWECnI="; }; lldb = callPackage ./lldb.nix {}; @@ -25,7 +25,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-rG+Qw8ac9cCgCjfLFXLlohLk+zV5s1OaqzU0/nXiqgU="; + cargoSha256 = "sha256-Ch1X2vN+p7oCqSs/GIu5IzG+pcSKmQ+VwP2T8ycRhos="; nativeBuildInputs = [ makeWrapper ]; From e6c94c7f56c983c1bef30511c460b2e0b61e56da Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Tue, 8 Feb 2022 16:25:54 +0000 Subject: [PATCH 160/194] Remove oxalica as the maintainer at her request Added myself as the maintainer for now. --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/misc/vscode-extensions/vscode-lldb/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4eeffa46472f..ca162d3ddba7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13842,4 +13842,10 @@ github = "AmeerTaweel"; githubId = 20538273; }; + nigelgbanks = { + name = "Nigel Banks"; + email = "nigel.g.banks@gmail.com"; + github = "nigelgbanks"; + githubId = 487373; + }; } diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 725c3b8fc15c..7f20d0e71912 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation { description = "A native debugger extension for VSCode based on LLDB"; homepage = "https://github.com/vadimcn/vscode-lldb"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ oxalica ]; + maintainers = with maintainers; [ nigelgbanks ]; platforms = platforms.all; }; } From e9912ce72d015b71784df264fe5efcaa9dfa8253 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Tue, 8 Feb 2022 19:56:23 +0100 Subject: [PATCH 161/194] git-branchless: 0.3.8 -> 0.3.9 --- .../git-and-tools/git-branchless/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index 9a4d3878e8af..8cedd24be052 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-eDVC1tvAkCioV0Mi5f/Qkc0MMTNaoFXuvWXpllZ7PgE="; + sha256 = "sha256-SEmIZy8ql1MxcFR6zeif03DVha/SRZHajVwt3QOBBYU="; }; - cargoSha256 = "sha256-wtG/WTmZ13jxIawI9j9QKQm7jPx5TUs7MjqX+lq/Vf0="; + cargoSha256 = "sha256-mKfPxU1JoN/xLdPdwy3vo1M0qF9ag0T4Ls4dfvHn6Pc="; nativeBuildInputs = [ pkg-config ]; From 9181a25b036c84e0195cc3737b1666a29f387706 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 8 Feb 2022 15:38:24 +0000 Subject: [PATCH 162/194] syft: 0.36.0 -> 0.37.10 --- pkgs/tools/admin/syft/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 998fcdf59f48..24b6d4ddcb2c 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,27 +2,27 @@ buildGoModule rec { pname = "syft"; - version = "0.36.0"; + version = "0.37.10"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JNW4sozNtLey7uAj1xECR/ui+/1L02moZKuGzWXIh5k="; + sha256 = "sha256-j3/WE13djrgI7S6YISg9kPIkV0IR0C65QU8zj0z0MVg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; postFetch = '' cd "$out" commit="$(git rev-parse HEAD)" - source_date_epoch=$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad) + source_date_epoch="$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad)" substituteInPlace "$out/internal/version/build.go" \ --replace 'gitCommit = valueNotProvided' "gitCommit = \"$commit\"" \ --replace 'buildDate = valueNotProvided' "buildDate = \"$source_date_epoch\"" find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-urDDb+53KSvUOjVRY/geENIQM1vvBUDddlNpQw3LcLg="; + vendorSha256 = "sha256-gIcPxSzWzldR9UX4iB2fkwc0BfATT1B+Nge+sGefmj8="; nativeBuildInputs = [ installShellFiles ]; @@ -33,6 +33,7 @@ buildGoModule rec { "-w" "-X github.com/anchore/syft/internal/version.version=${version}" "-X github.com/anchore/syft/internal/version.gitTreeState=clean" + "-X github.com/anchore/syft/internal/version.gitDescription=v${version}" ]; # tests require a running docker instance From c803d8e88c2ca5b5083df61a6f47444de60de43e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Feb 2022 14:35:16 +0100 Subject: [PATCH 163/194] jitsi-meet-electron: 2.8.11 -> 2022.1.1 --- .../instant-messengers/jitsi-meet-electron/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 7bd27285fd47..2395a196f605 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.11"; + version = "2022.1.1"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "sha256-DznbSwA1UISw3EkIfM5hGgmIToeXsH1b1HB7UOgDTKU="; + sha256 = "0x3fdqgjnsd570b7nszfx3h8l5c8x2kg32ig85n2a2g481c7xi6l"; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4c3329cd244..316808c52af6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34445,7 +34445,7 @@ with pkgs; jami-daemon jami-libclient jami-client-gnome jami-client-qt; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { - electron = electron_13; + electron = electron_16; }; zenstates = callPackage ../os-specific/linux/zenstates {}; From 6c976d3099e3e4b3b61f86390e11eaee24db7155 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 8 Feb 2022 22:45:49 +0900 Subject: [PATCH 164/194] spago: 0.20.4 -> 0.20.5 --- pkgs/development/haskell-modules/configuration-nix.nix | 7 +------ pkgs/development/tools/purescript/spago/spago.nix | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7e51968fa451..40db78d42681 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -595,11 +595,6 @@ self: super: builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - spagoWithOverrides = super.spago.override { - # spago has not yet been updated for the latest dhall. - dhall = self.dhall_1_38_1; - }; - spagoDocs = overrideCabal (drv: { postUnpack = (drv.postUnpack or "") + '' # Spago includes the following two files directly into the binary @@ -625,7 +620,7 @@ self: super: builtins.intersectAttrs super { "$sourceRoot/templates/docs-search-app-0.0.11.js" \ "$sourceRoot/templates/purescript-docs-search-0.0.11" ''; - }) spagoWithOverrides; + }) super.spago; # Tests require network access. spagoWithoutChecks = dontCheck spagoDocs; diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index d5646a6c2fff..bbc76ef8cbc8 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -14,11 +14,11 @@ }: mkDerivation { pname = "spago"; - version = "0.20.4"; + version = "0.20.5"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "0dj7z2yr4s2kqjklbjdzsrmc5lqli322wg5k412jixxpmlx11a5f"; - rev = "33da63176fe07967761f43c83af9715f104013f0"; + sha256 = "1qjlag5wm1hls54gb1rjym3xj28xww2p3m58f38g6icar9qz4a72"; + rev = "2a70306d87ddb2a7a61cf5ac61fccd7d91ecae6c"; fetchSubmodules = true; }; isLibrary = true; From 018997e2c2792caf4fcf407a1a7b9d8cc23ab8aa Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 30 Jan 2022 16:42:27 +0000 Subject: [PATCH 165/194] n8n: 0.160.0 -> 0.162.0 --- .../networking/n8n/node-packages.nix | 382 ++++++++++-------- 1 file changed, 213 insertions(+), 169 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index e78448933b19..6a9c521cd291 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA=="; }; }; - "@azure/core-http-2.2.3" = { + "@azure/core-http-2.2.4" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.3.tgz"; - sha512 = "xr8AeszxP418rI//W38NfJDDr0kbVAPZkURZnZ+Fle+lLWeURjDE5zNIuocA1wUPoKSP8iXc0ApW6nPtbLGswA=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.4.tgz"; + sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A=="; }; }; "@azure/core-lro-2.2.3" = { @@ -112,13 +112,13 @@ let sha512 = "c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A=="; }; }; - "@babel/runtime-7.16.7" = { + "@babel/runtime-7.17.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.16.7"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz"; - sha512 = "9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.0.tgz"; + sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ=="; }; }; "@dabh/diagnostics-2.0.2" = { @@ -130,13 +130,13 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@fontsource/open-sans-4.5.2" = { + "@fontsource/open-sans-4.5.4" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.2"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.2.tgz"; - sha512 = "aDQrW8s0KslG2aKb9nM5R6fiQR9iPomqWXf6iZCC30qv/UFlSY14SppodA3rE//+w37EqsJjyUq3BSEYzLdisg=="; + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.4.tgz"; + sha512 = "iaEuU7l3VGA/bqWW9UsBD2bgFwCwDFwKlmOUft4Jps3pD3Zc9POMNYV0+mNyKbA4OIcIice32l+BMif8vY6pdg=="; }; }; "@icetee/ftp-0.3.15" = { @@ -220,6 +220,15 @@ let sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; }; }; + "@oclif/config-1.18.3" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.3.tgz"; + sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; + }; + }; "@oclif/errors-1.3.5" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -256,13 +265,13 @@ let sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw=="; }; }; - "@opentelemetry/api-1.0.4" = { + "@opentelemetry/api-1.1.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.4.tgz"; - sha512 = "BuJuXRSJNQ3QoKA6GWWDyuLpOUck+9hAXNMCnrloc1aWVoy6Xq6t9PUV08aBZ4Lutqq2LEHM486bpZqoViScog=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.1.0.tgz"; + sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ=="; }; }; "@rudderstack/rudder-sdk-node-1.0.6" = { @@ -454,22 +463,22 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/node-12.20.42" = { + "@types/node-12.20.43" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.42"; + version = "12.20.43"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.42.tgz"; - sha512 = "aI3/oo5DzyiI5R/xAhxxRzfZlWlsbbqdgxfTPkqu/Zt+23GXiJvMCyPJT4+xKSXOnLqoL8jJYMLTwvK2M3a5hw=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.43.tgz"; + sha512 = "HCfJdaYqJX3BCzeihgZrD7b85Cu05OC/GVJ4kEYIflwUs4jbnUlLLWoq7hw1LBcdvUyehO+gr6P5JQ895/2ZfA=="; }; }; - "@types/node-17.0.10" = { + "@types/node-17.0.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.10"; + version = "17.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.10.tgz"; - sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.15.tgz"; + sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; }; }; "@types/node-fetch-2.5.12" = { @@ -589,13 +598,13 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; - "accepts-1.3.7" = { + "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; + sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; "access-control-1.0.1" = { @@ -940,13 +949,13 @@ let sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; }; }; - "aws-sdk-2.1062.0" = { + "aws-sdk-2.1069.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1062.0"; + version = "2.1069.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1062.0.tgz"; - sha512 = "QIU8jwi7Uqyvw2HjsXXXUZv3V/6TinUzLewrdl2EdvonqZCXhwMgnZx2F9I2x62IKH1RqnINwFWdoK+OTgcAjA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1069.0.tgz"; + sha512 = "AF7/5JotrVd8g/D3WWHgQto+IryB1V7iudIYm+H+qxmkGOU3xvL63ChhEoLTY/CxuK/diayg0oWILEsXUn3dfw=="; }; }; "aws-sign2-0.7.0" = { @@ -1768,13 +1777,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "core-js-3.20.3" = { + "core-js-3.21.0" = { name = "core-js"; packageName = "core-js"; - version = "3.20.3"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz"; - sha512 = "vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz"; + sha512 = "YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ=="; }; }; "core-util-is-1.0.2" = { @@ -1786,13 +1795,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "crc-32-1.2.0" = { + "crc-32-1.2.1" = { name = "crc-32"; packageName = "crc-32"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; - sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz"; + sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w=="; }; }; "cron-1.7.2" = { @@ -2542,22 +2551,13 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "flatted-2.0.2" = { + "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; - version = "2.0.2"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; - sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; - }; - }; - "flatted-3.2.4" = { - name = "flatted"; - packageName = "flatted"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; - sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; }; "fn.name-1.1.0" = { @@ -3235,13 +3235,13 @@ let sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; }; }; - "ioredis-4.28.3" = { + "ioredis-4.28.5" = { name = "ioredis"; packageName = "ioredis"; - version = "4.28.3"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-4.28.3.tgz"; - sha512 = "9JOWVgBnuSxpIgfpjc1OeY1OLmA4t2KOWWURTDRXky+eWO0LZhI33pQNT9gYxANUXfh5p/zYephYni6GPRsksQ=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-4.28.5.tgz"; + sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; "ip-regex-2.1.0" = { @@ -3577,13 +3577,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "isbot-3.4.0" = { + "isbot-3.4.1" = { name = "isbot"; packageName = "isbot"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.4.0.tgz"; - sha512 = "0WOb6bbJ6gtpWVHQ30r5MzqvSrCNbZ70wFXAJWdXt/0LulF59uvBQnPgA7IelbOXEpV+CtLWkDxLB4TU7f0+VA=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.4.1.tgz"; + sha512 = "CyapceDROQ9dp9uGUh2d0D7q/MDGDt2B3rl/da+BZ0maCBI9bNlZMk3fr4dEO+LEsRY7ur3mfYNQPavCRDRJxg=="; }; }; "isexe-2.0.0" = { @@ -3820,13 +3820,13 @@ let sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg=="; }; }; - "libphonenumber-js-1.9.44" = { + "libphonenumber-js-1.9.48" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.9.44"; + version = "1.9.48"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.44.tgz"; - sha512 = "zhw8nUMJuQf7jG1dZfEOKKOS6M3QYIv3HnvB/vGohNd0QfxIQcObH3a6Y6s350H+9xgBeOXClOJkS0hJ0yvS3g=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.48.tgz"; + sha512 = "2aiDGkr5Ty7LZRhKhnMeV9tfRbzd2zahgF12I0v11AFwEelSdiu5t8/Npf3UejKcuoO4anqTdjnIW3dEtj1xYQ=="; }; }; "libqp-1.1.0" = { @@ -3991,6 +3991,15 @@ let sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; + }; + }; "lodash.once-4.1.1" = { name = "lodash.once"; packageName = "lodash.once"; @@ -4144,13 +4153,13 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; - "mappersmith-2.36.3" = { + "mappersmith-2.37.1" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.36.3"; + version = "2.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.36.3.tgz"; - sha512 = "izy4Gc7+VafMR/fDQukiEEBAfFoPGRYLBzFxXqXMR1IwAHqlQgSPRX+g/uIkaVqGRh+eb5c7sy8HNaBq9opwkA=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.37.1.tgz"; + sha512 = "3QiXhRADHTK/it1riJMJm/sHmLlGdw3pfLgZJQu9MfT1CNeiO93keNY0BVLlRmpPBsMER/P7kj3mtcAK2V331Q=="; }; }; "md5-2.3.0" = { @@ -4450,49 +4459,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.102.0" = { + "n8n-core-0.104.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.102.0"; + version = "0.104.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.102.0.tgz"; - sha512 = "9/suLELO/HBoEZ06bEv3cN7HZoR43qZlubM0BDXDhXJHBasfKcfegXYYacSfBxtTVX71cLffVgshJoJt8OtDcw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.104.0.tgz"; + sha512 = "rh8ooCF0zeVjic6JWByuCzcltpeV/OJjUmLcChXU3S6peggCvazvxlU6GOF/+YT69CeQdHwhTmOXSEevu0uzVQ=="; }; }; - "n8n-design-system-0.9.0" = { + "n8n-design-system-0.11.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.9.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.9.0.tgz"; - sha512 = "E1DoUDIvPTLAQ72mkg+MVS72QxDxa5UPxVqX4QeF/xAhUrXKfTWHveG5OxugW+mrEF5nO8IG08MEDOQCOzJZpQ=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.11.0.tgz"; + sha512 = "KL64XTr9sqqiBEEV7on2cdLooleHPyXClFL+THUy2oXDbGqdlyCGykukU7S4aX+nSjrJEQEDMaMcbw3NCHrumg=="; }; }; - "n8n-editor-ui-0.127.0" = { + "n8n-editor-ui-0.129.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.127.0"; + version = "0.129.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.127.0.tgz"; - sha512 = "XCiLwXing2nSidUfrEqcYxG7Zc7TBbJDxmUjSwv2fdH4SK4vMPcUINJbEQOHPIhc6GNEjSt1J/tbCEJJC/acbg=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.129.0.tgz"; + sha512 = "LEYqSL04FWh9dPM/YhL1yySOYCN7IB5uP7uLjfiDR+B7BQcmpq1Do6NzuKqdzfoN8MwMZy6avQrw691rq266nQ=="; }; }; - "n8n-nodes-base-0.158.0" = { + "n8n-nodes-base-0.160.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.158.0"; + version = "0.160.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.158.0.tgz"; - sha512 = "qs/T0S2BHrovOFh6mnCRpuY9qhKZxub160+qtvXMVsiUWCpKEW1eIA4owYHLH3DLYqW0izQJap0sGlZEzV3xTg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.160.0.tgz"; + sha512 = "q1eJBZSRgafVZBoCgmqxP0vnGDbgUpru0SOgtPgvvZxceo02PiBn8X8N8UjZ5ZeqIekO25tWvbJjGZpyIQ5/sg=="; }; }; - "n8n-workflow-0.84.0" = { + "n8n-workflow-0.86.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.84.0"; + version = "0.86.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.84.0.tgz"; - sha512 = "ibZ/oCWd81DMhjUQcAMC5GNs2C/dm+4boKTIjRuFHmbGzF2elwpb5s2nlkRn5REj9aZseZ0N9bfJ6slcLbw/Sw=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.86.0.tgz"; + sha512 = "+Kdo5RMEsh7QJ8AkWNTSpyxYRtjpxPmPfifVAFg4HVguW7g5e7f74xlmqD2xnxQybC9B3f6jxvx6WMKbNcT/+A=="; }; }; "named-placeholders-1.1.2" = { @@ -4549,13 +4558,13 @@ let sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="; }; }; - "negotiator-0.6.2" = { + "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; }; "neo-async-2.6.2" = { @@ -5107,13 +5116,13 @@ let sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A=="; }; }; - "peek-readable-4.0.2" = { + "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.2.tgz"; - sha512 = "9fMaz6zoxw9ypO1KZy5RDJgSupEtu0Q+g/OqqsVHX3rKGR8qehRLYzsFARZ4bVvdvfknKiXvuDbkMnO1g6cRpQ=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz"; + sha512 = "ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="; }; }; "performance-now-2.1.0" = { @@ -5134,6 +5143,15 @@ let sha512 = "7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA=="; }; }; + "pg-8.7.3" = { + name = "pg"; + packageName = "pg"; + version = "8.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.7.3.tgz"; + sha512 = "HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw=="; + }; + }; "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; @@ -5161,13 +5179,13 @@ let sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; - "pg-pool-3.4.1" = { + "pg-pool-3.5.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz"; - sha512 = "TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz"; + sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="; }; }; "pg-promise-10.11.1" = { @@ -5332,13 +5350,13 @@ let sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="; }; }; - "printj-1.3.0" = { + "printj-1.3.1" = { name = "printj"; packageName = "printj"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz"; - sha512 = "017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg=="; + url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz"; + sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="; }; }; "process-0.11.10" = { @@ -5971,6 +5989,15 @@ let sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; }; }; + "safe-stable-stringify-2.3.1" = { + name = "safe-stable-stringify"; + packageName = "safe-stable-stringify"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz"; + sha512 = "kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -6169,13 +6196,13 @@ let sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; - "signal-exit-3.0.6" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"; - sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "simple-git-2.48.0" = { @@ -6322,22 +6349,22 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.5.0" = { + "ssh2-1.6.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.5.0.tgz"; - sha512 = "iUmRkhH9KGeszQwDW7YyyqjsMTf4z+0o48Cp4xOwlY5LjtbIAvyd3fwnsoUZW/hXmTCRA3yt7S/Jb9uVjErVlA=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.6.0.tgz"; + sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q=="; }; }; - "ssh2-sftp-client-7.2.1" = { + "ssh2-sftp-client-7.2.2" = { name = "ssh2-sftp-client"; packageName = "ssh2-sftp-client"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.1.tgz"; - sha512 = "kr5QFL+d8Ta28wGhlRqkHo812PjMhKrBK7oTaYGNHqTvXAUjxZR6SeWRXbwKASE3dh2xeDz5aXHcg01bzfAeCA=="; + url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.2.tgz"; + sha512 = "qZYivU1zezyRomCf+TtsCYVAsc0TDQWzxJMMUN8NknEPonm2TYGxJAzrW8acUh2ILYgA0ZPOJElLV/qp9nRVYQ=="; }; }; "sshpk-1.17.0" = { @@ -6493,13 +6520,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strtok3-6.2.4" = { + "strtok3-6.3.0" = { name = "strtok3"; packageName = "strtok3"; - version = "6.2.4"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.4.tgz"; - sha512 = "GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz"; + sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; }; "supports-color-2.0.0" = { @@ -7186,22 +7213,22 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; - "winston-3.4.0" = { + "winston-3.5.1" = { name = "winston"; packageName = "winston"; - version = "3.4.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.4.0.tgz"; - sha512 = "FqilVj+5HKwCfIHQzMxrrd5tBIH10JTS3koFGbLVWBODjiIYq7zir08rFyBT4rrTYG/eaTqDcfSIbcjSM78YSw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.5.1.tgz"; + sha512 = "tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA=="; }; }; - "winston-transport-4.4.2" = { + "winston-transport-4.5.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.2.tgz"; - sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"; + sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; }; }; "wmf-1.0.2" = { @@ -7426,10 +7453,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.160.0"; + version = "0.162.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.160.0.tgz"; - sha512 = "mdjD4tKohZP8kMbFa+gGWx5rYXLz9HprXr2tPHUpAvZ6x7JGb06uY2ieNifSAH9Ap3CR+qfg6HkPgSKe183CIA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.162.0.tgz"; + sha512 = "76fcq99iZXy+j+BiuZMrR1rgeBgWRGOVwNeqlEqWCJ3u8kg6iDsGRuo9nSdx11OzP17hAJJKLtYHxLfTBV3kUw=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7443,7 +7470,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@azure/core-http-2.2.3" // { + (sources."@azure/core-http-2.2.4" // { dependencies = [ sources."tough-cookie-4.0.0" sources."tslib-2.3.1" @@ -7481,14 +7508,14 @@ in sources."tslib-2.3.1" ]; }) - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.0" (sources."@dabh/diagnostics-2.0.2" // { dependencies = [ sources."enabled-2.0.0" sources."kuler-2.0.0" ]; }) - sources."@fontsource/open-sans-4.5.2" + sources."@fontsource/open-sans-4.5.4" sources."@icetee/ftp-0.3.15" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -7497,7 +7524,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@oclif/command-1.8.16" - (sources."@oclif/config-1.18.2" // { + (sources."@oclif/config-1.18.3" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -7507,14 +7534,19 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."@oclif/help-1.0.1" + (sources."@oclif/help-1.0.1" // { + dependencies = [ + sources."@oclif/config-1.18.2" + sources."tslib-2.3.1" + ]; + }) sources."@oclif/linewrap-1.0.0" (sources."@oclif/parser-3.8.6" // { dependencies = [ sources."tslib-2.3.1" ]; }) - sources."@opentelemetry/api-1.0.4" + sources."@opentelemetry/api-1.1.0" sources."@rudderstack/rudder-sdk-node-1.0.6" sources."@segment/loosely-validate-event-2.0.0" sources."@selderee/plugin-htmlparser2-0.6.0" @@ -7535,7 +7567,7 @@ in sources."@types/lodash-4.14.178" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" (sources."@types/node-fetch-2.5.12" // { dependencies = [ sources."form-data-3.0.1" @@ -7553,7 +7585,7 @@ in sources."@xmldom/xmldom-0.7.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."access-control-1.0.1" (sources."adal-node-0.2.3" // { dependencies = [ @@ -7602,7 +7634,7 @@ in ]; }) sources."avsc-5.7.3" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1069.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7697,7 +7729,7 @@ in sources."printj-1.2.3" ]; }) - sources."printj-1.3.0" + sources."printj-1.3.1" ]; }) sources."chalk-4.1.2" @@ -7776,9 +7808,13 @@ in sources."convict-6.2.1" sources."cookie-0.4.1" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."core-util-is-1.0.2" - sources."crc-32-1.2.0" + (sources."crc-32-1.2.1" // { + dependencies = [ + sources."printj-1.3.1" + ]; + }) sources."cron-1.7.2" sources."cron-parser-2.18.0" (sources."cross-spawn-4.0.2" // { @@ -7884,7 +7920,7 @@ in sources."ms-2.0.0" ]; }) - sources."flatted-2.0.2" + sources."flatted-3.2.5" sources."fn.name-1.1.0" sources."follow-redirects-1.14.7" sources."for-each-0.3.3" @@ -7977,7 +8013,7 @@ in sources."ini-1.3.8" sources."inquirer-7.3.3" sources."internal-slot-1.0.3" - sources."ioredis-4.28.3" + sources."ioredis-4.28.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" @@ -8012,7 +8048,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-0.0.1" - sources."isbot-3.4.0" + sources."isbot-3.4.1" sources."isexe-2.0.0" sources."iso-639-1-2.1.12" sources."isstream-0.1.2" @@ -8045,7 +8081,7 @@ in sources."iconv-lite-0.6.2" ]; }) - sources."libphonenumber-js-1.9.44" + sources."libphonenumber-js-1.9.48" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-3.0.3" @@ -8068,11 +8104,16 @@ in sources."lodash.isnumber-3.0.3" sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" + sources."lodash.merge-4.6.2" sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" - sources."logform-2.3.2" + (sources."logform-2.3.2" // { + dependencies = [ + sources."safe-stable-stringify-1.1.1" + ]; + }) sources."long-4.0.0" sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { @@ -8101,7 +8142,7 @@ in }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" - sources."mappersmith-2.36.3" + sources."mappersmith-2.37.1" sources."md5-2.3.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -8157,20 +8198,19 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.102.0" // { + (sources."n8n-core-0.104.0" // { dependencies = [ - sources."flatted-3.2.4" sources."qs-6.10.3" ]; }) - sources."n8n-design-system-0.9.0" - sources."n8n-editor-ui-0.127.0" - (sources."n8n-nodes-base-0.158.0" // { + sources."n8n-design-system-0.11.0" + sources."n8n-editor-ui-0.129.0" + (sources."n8n-nodes-base-0.160.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.84.0" + sources."n8n-workflow-0.86.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8190,7 +8230,7 @@ in sources."debug-3.2.7" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" (sources."no-case-3.0.4" // { dependencies = [ @@ -8289,14 +8329,18 @@ in sources."debug-3.2.7" ]; }) - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - sources."pg-8.7.1" + sources."pg-8.7.3" sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" - sources."pg-pool-3.4.1" - sources."pg-promise-10.11.1" + sources."pg-pool-3.5.1" + (sources."pg-promise-10.11.1" // { + dependencies = [ + sources."pg-8.7.1" + ]; + }) sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" (sources."pgpass-1.0.5" // { @@ -8401,7 +8445,7 @@ in sources."run-parallel-1.2.0" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."sb-promise-queue-2.1.0" @@ -8433,7 +8477,7 @@ in sources."sha.js-2.4.11" sources."shell-escape-0.2.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-git-2.48.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" @@ -8467,8 +8511,8 @@ in sources."sqlstring-2.3.2" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.5.0" - sources."ssh2-sftp-client-7.2.1" + sources."ssh2-1.6.0" + sources."ssh2-sftp-client-7.2.2" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" @@ -8482,7 +8526,7 @@ in sources."string_decoder-0.10.31" sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" (sources."tar-4.4.19" // { dependencies = [ @@ -8494,7 +8538,7 @@ in sources."tdigest-0.1.1" (sources."tedious-6.7.1" // { dependencies = [ - sources."@types/node-12.20.42" + sources."@types/node-12.20.43" sources."bl-3.0.1" sources."depd-2.0.0" sources."iconv-lite-0.5.2" @@ -8601,14 +8645,14 @@ in sources."which-boxed-primitive-1.0.2" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - (sources."winston-3.4.0" // { + (sources."winston-3.5.1" // { dependencies = [ sources."async-3.2.3" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) - (sources."winston-transport-4.4.2" // { + (sources."winston-transport-4.5.0" // { dependencies = [ sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" From 8d854f52eb3efa72144ecc3e4081b7a3c6487f03 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 30 Jan 2022 16:42:33 +0000 Subject: [PATCH 166/194] n8n: register updateScript --- pkgs/applications/networking/n8n/default.nix | 2 ++ pkgs/applications/networking/n8n/generate-dependencies.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index d882134473b6..e7e1be095a20 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -12,6 +12,8 @@ nodePackages.n8n.override { node-pre-gyp ]; + passthru.updateScript = ./generate-dependencies.sh; + meta = with lib; { description = "Free and open fair-code licensed node based Workflow Automation Tool"; maintainers = with maintainers; [ freezeboy k900 ]; diff --git a/pkgs/applications/networking/n8n/generate-dependencies.sh b/pkgs/applications/networking/n8n/generate-dependencies.sh index 26926deefb68..f7412bc5e5e2 100755 --- a/pkgs/applications/networking/n8n/generate-dependencies.sh +++ b/pkgs/applications/networking/n8n/generate-dependencies.sh @@ -10,6 +10,7 @@ # -> cpu-features # -> node-gyp@3.8.0 -> python2 # -> cmake +cd "$(dirname $(readlink -f $0))" node2nix \ --14 \ From dd37d07ccf912ee35a4f041182890e10db5ce7a4 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 29 Jan 2022 14:18:38 +0300 Subject: [PATCH 167/194] nixos-rebuild: also forward the long version of -L Mostly for more readability in shell scripts. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 1de783a55930..bfe03ecc5d8d 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -71,7 +71,7 @@ while [ "$#" -gt 0 ]; do j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--refresh|--no-net|--offline|--impure) + --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--print-build-logs|--refresh|--no-net|--offline|--impure) extraBuildFlags+=("$i") ;; --option) From 2909f5b0417abf0553f8e83666ef1d907f9e968a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 Feb 2022 15:32:29 +0100 Subject: [PATCH 168/194] jetbrains: allow to override JAVA_HOME/ANDROID_JAVA_HOME/JDK_HOME Otherwise one cannot use a different java version i.e. jdk17 --- pkgs/applications/editors/jetbrains/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index b3145f342c9b..709a9b4251ce 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -82,10 +82,10 @@ with stdenv; lib.makeOverridable mkDerivation (rec { libnotify ] ++ extraLdPath)}" \ ${lib.concatStringsSep " " extraWrapperArgs} \ - --set JDK_HOME "$jdk" \ + --set-default JDK_HOME "$jdk" \ + --set-default ANDROID_JAVA_HOME "$jdk" \ + --set-default JAVA_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ - --set ANDROID_JAVA_HOME "$jdk" \ - --set JAVA_HOME "$jdk" \ --set ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$item/share/applications" $out/share From cff82556ec9b8a4f7fd52a0372ac510853016051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 Feb 2022 16:27:03 +0100 Subject: [PATCH 169/194] jetbrains: 11_0_11-b1504.13 -> 11_0_13-b1751.25 synched with ides according to https://github.com/JetBrains/JetBrainsRuntime#releases --- pkgs/development/compilers/jetbrains-jdk/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index e36dedf3c875..bfff07aabcb2 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -2,12 +2,13 @@ openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; - version = "11_0_11-b1504.13"; + version = "11_0_13-b1751.25"; + src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - sha256 = "1xpgsgmmj5jp5qyw98hqmik6a7z3hfwmij023ij3qqymyj3nhm2i"; + sha256 = "sha256-TPNYZUkAoiZfp7Ci3fslKnRNGY1lnyIhXYUt6J31lwI="; }; patches = []; meta = with lib; { From bff4b9cdc740b9b7015b425929bf34afeb260f5b Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Tue, 8 Feb 2022 06:45:51 +0000 Subject: [PATCH 170/194] python3Packages.opensimplex: 0.3 -> 0.4.2 --- .../python-modules/opensimplex/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix index 6832266b87ad..5cc7eef65366 100644 --- a/pkgs/development/python-modules/opensimplex/default.nix +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -1,24 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose +, numpy +, pytestCheckHook }: buildPythonPackage rec { pname = "opensimplex"; - version = "0.3"; + version = "0.4.2"; src = fetchFromGitHub { owner = "lmas"; repo = pname; rev = "v${version}"; - sha256 = "idF5JQGnAye6z3c3YU9rsHaebB3rlHJfA8vSpjDnFeM="; + sha256 = "zljS0yu3cHF2Vz3rFkwLXiHnKjo970MDIrC/56FoHa4="; }; - checkInputs = [ nose ]; - checkPhase = '' - nosetests tests/ - ''; + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests/test_opensimplex.py" ]; pythonImportsCheck = [ "opensimplex" ]; meta = with lib; { From 40bde30d2a1a9fd3635b6c53cbf18a22d3b290af Mon Sep 17 00:00:00 2001 From: Renaud Date: Tue, 8 Feb 2022 14:03:34 +0100 Subject: [PATCH 171/194] mailutils: 3.13 -> 3.14 and use `mailcap` to provide mime.types --- pkgs/tools/networking/mailutils/default.nix | 53 +++++++++++++++++---- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 3b939021b300..532c8c14ab5b 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,14 +1,36 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkg-config -, gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python3, gss, libmysqlclient, system-sendmail }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, dejagnu +, gettext +, gnum4 +, pkg-config +, texinfo +, fribidi +, gdbm +, gnutls +, gss +, guile +, libmysqlclient +, mailcap +, nettools +, pam +, readline +, ncurses +, python3 +, sasl +, system-sendmail +}: stdenv.mkDerivation rec { pname = "mailutils"; - version = "3.13"; + version = "3.14"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-2SCXHctJh4oAmRF3T9ZATxPSe9EB4tWbZkooZZpAlMc="; + hash = "sha256-wMWzj+qLRaSvzUNkh/Knb9VSUJLQN4gTputVQsIScTk="; }; postPatch = '' @@ -19,12 +41,26 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoreconfHook gettext pkg-config + autoreconfHook + gettext + gnum4 + pkg-config + texinfo ]; buildInputs = [ - gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi - gss libmysqlclient python3 + fribidi + gdbm + gnutls + gss + guile + libmysqlclient + mailcap + ncurses + pam + python3 + readline + sasl ] ++ lib.optionals stdenv.isLinux [ nettools ]; patches = [ @@ -47,6 +83,7 @@ stdenv.mkDerivation rec { "--with-mysql" "--with-path-sendmail=${system-sendmail}/bin/sendmail" "--with-mail-rc=/etc/mail.rc" + "DEFAULT_CUPS_CONFDIR=${mailcap}/etc" # provides mime.types to mimeview ]; readmsg-tests = let From 043cccef2c1fc792c5f56a4f4cfa2893d1429ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 8 Feb 2022 13:59:50 +0100 Subject: [PATCH 172/194] knot-dns: 3.1.5 -> 3.1.6 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.1.6 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 1938e9c02b66..80939b8df45d 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2da6e50b0662297d55f80e349568224e07fe88cad20bee1d2e22f54bb32da064"; + sha256 = "e9ba1305d750dc08fb08687aec7ac55737ca073deaa0b867c884e0c0f2fdb753"; }; outputs = [ "bin" "out" "dev" ]; From 6a854c696862b1251e7efab9e15ec030b35654d9 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Tue, 8 Feb 2022 06:39:44 +0000 Subject: [PATCH 173/194] python3Packages.pygame: 2.1.0 -> 2.1.2 --- pkgs/development/python-modules/pygame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 60a1fece63ac..66a1fb0ba287 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pygame"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = pname; @@ -14,7 +14,7 @@ buildPythonPackage rec { # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The documentation # has such files and will be removed. - sha256 = "sha256-Pe7BJ+8rXw+hhRv64fI+79gJcU1npQFFAXxECx2+Trw="; + sha256 = "sha256-v1z6caEMJNXqbcbTmFXoy3KQewHiz6qK4vhNU6Qbukk="; extraPostFetch = "rm -rf $out/docs/reST"; }; From 196b123511ae4abb10b682ce0a435452b9f8f3d5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 3 Jan 2022 21:19:01 -0800 Subject: [PATCH 174/194] subsurface: make build src name independent (cherry picked from commit 133158ffdea12c9927909b851463541c91411557) --- pkgs/applications/misc/subsurface/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index ba3880aa201d..02bf65761f01 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -20,7 +20,8 @@ let inherit version; src = subsurfaceSrc; - sourceRoot = "source/libdivecomputer"; + + prePatch = "cd libdivecomputer"; nativeBuildInputs = [ autoreconfHook ]; From bae00be602d6817cafbdd0fe6fbfc6af51d863e4 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Tue, 8 Feb 2022 21:14:19 +0100 Subject: [PATCH 175/194] dolphinEmuMaster: 5.0-15445 -> 5.0-15993 --- pkgs/misc/emulators/dolphin-emu/master.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 1afa97611719..56e107300b54 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-15445"; + version = "5.0-15993"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "db02b50d2ecdfbbc21e19aadc57253c353069f77"; - sha256 = "l2vbTZOcjfyZjKOI3n5ig2f7cDYR22GcqKS479LMtP8="; + rev = "5e595616379a694789fe749e40a27ef069f0090e"; + sha256 = "1kid8qjn8r7dxh2yc1y6yal6qkfxij0ymi3zryxsnym3rjh1jds9"; fetchSubmodules = true; }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten ]; + maintainers = with maintainers; [ MP2E ashkitten xfix ]; branch = "master"; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. From 3af1bbfc6843cf6532110e374bc03a703f85764c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Feb 2022 18:32:50 +0100 Subject: [PATCH 176/194] python39Packages.devolo-home-control-api: fix version number --- .../devolo-home-control-api/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index b71ce7c6c271..badbd3afbdb6 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pythonOlder , requests +, setuptools-scm , websocket-client , zeroconf }: @@ -21,6 +22,12 @@ buildPythonPackage rec { sha256 = "sha256-N/48Q2IEL194vCzrPPuy+mRNejXfkoXy2t2oe0Y6ug4="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ requests zeroconf @@ -32,13 +39,6 @@ buildPythonPackage rec { pytest-mock ]; - postPatch = '' - # setup.py is not able to detect the version with setuptools_scm - substituteInPlace setup.py \ - --replace "setuptools_scm" "" \ - --replace 'use_scm_version=True' 'use_scm_version="${version}"' - ''; - # Disable test that requires network access disabledTests = [ "test__on_pong" From b397055f12130e78d3b95bdc701df505306f86ac Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 8 Feb 2022 23:08:54 +0200 Subject: [PATCH 177/194] etcher: 1.6.0 -> 1.7.3 --- pkgs/tools/misc/etcher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 7f746b9a49bb..c9d746cc96f6 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -14,8 +14,8 @@ let throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; sha256 = { - "x86_64-linux" = "sha256-n8i4ZqjugeUfXpTzVgIwVomfPk6HvPEbTZLe/jFgwFg="; - "i686-linux" = "sha256-lLGfhW6el2ZOcaykH1kTjGldXo7/0q5O8QnslnDlWAQ="; + "x86_64-linux" = "1yj6ybc99nqpzv2wjmvi7khfb5viwlb2rbjdpvgr4pmlzmiv7n2k"; + "i686-linux" = "09ddcqxw1jhl8v461ngdgj2l4infn2xiwvaqxi6qp3swci627vmz"; }."${system}" or throwSystem; arch = { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { pname = "etcher"; - version = "1.6.0"; + version = "1.7.3"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; From dc6cbf16b8f3f1d7efd8d80f8dbac7cc3209047e Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 8 Feb 2022 23:21:41 +0200 Subject: [PATCH 178/194] etcher: downgrade electron to v12 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4c29aef9900..bf3f347f90d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5142,7 +5142,7 @@ with pkgs; escrotum = callPackage ../tools/graphics/escrotum { }; etcher = callPackage ../tools/misc/etcher { - electron = electron_14; + electron = electron_12; }; ethercalc = callPackage ../servers/web-apps/ethercalc { }; From 48e25458e0181a9ad81544d89f1a573bb6570538 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Mon, 31 Jan 2022 19:43:14 +0000 Subject: [PATCH 179/194] =?UTF-8?q?megacmd:=201.4.0=20=E2=86=92=201.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/megacmd/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 3e206730c4e2..8ca4ec418957 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , autoconf -, automake115x +, automake , c-ares , cryptopp , curl @@ -25,22 +25,17 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-Q1SZSDTPGgBA/W/ZVYfTQsiP41RE1LJ+esQ3PK9EjIc="; + sha256 = "Y/FkbN9mTuBpcKCSQg0M+3/IPzJ58X4iZhX2kMVDv7A="; fetchSubmodules = true; }; - nativeBuildInputs = [ - autoconf - automake115x - libtool - pkg-config - ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ c-ares @@ -82,7 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MEGA Command Line Interactive and Scriptable Application"; - homepage = "https://mega.nz/cmd"; + homepage = "https://mega.io/cmd"; license = with licenses; [ bsd2 gpl3Only ]; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ lunik1 ]; From 64e026af23a4887a090fd1065af2bc1ff6e03cad Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Dec 2021 18:06:52 +0000 Subject: [PATCH 180/194] shellinabox: drop --- pkgs/servers/shellinabox/default.nix | 50 ------------------- .../shellinabox/shellinabox-minus.patch | 28 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 pkgs/servers/shellinabox/default.nix delete mode 100644 pkgs/servers/shellinabox/shellinabox-minus.patch diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix deleted file mode 100644 index 0240cd5a862c..000000000000 --- a/pkgs/servers/shellinabox/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }: - -stdenv.mkDerivation rec { - version = "2.20"; - pname = "shellinabox"; - - src = fetchFromGitHub { - owner = "shellinabox"; - repo = "shellinabox"; - rev = "v${version}"; - sha256 = "1hmfayh21cks2lyj572944ll0mmgsxbnj981b3hq3nhdg8ywzjfr"; - }; - - patches = [ - ./shellinabox-minus.patch - (fetchpatch { - name = "CVE-2018-16789.patch"; - url = "https://github.com/shellinabox/shellinabox/commit/4f0ecc31ac6f985e0dd3f5a52cbfc0e9251f6361.patch"; - sha256 = "1mpm6acxdb0fms9pa2b88fx6hp07ph87ahxi82yyqj2m7p79jx7a"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook makeWrapper ]; - buildInputs = [ pam openssl openssh ]; - - # Disable GSSAPIAuthentication errors. Also, paths in certain source files are - # hardcoded. Replace the hardcoded paths with correct paths. - preConfigure = '' - substituteInPlace ./shellinabox/service.c --replace "-oGSSAPIAuthentication=no" "" - substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin" - substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login" - substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login" - substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl.bin}/bin" - ''; - - postInstall = '' - wrapProgram $out/bin/shellinaboxd \ - --prefix LD_LIBRARY_PATH : ${openssl.out}/lib - mkdir -p $out/lib - cp shellinabox/* $out/lib - ''; - - meta = with lib; { - homepage = "https://github.com/shellinabox/shellinabox"; - description = "Web based AJAX terminal emulator"; - license = licenses.gpl2; - maintainers = with maintainers; [ tomberek lihop ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/shellinabox/shellinabox-minus.patch b/pkgs/servers/shellinabox/shellinabox-minus.patch deleted file mode 100644 index d84bdd2eb161..000000000000 --- a/pkgs/servers/shellinabox/shellinabox-minus.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru shellinabox-2.14/shellinabox/vt100.jspp shellinabox-2.14.new/shellinabox/vt100.jspp ---- shellinabox-2.14/shellinabox/vt100.jspp 2012-04-21 21:30:44.000000000 +0400 -+++ shellinabox-2.14.new/shellinabox/vt100.jspp 2014-03-27 16:33:31.012344164 +0400 -@@ -2676,6 +2676,7 @@ - switch (key) { - case 33: /* Page Up */ this.scrollBack(); return; - case 34: /* Page Down */ this.scrollFore(); return; -+ case 173: /* _ */ ch = this.applyModifiers(95, event); break; - default: break; - } - } -@@ -2738,6 +2739,7 @@ - case 123: /* F12 */ ch = '\u001B[24~'; break; - case 144: /* Num Lock */ return; - case 145: /* Scroll Lock */ return; -+ case 173: /* - */ ch = this.applyModifiers(45, event); break; - case 186: /* ; */ ch = this.applyModifiers(59, event); break; - case 187: /* = */ ch = this.applyModifiers(61, event); break; - case 188: /* , */ ch = this.applyModifiers(44, event); break; -@@ -2882,6 +2884,7 @@ - case 109: /* - -> _ */ u = 45; s = 95; break; - case 111: /* / -> ? */ u = 47; s = 63; break; - -+ case 173: /* - -> _ */ u = 45; s = 95; break; - case 186: /* ; -> : */ u = 59; s = 58; break; - case 187: /* = -> + */ u = 61; s = 43; break; - case 188: /* , -> < */ u = 44; s = 60; break; - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 52e02f762ea2..021c62edc636 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -951,6 +951,7 @@ mapAliases ({ seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; sepolgen = throw "sepolgen was merged into selinux-python"; # added 2021-11-11 shared_mime_info = shared-mime-info; # added 2018-02-25 + shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # added 2021-12-15 sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01 sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01 sigurlx = throw "sigurlx has been removed (upstream is gone)"; # added 2022-01-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 497dfe97365b..637462d344f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9642,10 +9642,6 @@ with pkgs; shout = nodePackages.shout; - shellinabox = callPackage ../servers/shellinabox { - openssl = openssl_1_0_2; - }; - shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { }; From 3ecddf791da4d893beb35fb09eb9da55b326f4fb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Dec 2021 18:09:05 +0000 Subject: [PATCH 181/194] nixos/shellinabox: drop --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 2 + .../services/web-servers/shellinabox.nix | 122 ------------------ 3 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 nixos/modules/services/web-servers/shellinabox.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cbc650249127..70964ad80f73 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1075,7 +1075,6 @@ ./services/web-servers/phpfpm/default.nix ./services/web-servers/pomerium.nix ./services/web-servers/unit/default.nix - ./services/web-servers/shellinabox.nix ./services/web-servers/tomcat.nix ./services/web-servers/traefik.nix ./services/web-servers/trafficserver/default.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 17ec13b770a8..1315a2e13681 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -88,6 +88,8 @@ with lib; The racoon module has been removed, because the software project was abandoned upstream. '') + (mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.") + # Do NOT add any option renames here, see top of the file ]; } diff --git a/nixos/modules/services/web-servers/shellinabox.nix b/nixos/modules/services/web-servers/shellinabox.nix deleted file mode 100644 index c7c51f873eba..000000000000 --- a/nixos/modules/services/web-servers/shellinabox.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.shellinabox; - - # If a certificate file is specified, shellinaboxd requires - # a file descriptor to retrieve it - fd = "3"; - createFd = optionalString (cfg.certFile != null) "${fd}<${cfg.certFile}"; - - # Command line arguments for the shellinabox daemon - args = [ "--background" ] - ++ optional (! cfg.enableSSL) "--disable-ssl" - ++ optional (cfg.certFile != null) "--cert-fd=${fd}" - ++ optional (cfg.certDirectory != null) "--cert=${cfg.certDirectory}" - ++ cfg.extraOptions; - - # Command to start shellinaboxd - cmd = "${pkgs.shellinabox}/bin/shellinaboxd ${concatStringsSep " " args}"; - - # Command to start shellinaboxd if certFile is specified - wrappedCmd = "${pkgs.bash}/bin/bash -c 'exec ${createFd} && ${cmd}'"; - -in - -{ - - ###### interface - - options = { - services.shellinabox = { - enable = mkEnableOption "shellinabox daemon"; - - user = mkOption { - type = types.str; - default = "root"; - description = '' - User to run shellinaboxd as. If started as root, the server drops - privileges by changing to nobody, unless overridden by the - --user option. - ''; - }; - - enableSSL = mkOption { - type = types.bool; - default = false; - description = '' - Whether or not to enable SSL (https) support. - ''; - }; - - certDirectory = mkOption { - type = types.nullOr types.path; - default = null; - example = "/var/certs"; - description = '' - The daemon will look in this directory far any certificates. - If the browser negotiated a Server Name Identification the daemon - will look for a matching certificate-SERVERNAME.pem file. If no SNI - handshake takes place, it will fall back on using the certificate in the - certificate.pem file. - - If no suitable certificate is installed, shellinaboxd will attempt to - create a new self-signed certificate. This will only succeed if, after - dropping privileges, shellinaboxd has write permissions for this - directory. - ''; - }; - - certFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/var/certificate.pem"; - description = "Path to server SSL certificate."; - }; - - extraOptions = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "--port=443" "--service /:LOGIN" ]; - description = '' - A list of strings to be appended to the command line arguments - for shellinaboxd. Please see the manual page - - for a full list of available arguments. - ''; - }; - - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - - assertions = - [ { assertion = cfg.enableSSL == true - -> cfg.certDirectory != null || cfg.certFile != null; - message = "SSL is enabled for shellinabox, but no certDirectory or certFile has been specefied."; } - { assertion = ! (cfg.certDirectory != null && cfg.certFile != null); - message = "Cannot set both certDirectory and certFile for shellinabox."; } - ]; - - systemd.services.shellinaboxd = { - description = "Shellinabox Web Server Daemon"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "sshd.service" ]; - after = [ "sshd.service" ]; - - serviceConfig = { - Type = "forking"; - User = "${cfg.user}"; - ExecStart = "${if cfg.certFile == null then "${cmd}" else "${wrappedCmd}"}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} From 92a6ad8626eb08dbf76fa389d595c7ac7accd70e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 28 Jul 2020 04:53:02 +0000 Subject: [PATCH 182/194] packagekit: use Nix backend Fixes https://github.com/NixOS/nixpkgs/issues/21230 Use Nix backend for packagekit. Updates to version with my Nix backend for PackageKit. --- nixos/modules/services/misc/packagekit.nix | 6 +- .../package-management/packagekit/default.nix | 125 +++++++++++------- 2 files changed, 84 insertions(+), 47 deletions(-) diff --git a/nixos/modules/services/misc/packagekit.nix b/nixos/modules/services/misc/packagekit.nix index 93bd206bd983..9191078ef9ca 100644 --- a/nixos/modules/services/misc/packagekit.nix +++ b/nixos/modules/services/misc/packagekit.nix @@ -13,7 +13,7 @@ let (iniFmt.generate "PackageKit.conf" (recursiveUpdate { Daemon = { - DefaultBackend = "test_nop"; + DefaultBackend = "nix"; KeepCache = false; }; } @@ -35,7 +35,7 @@ let in { imports = [ - (mkRemovedOptionModule [ "services" "packagekit" "backend" ] "The only backend that doesn't blow up is `test_nop`.") + (mkRemovedOptionModule [ "services" "packagekit" "backend" ] "Always set to Nix.") ]; options.services.packagekit = { @@ -62,6 +62,8 @@ in services.dbus.packages = with pkgs; [ packagekit ]; + environment.systemPackages = with pkgs; [ packagekit ]; + systemd.packages = with pkgs; [ packagekit ]; environment.etc = listToAttrs (map diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index b62597e7e508..25ad5be89e83 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,60 +1,95 @@ -{ stdenv, fetchFromGitHub, lib -, intltool, glib, pkg-config, polkit, python3, sqlite -, gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive -, nix, enableNixBackend ? false, boost +{ stdenv +, fetchFromGitHub +, lib +, gettext +, glib +, pkg-config +, polkit +, python3 +, sqlite +, gobject-introspection +, vala +, gtk-doc +, nix +, boost +, meson +, ninja +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_42 +, libxml2 +, gst_all_1 +, gtk3 , enableCommandNotFound ? false -, enableBashCompletion ? false, bash-completion ? null -, enableSystemd ? stdenv.isLinux, systemd }: +, enableBashCompletion ? false +, bash-completion ? null +, enableSystemd ? stdenv.isLinux +, systemd +}: stdenv.mkDerivation rec { pname = "packagekit"; - version = "1.1.13"; + version = "1.2.5pre"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { - owner = "hughsie"; + owner = "PackageKit"; repo = "PackageKit"; - rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0xmgac27p5z8wr56yw3cqhywnlvaf8kvyv1g0nzxnq167xj5vxam"; + rev = "9c2ef9cddf39ebde587907561f8e7ac99ed6be1a"; + sha256 = "05z1ds240kcmigygkbgjasr4spn7vd7cbpsbfrghhgnmszx9bjgl"; }; - buildInputs = [ glib polkit python3 gobject-introspection ] - ++ lib.optional enableSystemd systemd - ++ lib.optional enableBashCompletion bash-completion; - propagatedBuildInputs = - [ sqlite boost ] - ++ lib.optional enableNixBackend nix; - nativeBuildInputs = [ vala intltool pkg-config autoreconfHook autoconf-archive gtk-doc ]; - - preAutoreconf = '' - gtkdocize - intltoolize - ''; - - configureFlags = [ - (if enableSystemd then "--enable-systemd" else "--disable-systemd") - "--disable-dummy" - "--disable-cron" - "--enable-introspection" - "--disable-offline-update" - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" - ] - ++ lib.optional enableNixBackend "--enable-nix" - ++ lib.optional (!enableBashCompletion) "--disable-bash-completion" - ++ lib.optional (!enableCommandNotFound) "--disable-command-not-found"; - - enableParallelBuilding = true; - - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - "localstatedir=\${TMPDIR}" + buildInputs = [ + glib + polkit + python3 + gobject-introspection + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gtk3 + sqlite + nix + boost + ] ++ lib.optional enableSystemd systemd + ++ lib.optional enableBashCompletion bash-completion; + nativeBuildInputs = [ + vala + gettext + pkg-config + gtk-doc + meson + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 + libxml2 + ninja ]; + mesonFlags = [ + (if enableSystemd then "-Dsystemd=true" else "-Dsystem=false") + "-Dpackaging_backend=nix" + "-Ddbus_sys=${placeholder "out"}/share/dbus-1/system.d" + "-Ddbus_services=${placeholder "out"}/share/dbus-1/system-services" + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "-Dcron=false" + "-Dgtk_doc=true" + "--sysconfdir=/etc" + "--localstatedir=/var" + ] + ++ lib.optional (!enableBashCompletion) "-Dbash_completion=false" + ++ lib.optional (!enableCommandNotFound) "-Dbash_command_not_found=false"; + + postPatch = '' + # HACK: we want packagekit to look in /etc for configs but install + # those files in $out/etc ; we just override the runtime paths here + # same for /var & $out/var + substituteInPlace etc/meson.build \ + --replace "install_dir: join_paths(get_option('sysconfdir'), 'PackageKit')" "install_dir: join_paths('$out', 'etc', 'PackageKit')" + substituteInPlace data/meson.build \ + --replace "install_dir: join_paths(get_option('localstatedir'), 'lib', 'PackageKit')," "install_dir: join_paths('$out', 'var', 'lib', 'PackageKit')," + ''; + meta = with lib; { description = "System to facilitate installing and updating packages"; longDescription = '' From 620761739cc9f52cfd884f5ca61d0b31201a0f67 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Jan 2022 01:12:38 +0100 Subject: [PATCH 183/194] python3Packages.django_4: init at 4.0.2 --- pkgs/development/python-modules/django/4.nix | 107 ++++++++++++++++++ .../django/django_4_set_geos_gdal_lib.patch | 26 +++++ pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/django/4.nix create mode 100644 pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix new file mode 100644 index 000000000000..eb24edb4bff1 --- /dev/null +++ b/pkgs/development/python-modules/django/4.nix @@ -0,0 +1,107 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, substituteAll + +# patched in +, geos +, gdal +, withGdal ? false + +# propagated +, asgiref +, backports-zoneinfo +, sqlparse + +# tests +, aiosmtpd +, argon2_cffi +, bcrypt +, docutils +, geoip2 +, jinja2 +, memcached +, numpy +, pillow +, pylibmc +, pymemcache +, python +, pytz +, pywatchman +, pyyaml +, redis +, selenium +, tblib +, tzdata +}: + +buildPythonPackage rec { + pname = "Django"; + version = "4.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EQ+1j7Euylngcq1Z/ELXcc1kLdei8kFlgqqdp6jvlUo="; + }; + + patches = lib.optional withGdal + (substituteAll { + src = ./django_4_set_geos_gdal_lib.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }); + + propagatedBuildInputs = [ + asgiref + sqlparse + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + # Fails to import asgiref in ~200 tests + # ModuleNotFoundError: No module named 'asgiref' + doCheck = false; + + checkInputs = [ + aiosmtpd + argon2_cffi + asgiref + bcrypt + docutils + geoip2 + jinja2 + memcached + numpy + pillow + pylibmc + pymemcache + pytz + pywatchman + pyyaml + redis + selenium + tblib + tzdata + ]; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} tests/runtests.py + + runHook postCheck + ''; + + meta = with lib; { + description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design."; + homepage = "https://www.djangoproject.com"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch b/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch new file mode 100644 index 000000000000..da73a93e8f22 --- /dev/null +++ b/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch @@ -0,0 +1,26 @@ +diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py +index 05b5732..91fafee 100644 +--- a/django/contrib/gis/gdal/libgdal.py ++++ b/django/contrib/gis/gdal/libgdal.py +@@ -14,7 +14,7 @@ try: + from django.conf import settings + lib_path = settings.GDAL_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = ""@gdal@/lib/libgdal@extension@" + + if lib_path: + lib_names = None +diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py +index 2cdb5d3..fac2d04 100644 +--- a/django/contrib/gis/geos/libgeos.py ++++ b/django/contrib/gis/geos/libgeos.py +@@ -24,7 +24,7 @@ def load_geos(): + from django.conf import settings + lib_path = settings.GEOS_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@geos@/lib/libgeos_c@extension@" + + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 223ba7aaa6bd..00b909441c26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2192,9 +2192,10 @@ in { # Current LTS django_2 = callPackage ../development/python-modules/django/2.nix { }; + django_3 = callPackage ../development/python-modules/django/3.nix { }; # Current latest - django_3 = callPackage ../development/python-modules/django/3.nix { }; + django_4 = callPackage ../development/python-modules/django/4.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; From 3093caa2fc7be7a331ec574e0157cc0370b06974 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 23:38:49 +0100 Subject: [PATCH 184/194] python3Packages.aiooncue: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/aiooncue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiooncue/default.nix b/pkgs/development/python-modules/aiooncue/default.nix index f1d71e77d4bb..3e9cc46b16b0 100644 --- a/pkgs/development/python-modules/aiooncue/default.nix +++ b/pkgs/development/python-modules/aiooncue/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aiooncue"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = version; - hash = "sha256-6GnXuYpggUMisfeOnl52xvWFIZRV+oCwsFKAjPwscTU="; + hash = "sha256-rzgSvgVfpz2AVwqnat+TO+QhA3KcXV/a1HDNAP1fNPM="; }; propagatedBuildInputs = [ From d303d903768497334996c586f8f53438c0c6471f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Feb 2022 00:40:51 +0100 Subject: [PATCH 185/194] python3Packages.aiosenseme: init at 0.6.1 --- .../python-modules/aiosenseme/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/aiosenseme/default.nix diff --git a/pkgs/development/python-modules/aiosenseme/default.nix b/pkgs/development/python-modules/aiosenseme/default.nix new file mode 100644 index 000000000000..ff90bed8e5a5 --- /dev/null +++ b/pkgs/development/python-modules/aiosenseme/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, ifaddr +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiosenseme"; + version = "0.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ShK4DP1lAtAFI6z2kf5T1ecbNTKUn2kqUjps2ABRegg="; + }; + + propagatedBuildInputs = [ + ifaddr + ]; + + pythonImportsCheck = [ + "aiosenseme" + ]; + + # Module has no tests + doCheck = false; + + meta = with lib; { + description = "Module to interact with SenseME fans and lights by Big Ass Fans"; + homepage = "https://github.com/bdraco/aiosenseme"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00b909441c26..b6ef2ecfb83e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -392,6 +392,8 @@ in { aiorun = callPackage ../development/python-modules/aiorun { }; + aiosenseme = callPackage ../development/python-modules/aiosenseme { }; + aiosenz = callPackage ../development/python-modules/aiosenz { }; aioserial = callPackage ../development/python-modules/aioserial { }; From 92ffa5e9c96c14df8e9f1e290ca2b39dba86b7c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Feb 2022 00:23:51 +0100 Subject: [PATCH 186/194] python3Packages.python-nest: 4.1.0 -> 4.2.0 --- .../python-modules/python-nest/default.nix | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/python-nest/default.nix b/pkgs/development/python-modules/python-nest/default.nix index 8caa61517c6f..1cbdd2837a72 100644 --- a/pkgs/development/python-modules/python-nest/default.nix +++ b/pkgs/development/python-modules/python-nest/default.nix @@ -1,23 +1,41 @@ -{ buildPythonPackage, fetchPypi, lib, python-dateutil, requests -, six, sseclient-py }: +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, requests +, six +, sseclient-py +, pythonOlder +}: buildPythonPackage rec { pname = "python-nest"; - version = "4.1.0"; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "12iyypbl92ybh8w1bf4z0c2g0sb9id2c07c89vzvnlxgjylw3wbi"; + hash = "sha256-01hoZbDssbJ10NA72gOtlzjZMGjsUBUoVDVM35uAOLU="; }; - propagatedBuildInputs = [ python-dateutil requests six sseclient-py ]; - # has no tests + propagatedBuildInputs = [ + python-dateutil + requests + six + sseclient-py + ]; + + # Module has no tests doCheck = false; - pythonImportsCheck = [ "nest" ]; + + pythonImportsCheck = [ + "nest" + ]; meta = with lib; { - description = - "Python API and command line tool for talking to the Nest™ Thermostat"; + description = "Python API and command line tool for talking to the Nest™ Thermostat"; homepage = "https://github.com/jkoelker/python-nest"; license = licenses.cc-by-nc-sa-40; maintainers = with maintainers; [ jamiemagee ]; From 840351f7e0c7be5b0ef46b22128f86582bae19b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 22:10:33 +0000 Subject: [PATCH 187/194] python39Packages.ipyvuetify: 1.8.1 -> 1.8.2 --- pkgs/development/python-modules/ipyvuetify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index 61fd8d269bab..567c033e243f 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.8.1"; + version = "1.8.2"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "2d17367ce7da45a2622107d55c8b4c5475aace99ed5d95e5d7d3f93aa4c0c566"; + sha256 = "sha256-uFjS7lv8kDRultRqqu2++1eieLs67dLolVurTXWls8A="; }; propagatedBuildInputs = [ ipyvue ]; From 1862f4928c3cf1d97793dca824aa5eaee3830927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 8 Feb 2022 20:55:52 +0000 Subject: [PATCH 188/194] python3Packages.django_2: fix pname --- pkgs/development/python-modules/django/2.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index f20eb49c0233..9c4591f934ad 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -5,13 +5,14 @@ }: buildPythonPackage rec { - pname = "Django"; + pname = "django"; version = "2.2.26"; disabled = !isPy3k; src = fetchPypi { - inherit pname version; + pname = "Django"; + inherit version; sha256 = "sha256-36U3Jn1SxiQ6YrMoVadEyoPDfHBgCqz/v9mLxdbYUY8="; }; From 900e31847089b26d4db4272029e8640668d67541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 8 Feb 2022 20:56:19 +0000 Subject: [PATCH 189/194] python3Packages.django_3: fix pname --- pkgs/development/python-modules/django/3.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index a7bafcfb2707..1ef25e6e8e46 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -12,13 +12,14 @@ }: buildPythonPackage rec { - pname = "Django"; + pname = "django"; version = "3.2.11"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "Django"; + inherit version; sha256 = "sha256-aclKvl1rGwiL9HXgm3t0QD+UPjTaEH55hGXSBF2ifnU="; }; From c54baf949ad582bd7107f8863c50c4999abaad59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Feb 2022 23:21:03 +0000 Subject: [PATCH 190/194] python39Packages.librosa: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/librosa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index cb8f4c023bc2..c23b9df7cd78 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "c53d05e768ae4a3e553ae21c2e5015293e5efbfd5c12d497f1104cb519cca6b3"; + sha256 = "sha256-zSFnXTuYWPjRs7FDKzYONoFFvtN4B+HxOwcRqozTkP0="; }; propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; From fb067d4c1799a25c54392229796171c5ac63b820 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 01:53:20 +0000 Subject: [PATCH 191/194] python310Packages.pytest-cases: 3.6.8 -> 3.6.9 --- pkgs/development/python-modules/pytest-cases/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index c3374032d333..766e07543879 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.8"; + version = "3.6.9"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d423e87b30e1080cc162d86c72bfa35861cccfe3539125e81c68ba142ab974bc"; + sha256 = "sha256-Bf9favhlHcGj8nf1JxTkMjpo8hMyfBHgMCilOcIL2Sk="; }; nativeBuildInputs = [ From 21c5cfb88e075dab08b8948d1aaca549508faec5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 03:28:51 +0000 Subject: [PATCH 192/194] python39Packages.fiona: 1.8.20 -> 1.8.21 --- pkgs/development/python-modules/fiona/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 0c1a3bd2c651..f8fc454e05ee 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "fiona"; - version = "1.8.20"; + version = "1.8.21"; src = fetchPypi { pname = "Fiona"; inherit version; - sha256 = "a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b"; + sha256 = "sha256-Og7coqegcNtAXXEYchSkPSMzpXtAl1RKP8woIGali/w="; }; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; From 2bd97adf432316e6ea4a482f096cc27ba514401f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Feb 2022 20:53:46 -0800 Subject: [PATCH 193/194] Revert "python3Packages.django_3: fix pname" This reverts commit 900e31847089b26d4db4272029e8640668d67541. --- pkgs/development/python-modules/django/3.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 1ef25e6e8e46..a7bafcfb2707 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -12,14 +12,13 @@ }: buildPythonPackage rec { - pname = "django"; + pname = "Django"; version = "3.2.11"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "Django"; - inherit version; + inherit pname version; sha256 = "sha256-aclKvl1rGwiL9HXgm3t0QD+UPjTaEH55hGXSBF2ifnU="; }; From d818fd7e7115f0e0a3d821d454f818d7003ffa36 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Feb 2022 20:53:46 -0800 Subject: [PATCH 194/194] Revert "python3Packages.django_2: fix pname" This reverts commit 1862f4928c3cf1d97793dca824aa5eaee3830927. --- pkgs/development/python-modules/django/2.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index 9c4591f934ad..f20eb49c0233 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -5,14 +5,13 @@ }: buildPythonPackage rec { - pname = "django"; + pname = "Django"; version = "2.2.26"; disabled = !isPy3k; src = fetchPypi { - pname = "Django"; - inherit version; + inherit pname version; sha256 = "sha256-36U3Jn1SxiQ6YrMoVadEyoPDfHBgCqz/v9mLxdbYUY8="; };