From 49e647d1bdd7dadb3fbd07152ea7e7cfe13ba2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 20 Feb 2023 11:16:55 +0100 Subject: [PATCH 01/58] govulncheck: unstable-2022-09-02 -> unstable-2023-02-17 --- pkgs/tools/security/govulncheck/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix index 9565c11dad5a..d0523a5d58eb 100644 --- a/pkgs/tools/security/govulncheck/default.nix +++ b/pkgs/tools/security/govulncheck/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "govulncheck"; - version = "unstable-2022-09-02"; + version = "unstable-2023-02-17"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; - rev = "27dd78d2ca392c1738e54efe513a2ecb7bf46000"; - sha256 = "sha256-G35y1V4W1nLZ+QGvIQwER9whBIBDFUVptrHx78orcI0="; + rev = "b91abcc5ae3c412965b4c8131c4373040c69e1b7"; + sha256 = "sha256-DYeG7SbjoH7rLD+Q0/5VC85bT2x7YxB4tAj1wmHkI4A="; }; - vendorSha256 = "sha256-9FH9nq5cEyhMxrrvfQAOWZ4aThMsU0HwlI+0W0uVHZ4="; + vendorSha256 = "sha256-+luU71QHNs7xxXQOLtd+Ka8+ETv5sA+gv+4g7Ogm5TI="; subPackages = [ "cmd/govulncheck" ]; @@ -30,12 +30,14 @@ buildGoModule rec { rm vulncheck/binary_test.go # - just have resolution issues rm vulncheck/{source,vulncheck}_test.go + rm internal/govulncheck/callstacks_test.go ''; ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck"; + downloadPage = "https://github.com/golang/vuln"; description = "The database client and tools for the Go vulnerability database, also known as vuln"; longDescription = '' Govulncheck reports known vulnerabilities that affect Go code. It uses From 4c296f58dff81cabe74ab6ac82e5edfef4e25916 Mon Sep 17 00:00:00 2001 From: Alejandro Angulo Date: Mon, 20 Feb 2023 09:34:25 -0800 Subject: [PATCH 02/58] ldb: copy cross fix from tevent Saw the following while building on an x86_64-linux host for an armv6l-linux target: ``` Testing pyembed configuration: Could not build a python embedded interpreter ``` I dug into the config log and this seemed to be cause of the issue: ``` ['armv6l-unknown-linux-gnueabihf-gcc', '-MMD', '-D_GNU_SOURCE=1', '-D_XOPEN_SOURCE_EXTENDED=1', '-g', '-fwrapv', '-O3', '-I/nix/store/0pyymzxf7n0fzpaqnvwv92ab72v3jq8d-python3-3.10.9/include/python3.10', '-I/nix/store/kaiinm7cjirmv4zd3pdqa r23rsypfqlh-libxcrypt-4.4.33/include', '-DNDEBUG', '../../test.c', '-c', '-o/build/ldb-2.6.1/bin/.conf_check_59d3a0a5b9 6e327858e281d280fec4ed/testbuild/default/test.c.1.o'] err: In file included from /nix/store/0pyymzxf7n0fzpaqnvwv92ab72v3jq8d-python3-3.10.9/include/python3.10/Python.h:8, from ../../test.c:432: /nix/store/0pyymzxf7n0fzpaqnvwv92ab72v3jq8d-python3-3.10.9/include/python3.10/pyconfig.h:1480: warning: "SIZEOF_LONG" r edefined 1480 | #define SIZEOF_LONG 8 | ../../test.c:154: note: this is the location of the previous definition 154 | #define SIZEOF_LONG 4 | /nix/store/0pyymzxf7n0fzpaqnvwv92ab72v3jq8d-python3-3.10.9/include/python3.10/pyconfig.h:1504: warning: "SIZEOF_SIZE_T" redefined 1504 | #define SIZEOF_SIZE_T 8 | ../../test.c:156: note: this is the location of the previous definition 156 | #define SIZEOF_SIZE_T 4 | /nix/store/0pyymzxf7n0fzpaqnvwv92ab72v3jq8d-python3-3.10.9/include/python3.10/pyconfig.h:1507: warning: "SIZEOF_TIME_T" redefined 1507 | #define SIZEOF_TIME_T 8 | ../../test.c:170: note: this is the location of the previous definition 170 | #define SIZEOF_TIME_T 4 | /nix/store/0pyymzxf7n0fzpaqnvwv92ab72v3jq8d-python3-3.10.9/include/python3.10/pyconfig.h:1513: warning: "SIZEOF_VOID_P" redefined 1513 | #define SIZEOF_VOID_P 8 | ../../test.c:166: note: this is the location of the previous definition 166 | #define SIZEOF_VOID_P 4 | In file included from /nix/store/0pyymzxf7n0fzpaqnvwv92ab72v3jq8d-python3-3.10.9/include/python3.10/Python.h:50: /nix/store/0pyymzxf7n0fzpaqnvwv92ab72v3jq8d-python3-3.10.9/include/python3.10/pyport.h:746:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 746 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ ``` --- pkgs/development/libraries/ldb/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index bdd630103e37..234ec77a4a5d 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -63,6 +63,11 @@ stdenv.mkDerivation rec { "--without-ldb-lmdb" ]; + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; + stripDebugList = [ "bin" "lib" "modules" ]; meta = with lib; { From 28f9a2e3b61af0e361f4b491625ea16a139b3c21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 22:37:33 +0000 Subject: [PATCH 03/58] opustags: 1.6.0 -> 1.7.0 --- pkgs/applications/audio/opustags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 357799a11226..20fd355fa0bd 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opustags"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; rev = version; - sha256 = "1wsfw713rhi2gg5xc04cx5i31hlw0l3wdflj3r1y8w45bdk6ag1z"; + sha256 = "sha256-vGMRzw46X3DNRIvlI9XEKoDwiJsVL0v9Nfn8pbszRbw="; }; buildInputs = [ libogg ]; From bad5dc61f3a18578607c54368c88ec885eebb4e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Feb 2023 16:28:13 +0000 Subject: [PATCH 04/58] xjadeo: 0.8.11 -> 0.8.12 --- pkgs/tools/video/xjadeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/tools/video/xjadeo/default.nix index c490c276adf9..e638278f8ba8 100644 --- a/pkgs/tools/video/xjadeo/default.nix +++ b/pkgs/tools/video/xjadeo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "xjadeo"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "x42"; repo = "xjadeo"; rev = "v${version}"; - sha256 = "sha256-S8eIkmfjwpcILZc+by0Mk4VPRUlbJT0GBe8NlJ1F9EI="; + sha256 = "sha256-VPmVoCoVyljzqtbkuT3e6jhXClP708V/6zy1bVoET7c="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From c27db2a9d6ed1bb77addd3e2ff40d7510db48a2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Feb 2023 17:48:58 +0000 Subject: [PATCH 05/58] i2pd: 2.46.0 -> 2.46.1 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index e734027b2208..e26900159047 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.46.0"; + version = "2.46.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-KK4fYMcLkmdZxLkNloVvkYoFrWDi8N5rRmsSGxUxwC4="; + sha256 = "sha256-9qk3oRNM/xmKQQGIx44R79JYUK/J7rOrR+la+lnu74s="; }; buildInputs = [ boost zlib openssl ] From 4fa61c7d7921785895f25dbda2d3a5404bf0b053 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Feb 2023 22:43:35 +0000 Subject: [PATCH 06/58] pyradio: 0.9.0 -> 0.9.1 --- pkgs/applications/audio/pyradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 74668b03f2b3..2fc911222da9 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8Kr+DRbkTKvhetIIs4htOHlIXGLpoe+T+0yxjm/JcWk="; + hash = "sha256-tu/qlrbTcUCIRF15x9ATKHH+LDy1OsGJpo5x+CerTKg="; }; nativeBuildInputs = [ From 95ca5f576c7258b0e011e48458548c215f4c503f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Feb 2023 23:02:27 +0000 Subject: [PATCH 07/58] bcftools: 1.16 -> 1.17 --- pkgs/applications/science/biology/bcftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 719f45065002..993afff5965e 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.16"; + version = "1.17"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-kL9kfJrXnhCiQ7gFjIc94Ff9cBLiUNWuZXSDl4ei7NY="; + sha256 = "sha256-AfddjnAdhbLHWRckEgCcwE8pthYWrOL6dRFhI95Flsw="; }; nativeBuildInputs = [ From f3f74ac6c7c622311585b9669fe58af4aea32d15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Feb 2023 23:35:47 +0000 Subject: [PATCH 08/58] wireless-regdb: 2022.08.12 -> 2023.02.13 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 1bf0abc41ae5..25f677309e72 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; - version = "2022.08.12"; + version = "2023.02.13"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Wcj30Xlm23Gyf5DnNe6PW0LKNSdpSoxebptWvTecO4Q="; + sha256 = "sha256-/oHoqGlNxHU6RQh6HEx+G0je5aWfX3ls43TqVQ8LLnM="; }; dontBuild = true; From 1747570c5808c4ef0e53f7ff6b5ef245d881b5c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 05:30:22 +0000 Subject: [PATCH 09/58] micronaut: 3.8.4 -> 3.8.5 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 9a4c95706f00..3894dcd2c6ef 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.8.4"; + version = "3.8.5"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-PbTuhJ+l3s+vwo5Y93GpQIah71zah5aFgV/pBSyJDKY="; + sha256 = "sha256-u7Hwj/RYE8pZkIVulJrwdC1kxhTGl3P5DEug6v5lMvg="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From f3e9abfb9e81dd30455010586b039e8251a672e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 06:30:36 +0000 Subject: [PATCH 10/58] cppcheck: 2.10 -> 2.10.1 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 707506c03b2e..ccd50c5454ec 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.10"; + version = "2.10.1"; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = version; - hash = "sha256-Ss35foFlh4sw6TxMp++0b9E5KDUjBpDPuWIHsak8OGY="; + hash = "sha256-tN7MYMRBakdL++ZeY2u9s2B2wyAU7iaOB/hsv2GXI6s="; }; buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ]; From 5c470aa92b3a469b91a92414abe723752bf2966b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 07:08:54 +0000 Subject: [PATCH 11/58] minio: 2023-02-17T17-52-43Z -> 2023-02-22T18-23-45Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index d34d8b34609c..b655652b7e14 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-02-17T17-52-43Z"; + version = "2023-02-22T18-23-45Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-AVqGzb3abJotsHdUw7MScjut1E+5ZX2NrvQKQ0ck2lY="; + sha256 = "sha256-Y11jqZiQUu0/YcrIGFJ2nOkPRG97sflluO3J0BJZ6kQ="; }; - vendorHash = "sha256-Bg0AO2hV8dqOuSN9NJsdXbE/YVpYvU/3OkB+E83/QHU="; + vendorHash = "sha256-9QYRUCD2iR2jx8G1FbkQqqPqIuXKxAKDy9whMRhOVP4="; doCheck = false; From 0309bd6a4c5d10e7ba1be385806a09689f6e9f14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 08:11:16 +0000 Subject: [PATCH 12/58] typos: 1.13.10 -> 1.13.12 --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index eb5c0a6258cc..1c69515c44e7 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.13.10"; + version = "1.13.12"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-+TNKHyLqW/R/YEpynr4twvQpgeOxbyIlgQjaQarSB8M="; + hash = "sha256-SP2Di3kAcrAriZ4E7aPSBAZm46REIW82LrbWSmKhA5k="; }; - cargoHash = "sha256-7D9oyQK9VWOSAI9jSYZn7t8ll4sILpugroLWlST4Eok="; + cargoHash = "sha256-3ExXZ7lUnT/54TUembKk47OUVpAzHrWPAro2CcXiYmU="; meta = with lib; { description = "Source code spell checker"; From 828e8214f4d8e8eb2cb72d2eed4cc46b77532107 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 08:36:28 +0000 Subject: [PATCH 13/58] prometheus-haproxy-exporter: 0.14.0 -> 0.15.0 --- pkgs/servers/monitoring/prometheus/haproxy-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 33ac8316812c..24784e23585e 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "haproxy_exporter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "haproxy_exporter"; rev = "v${version}"; - sha256 = "sha256-u5o8XpKkuaNzAZAdA33GLd0QJSpqnkEbI8gW22G7FcY="; + sha256 = "sha256-hpZnMvHAAEbvzASK3OgfG34AhPkCdRM7eOm15PRemkA="; }; - vendorSha256 = "sha256-lDoW1rkOn2YkEf3QZdWBpm5fdzjkbER35XnXFr57D8c="; + vendorHash = "sha256-s9UVtV8N2SJ1ik864P6p2hPXJ2jstFY/XnWt9fuCDo0="; ldflags = [ "-s" "-w" ]; From ce1b8a7055a9180962e706bd1f0ff337937d3d71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 15:18:40 +0000 Subject: [PATCH 14/58] wrangler_1: 1.20.0 -> 1.21.0 --- pkgs/development/tools/wrangler_1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix index 986be513ca76..44bd00cf69aa 100644 --- a/pkgs/development/tools/wrangler_1/default.nix +++ b/pkgs/development/tools/wrangler_1/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v${version}"; - sha256 = "sha256-miXgzBaqCcFHRlot2uUKyH+GP2JTMOhFrReXZUl0ms0="; + sha256 = "sha256-GfuU+g4tPU3TorzymEa9q8n4uKYsG0ZTz8rJirGOLfQ="; }; - cargoSha256 = "sha256-DJefvaUc1quh43q1eZ5B76V3TEv9vNsxuUKaABWiTCo="; + cargoHash = "sha256-tPLqDm6kOVBKrLvhgZ9xD6vVBNjBBk9uLF7WOPgz8qE="; nativeBuildInputs = [ pkg-config ]; From 44622373661e1f8bfeb728497e381f09f278d615 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 15:46:49 +0000 Subject: [PATCH 15/58] polkadot: 0.9.37 -> 0.9.38 --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 883514b7da5b..7a7e461b1a21 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -12,13 +12,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.37"; + version = "0.9.38"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - hash = "sha256-/mgJNjliPUmMkhT/1oiX9+BJHfY3SMsKfFv9HCyWRQQ="; + hash = "sha256-qS9LZ9KBjOw7hEkUzu7eZFj6ZwbkCDxoqA7FPXb13o4="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-o+APFYKgA3zjQSGrkpnyf5LEBBqvZtcfWlzCk6nL02A="; + cargoHash = "sha256-4BOgG/NzSppTeEtoEVxqlYjV4FGkNFMeF+qCJwPz+7o="; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; From eec6c7a41c38e3196c78ea3c3539f250051d6752 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 16:27:52 +0000 Subject: [PATCH 16/58] linkerd_edge: 23.2.2 -> 23.2.3 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 4b22db60660a..9f3169b88b4e 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.2.2"; - sha256 = "1ylimwxp5b7dp14kjl5jimpjiqh5vh83cfah226kxndb6k64i7h8"; - vendorSha256 = "sha256-UWzWBZBzoq4Mzqk3ukvGAcXqiSeJV/V3K2V1GOA9vwc="; + version = "23.2.3"; + sha256 = "0lqbsh3237hh1rifi7w3h1mq4m6cnpxvb1h3dxghv5sblyivqfz9"; + vendorSha256 = "sha256-gZ9t10Lj0wXeVBfmxKax9FYrcNL+ZEJOqhQfYw9Qwzw="; } From a451a7634d792734760c94afc8c5e3a9c154d820 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 17:08:36 +0000 Subject: [PATCH 17/58] vassal: 3.6.11 -> 3.6.12 --- pkgs/games/vassal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 659d96175d23..9055a86d506a 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.11"; + version = "3.6.12"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-t05rwP33/V2S5pkWjv87GmPHtYCMrMxT3o3cOrwytK4="; + sha256 = "sha256-NSGadwVn1/nvHiJFENBPDsOUPwesunZMsvn+ms7u4Sw="; }; buildInputs = [ From ce7409ca5648db0920ccfbabe8801b910f1bab9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 19:04:22 +0000 Subject: [PATCH 18/58] tpm2-tools: 5.4 -> 5.5 --- pkgs/tools/security/tpm2-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index a7147911a865..a2687103e382 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "5.4"; + version = "5.5"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-9jVx0j7dltAkoiRTJry5o2+sLPia71psBaOwhS0pLJk="; + sha256 = "sha256-H9tJxzBTe/2u0IiISIGmHjv9Eh6VfsC9zu7AJhI2wSM="; }; nativeBuildInputs = [ pandoc pkg-config makeWrapper ]; From 2bfa93e01c1574343236b8d0052ad5e2964a363c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Feb 2023 20:26:17 +0000 Subject: [PATCH 19/58] treewide: python{ => .pythonForBuild}.interpreter It won't be enough to fix cross in all cases, but it is in at least one: pywayland. I've only made the change in cases I'm confident it's correct, as it would be wrong to change this when python.interpreter is used in wrappers, and possibly when it's used for running tests. --- doc/languages-frameworks/python.section.md | 4 ++-- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/networking/mailreaders/afew/default.nix | 2 +- .../networking/p2p/zeronet-conservancy/default.nix | 2 +- pkgs/applications/networking/p2p/zeronet/default.nix | 2 +- pkgs/applications/office/paperless-ngx/default.nix | 6 +++--- pkgs/applications/science/biology/quast/default.nix | 2 +- pkgs/applications/science/logic/z3/default.nix | 2 +- pkgs/development/interpreters/renpy/default.nix | 4 ++-- .../libraries/science/chemistry/openmm/default.nix | 4 ++-- pkgs/development/python-modules/bash_kernel/default.nix | 2 +- pkgs/development/python-modules/bashlex/default.nix | 2 +- pkgs/development/python-modules/manimpango/default.nix | 2 +- pkgs/development/python-modules/pycuda/default.nix | 2 +- pkgs/development/python-modules/pygame/default.nix | 2 +- pkgs/development/python-modules/pygeos/default.nix | 5 ++--- pkgs/development/python-modules/pymunk/default.nix | 2 +- pkgs/development/python-modules/pyqt/4.x.nix | 2 +- pkgs/development/python-modules/pyside2/default.nix | 2 +- pkgs/development/python-modules/pysvn/default.nix | 4 ++-- pkgs/development/python-modules/python-efl/default.nix | 4 ++-- .../python-modules/python-fontconfig/default.nix | 2 +- pkgs/development/python-modules/pywayland/default.nix | 2 +- pkgs/development/python-modules/pywlroots/default.nix | 2 +- pkgs/development/python-modules/shiboken2/default.nix | 2 +- pkgs/development/python-modules/torch/default.nix | 2 +- pkgs/development/python-modules/wxPython/4.0.nix | 4 ++-- pkgs/development/python-modules/wxPython/4.1.nix | 4 ++-- pkgs/development/python-modules/wxPython/4.2.nix | 4 ++-- pkgs/development/python-modules/xattr/default.nix | 2 +- pkgs/development/python-modules/xkbcommon/default.nix | 2 +- pkgs/development/tools/fdroidserver/default.nix | 2 +- pkgs/development/tools/misc/ycmd/default.nix | 2 +- pkgs/os-specific/linux/libnl/default.nix | 2 +- pkgs/servers/home-assistant/intents.nix | 2 +- pkgs/tools/audio/tts/default.nix | 2 +- pkgs/tools/backup/s3ql/default.nix | 2 +- 37 files changed, 48 insertions(+), 49 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index c1945adb1cd3..b44686b8cd54 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1019,7 +1019,7 @@ buildPythonPackage rec { The `buildPythonPackage` mainly does four things: -* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to +* In the `buildPhase`, it calls `${python.pythonForBuild.interpreter} setup.py bdist_wheel` to build a wheel binary zipfile. * In the `installPhase`, it installs the wheel file using `pip install *.whl`. * In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to @@ -1546,7 +1546,7 @@ of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. As workaround install it as an extra `preInstall` step: ```shell -${python.interpreter} setup.py install_data --install-dir=$out --root=$out +${python.pythonForBuild.interpreter} setup.py install_data --install-dir=$out --root=$out sed -i '/ = data\_files/d' setup.py ``` diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d642a81d2f75..8a031a220068 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${python3Packages.python.interpreter} setup.py install --root=$out \ + ${python3Packages.python.pythonForBuild.interpreter} setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index bc27b91a97da..ac0687900f17 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { outputs = [ "out" "doc" ]; postBuild = '' - ${python3Packages.python.interpreter} setup.py build_sphinx -b html,man + ${python3Packages.python.pythonForBuild.interpreter} setup.py build_sphinx -b html,man ''; postInstall = '' diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index 75e7981af5b2..e1a2a3826447 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { ]; buildPhase = '' - ${python3Packages.python.interpreter} -O -m compileall . + ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . ''; installPhase = '' diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 02b0c91e2da9..07ea1707526d 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; buildPhase = '' - ${python3Packages.python.interpreter} -O -m compileall . + ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . ''; installPhase = '' diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 61c607c422e8..b27c41581563 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -244,13 +244,13 @@ python.pkgs.buildPythonApplication rec { postBuild = '' # Compile manually because `pythonRecompileBytecodeHook` only works # for files in `python.sitePackages` - ${python.interpreter} -OO -m compileall src + ${python.pythonForBuild.interpreter} -OO -m compileall src # Collect static files - ${python.interpreter} src/manage.py collectstatic --clear --no-input + ${python.pythonForBuild.interpreter} src/manage.py collectstatic --clear --no-input # Compile string translations using gettext - ${python.interpreter} src/manage.py compilemessages + ${python.pythonForBuild.interpreter} src/manage.py compilemessages ''; installPhase = '' diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index 0a33c9767319..e5ee4b53089f 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { --replace "/bin/bash" "${bash}/bin/bash" mkdir -p "$out/${python.sitePackages}" export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.interpreter} setup.py install \ + ${python.pythonForBuild.interpreter} setup.py install \ --install-lib=$out/${python.sitePackages} \ --prefix="$out" ''; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 9ad48e79c933..f810a5a56739 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -47,7 +47,7 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: configurePhase = concatStringsSep " " ( - [ "${python.interpreter} scripts/mk_make.py --prefix=$out" ] + [ "${python.pythonForBuild.interpreter} scripts/mk_make.py --prefix=$out" ] ++ optional javaBindings "--java" ++ optional ocamlBindings "--ml" ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index d9105ca29238..bee024829cef 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -59,14 +59,14 @@ stdenv.mkDerivation rec { buildPhase = with python3.pkgs; '' runHook preBuild - ${python.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES + ${python.pythonForBuild.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES runHook postBuild ''; installPhase = with python3.pkgs; '' runHook preInstall - ${python.interpreter} module/setup.py install --prefix=$out + ${python.pythonForBuild.interpreter} module/setup.py install --prefix=$out mkdir -p $out/share/renpy cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index 85072f77da12..2ad84249758a 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -82,8 +82,8 @@ stdenv.mkDerivation rec { export OPENMM_LIB_PATH=$out/lib export OPENMM_INCLUDE_PATH=$out/include cd python - ${python3Packages.python.interpreter} setup.py build - ${python3Packages.python.interpreter} setup.py install --prefix=$out + ${python3Packages.python.pythonForBuild.interpreter} setup.py build + ${python3Packages.python.pythonForBuild.interpreter} setup.py install --prefix=$out ''; postFixup = '' diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index ba4672a17746..cee1ee04e353 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ''; postInstall = '' - ${python.interpreter} -m bash_kernel.install --prefix $out + ${python.pythonForBuild.interpreter} -m bash_kernel.install --prefix $out ''; meta = { diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index cb02db36ada1..e1d635c18b69 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # workaround https://github.com/idank/bashlex/issues/51 preBuild = '' - ${python.interpreter} -c 'import bashlex' + ${python.pythonForBuild.interpreter} -c 'import bashlex' ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 9b03caa6b103..443415470b05 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { ''; preBuild = '' - ${python.interpreter} setup.py build_ext --inplace + ${python.pythonForBuild.interpreter} setup.py build_ext --inplace ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index e2a41cca4a3a..49fc12e17274 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { }; preConfigure = with lib.versions; '' - ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ + ${python.pythonForBuild.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ --boost-python-libname=boost_python${major python.version}${minor python.version} \ diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 751bb9c8ae94..d89ca3dde700 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { ]; preConfigure = '' - ${python.interpreter} buildconfig/config.py + ${python.pythonForBuild.interpreter} buildconfig/config.py ''; checkPhase = '' diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index 67fa2e02aa59..f5e0bf87b1d2 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -30,8 +30,8 @@ buildPythonPackage rec { # for the package to function. Therefore override of buildPhase was # necessary. buildPhase = '' - ${python.interpreter} setup.py build_ext --inplace - ${python.interpreter} setup.py bdist_wheel + ${python.pythonForBuild.interpreter} setup.py build_ext --inplace + ${python.pythonForBuild.interpreter} setup.py bdist_wheel ''; nativeCheckInputs = [ @@ -50,4 +50,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ nialov ]; }; } - diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index e75b4fa3a90f..ab6903b93187 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; preBuild = '' - ${python.interpreter} setup.py build_ext --inplace + ${python.pythonForBuild.interpreter} setup.py build_ext --inplace ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 2652b5eb00b3..a0bf3f03f600 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''} chmod +x configure.py - sed -i '1i#!${python.interpreter}' configure.py + sed -i '1i#!${python.pythonForBuild.interpreter}' configure.py ''; configureScript = "./configure.py"; diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 2668699aa297..4fa3e757767d 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { postInstall = '' cd ../../.. - ${python.interpreter} setup.py egg_info --build-type=pyside2 + ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=pyside2 cp -r PySide2.egg-info $out/${python.sitePackages}/ ''; diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index db7848a9282a..33daf6af75df 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -37,8 +37,8 @@ buildPythonPackage rec { preConfigure = '' cd Source - ${python.interpreter} setup.py backport - ${python.interpreter} setup.py configure \ + ${python.pythonForBuild.interpreter} setup.py backport + ${python.pythonForBuild.interpreter} setup.py configure \ --apr-inc-dir=${apr.dev}/include \ --apu-inc-dir=${aprutil.dev}/include \ --pycxx-dir=${pycxx.dev}/include \ diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 847c167fa20b..046b32c2177a 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -31,11 +31,11 @@ buildPythonPackage rec { ''; preBuild = '' - ${python.interpreter} setup.py build_ext + ${python.pythonForBuild.interpreter} setup.py build_ext ''; installPhase = '' - ${python.interpreter} setup.py install --prefix=$out --single-version-externally-managed + ${python.pythonForBuild.interpreter} setup.py install --prefix=$out --single-version-externally-managed ''; doCheck = false; diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index 4aabb208a90c..45c94cdb83b3 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -17,7 +17,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ cython ]; preBuild = '' - ${python.interpreter} setup.py build_ext -i + ${python.pythonForBuild.interpreter} setup.py build_ext -i ''; checkPhase = '' diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index f5832449b0d7..2a681c4f4960 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.interpreter} pywayland/ffi_build.py + ${python.pythonForBuild.interpreter} pywayland/ffi_build.py ''; # Tests need this to create sockets diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 2fdf0407c64f..fb03693574a1 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.interpreter} wlroots/ffi_build.py + ${python.pythonForBuild.interpreter} wlroots/ffi_build.py ''; pythonImportsCheck = [ "wlroots" ]; diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 53ea30ca6823..b736c17337a9 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { postInstall = '' cd ../../.. - ${python.interpreter} setup.py egg_info --build-type=shiboken2 + ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=shiboken2 cp -r shiboken2.egg-info $out/${python.sitePackages}/ rm $out/bin/shiboken_tool.py ''; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 86889be4ee16..fe1b005c8e3d 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -219,7 +219,7 @@ in buildPythonPackage rec { preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES - ${python.interpreter} setup.py build --cmake-only + ${python.pythonForBuild.interpreter} setup.py build --cmake-only ${cmake}/bin/cmake build ''; diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index 380fefbc4cd0..64123cafd4a1 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -69,11 +69,11 @@ buildPythonPackage rec { ''; buildPhase = '' - ${python.interpreter} build.py -v --use_syswx dox etg --nodoc sip build_py + ${python.pythonForBuild.interpreter} build.py -v --use_syswx dox etg --nodoc sip build_py ''; installPhase = '' - ${python.interpreter} setup.py install --skip-build --prefix=$out + ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out ''; passthru = { wxWidgets = wxGTK; }; diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 3198dbc004c3..4b3e62a2eece 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -129,11 +129,11 @@ buildPythonPackage rec { ''; buildPhase = '' - ${python.interpreter} build.py -v build_wx dox etg --nodoc sip build_py + ${python.pythonForBuild.interpreter} build.py -v build_wx dox etg --nodoc sip build_py ''; installPhase = '' - ${python.interpreter} setup.py install --skip-build --prefix=$out + ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out wrapPythonPrograms ''; diff --git a/pkgs/development/python-modules/wxPython/4.2.nix b/pkgs/development/python-modules/wxPython/4.2.nix index cd112f8511c3..3d4ddb1e7061 100644 --- a/pkgs/development/python-modules/wxPython/4.2.nix +++ b/pkgs/development/python-modules/wxPython/4.2.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { export PATH="${wxGTK}/bin:$PATH" export SDL_CONFIG="${SDL.dev}/bin/sdl-config" - ${python.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py + ${python.pythonForBuild.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py runHook postBuild ''; @@ -111,7 +111,7 @@ buildPythonPackage rec { installPhase = '' runHook preInstall - ${python.interpreter} setup.py install --skip-build --prefix=$out + ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out wrapPythonPrograms runHook postInstall diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index fa9620d9dab3..189042082f04 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; postBuild = '' - ${python.interpreter} -m compileall -f xattr + ${python.pythonForBuild.interpreter} -m compileall -f xattr ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/xkbcommon/default.nix b/pkgs/development/python-modules/xkbcommon/default.nix index f9320a4bca00..8bf77c24e3f4 100644 --- a/pkgs/development/python-modules/xkbcommon/default.nix +++ b/pkgs/development/python-modules/xkbcommon/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.interpreter} xkbcommon/ffi_build.py + ${python.pythonForBuild.interpreter} xkbcommon/ffi_build.py ''; pythonImportsCheck = [ "xkbcommon" ]; diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 07448b21bb80..fd15f24e5390 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -21,7 +21,7 @@ python.pkgs.buildPythonApplication rec { ''; preConfigure = '' - ${python.interpreter} setup.py compile_catalog + ${python.pythonForBuild.interpreter} setup.py compile_catalog ''; postInstall = '' diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 3abcfabad779..2d01944dce41 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { buildPhase = '' export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" - ${python.interpreter} build.py --system-libclang --clang-completer --ninja + ${python.pythonForBuild.interpreter} build.py --system-libclang --clang-completer --ninja ''; dontConfigure = true; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 08a55134e773..c9eea70db992 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postBuild = lib.optionalString (pythonSupport) '' cd python - ${python.interpreter} setup.py install --prefix=../pythonlib + ${python.pythonForBuild.interpreter} setup.py install --prefix=../pythonlib cd - ''; diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 7d46432f3a6b..8c8470113c4c 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { postInstall = '' pushd .. # https://github.com/home-assistant/intents/blob/main/script/package#L18 - ${python.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home_assistant_intents/data + ${python.pythonForBuild.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home_assistant_intents/data popd ''; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index cb1880af91c4..8096fc22a2c5 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -95,7 +95,7 @@ python.pkgs.buildPythonApplication rec { # cython modules are not installed for some reasons ( cd TTS/tts/utils/monotonic_align - ${python.interpreter} setup.py install --prefix=$out + ${python.pythonForBuild.interpreter} setup.py install --prefix=$out ) ''; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 53836da12508..8738f5dc4e24 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; preBuild = '' - ${python3Packages.python.interpreter} ./setup.py build_cython build_ext --inplace + ${python3Packages.python.pythonForBuild.interpreter} ./setup.py build_cython build_ext --inplace ''; checkPhase = '' From eefba3de1d613465354457953bf571a670aaf558 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 20:39:50 +0000 Subject: [PATCH 20/58] rocblas: 5.4.2 -> 5.4.3 --- pkgs/development/libraries/rocblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index ce76d92301f0..a27e93c4c35d 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-4art8/KwH2KDLwSYcyzn/m/xwdg5wQQvgHks73aB+60="; + hash = "sha256-XhYpzBXviMnUdbF6lZi9g0LARKpzWLtDxJxLI3MuHiM="; }; nativeBuildInputs = [ From 8d8c53c68923e235b53ff9e1995a490dded43798 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 22:06:40 +0000 Subject: [PATCH 21/58] python310Packages.deal: 4.23.7 -> 4.24.0 --- pkgs/development/python-modules/deal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index ae92e45e324c..861f9c6847ce 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "deal"; - version = "4.23.7"; + version = "4.24.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "life4"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-RWbMitgrU8VUsOgarBKYDNPIa/AwifvBURUytiGzeVo="; + hash = "sha256-5gd46SMucH0rek9talMJ74TMRRvUm5Up6pCusUIHDjE="; }; postPatch = '' From 69da0d24d9d393f980df0b2c117d2074f24d7612 Mon Sep 17 00:00:00 2001 From: Mika Tammi Date: Sun, 26 Feb 2023 20:10:24 +0200 Subject: [PATCH 22/58] colord: fix cross-compilation Signed-off-by: Mika Tammi --- pkgs/tools/misc/colord/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index c2a3cd10803f..2a4c2c001668 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -15,6 +15,7 @@ , gobject-introspection , argyllcms , meson +, mesonEmulatorHook , ninja , vala , libgudev @@ -75,6 +76,8 @@ stdenv.mkDerivation rec { shared-mime-info vala wrapGAppsNoGuiHook + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ From 3da83ed15ad6d145e2104985c942dd1c21ac7a69 Mon Sep 17 00:00:00 2001 From: Mika Tammi Date: Sun, 26 Feb 2023 20:12:13 +0200 Subject: [PATCH 23/58] weston: fix cross-compilation Signed-off-by: Mika Tammi --- pkgs/applications/window-managers/weston/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index fb57c0a73c2a..9886fc97af14 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { sha256 = "078y14ff9wmmbzq314f7bq1bxx0rc12xy4j362n60iamr56qs4x6"; }; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput From 6d71c7c3e256786796e2f728978dbd05588df84a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Feb 2023 01:52:58 +0000 Subject: [PATCH 24/58] python310Packages.datasets: 2.9.0 -> 2.10.0 --- pkgs/development/python-modules/datasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 5e1f9e45d6e7..2fb9d7ce4127 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.9.0"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-A6rrChzHHd7vS1KWlF/EZEjp1CEE0mNn4AlMdSYLD/I="; + hash = "sha256-GEH7uk8M5pxYDKzfTRNMlnI5yrLr5K2PuD7CJV/wbu4="; }; postPatch = '' From 081f28c0a0c433593ad3e53896ca257367866727 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Sun, 26 Feb 2023 22:31:17 +0100 Subject: [PATCH 25/58] ntfy-sh: 2.0.1 -> 2.1.0 Diff: https://github.com/binwiederhier/ntfy/compare/v2.0.1...v2.1.0 Release notes: https://docs.ntfy.sh/releases/#ntfy-server-v210 --- pkgs/tools/misc/ntfy-sh/default.nix | 6 +- pkgs/tools/misc/ntfy-sh/node-packages.nix | 540 +++++++++++----------- 2 files changed, 278 insertions(+), 268 deletions(-) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 4f7536312a03..ee76230dc555 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -10,16 +10,16 @@ let in buildGoModule rec { pname = "ntfy-sh"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-r5MAffvQVya6VWzdO3NPVBAekeZQllxtpS5A06EQnI4="; + sha256 = "sha256-xtQO9E5qt2g3JMXmqePnfEsvvOIlgZqAup9DkJJ0ClI="; }; - vendorSha256 = "sha256-QUUZX9UnLnhyYrbws9pGfN/gqbwt7CeJNYlsPsLRb6g="; + vendorSha256 = "sha256-kfXan6LAVJ4ka34nP7ObAB2uISyQT9QrymOFFderdlQ="; doCheck = false; diff --git a/pkgs/tools/misc/ntfy-sh/node-packages.nix b/pkgs/tools/misc/ntfy-sh/node-packages.nix index b0f7e33dcdc2..588e68c1b6ec 100644 --- a/pkgs/tools/misc/ntfy-sh/node-packages.nix +++ b/pkgs/tools/misc/ntfy-sh/node-packages.nix @@ -31,22 +31,22 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.20.14" = { + "@babel/compat-data-7.21.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.20.14"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz"; - sha512 = "0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz"; + sha512 = "gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g=="; }; }; - "@babel/core-7.20.12" = { + "@babel/core-7.21.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.20.12"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"; - sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz"; + sha512 = "PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA=="; }; }; "@babel/eslint-parser-7.19.1" = { @@ -58,13 +58,13 @@ let sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ=="; }; }; - "@babel/generator-7.20.14" = { + "@babel/generator-7.21.1" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.20.14"; + version = "7.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz"; - sha512 = "AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz"; + sha512 = "1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -94,22 +94,22 @@ let sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.20.12" = { + "@babel/helper-create-class-features-plugin-7.21.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.20.12"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz"; - sha512 = "9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz"; + sha512 = "Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.20.5" = { + "@babel/helper-create-regexp-features-plugin-7.21.0" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.20.5"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz"; - sha512 = "m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz"; + sha512 = "N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg=="; }; }; "@babel/helper-define-polyfill-provider-0.3.3" = { @@ -139,13 +139,13 @@ let sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; }; }; - "@babel/helper-function-name-7.19.0" = { + "@babel/helper-function-name-7.21.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.19.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; - sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz"; + sha512 = "HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg=="; }; }; "@babel/helper-hoist-variables-7.18.6" = { @@ -157,13 +157,13 @@ let sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.20.7" = { + "@babel/helper-member-expression-to-functions-7.21.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz"; - sha512 = "9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz"; + sha512 = "Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q=="; }; }; "@babel/helper-module-imports-7.18.6" = { @@ -175,13 +175,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.20.11" = { + "@babel/helper-module-transforms-7.21.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.20.11"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; - sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz"; + sha512 = "79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -265,13 +265,13 @@ let sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; }; }; - "@babel/helper-validator-option-7.18.6" = { + "@babel/helper-validator-option-7.21.0" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.18.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; - sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz"; + sha512 = "rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="; }; }; "@babel/helper-wrap-function-7.20.5" = { @@ -283,13 +283,13 @@ let sha512 = "bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q=="; }; }; - "@babel/helpers-7.20.13" = { + "@babel/helpers-7.21.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.20.13"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz"; - sha512 = "nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz"; + sha512 = "XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA=="; }; }; "@babel/highlight-7.18.6" = { @@ -301,13 +301,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.20.15" = { + "@babel/parser-7.21.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.15"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"; - sha512 = "DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz"; + sha512 = "URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -346,22 +346,22 @@ let sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-class-static-block-7.20.7" = { + "@babel/plugin-proposal-class-static-block-7.21.0" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz"; - sha512 = "AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz"; + sha512 = "XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw=="; }; }; - "@babel/plugin-proposal-decorators-7.20.13" = { + "@babel/plugin-proposal-decorators-7.21.0" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.20.13"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.13.tgz"; - sha512 = "7T6BKHa9Cpd7lCueHBBzP0nkXNina+h5giOZw+a8ZpMfPFY19VjJAjIxyFHuWkhCWgL6QMqRiY/wB1fLXzm6Mw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz"; + sha512 = "MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w=="; }; }; "@babel/plugin-proposal-dynamic-import-7.18.6" = { @@ -436,13 +436,13 @@ let sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.20.7" = { + "@babel/plugin-proposal-optional-chaining-7.21.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz"; - sha512 = "T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz"; + sha512 = "p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA=="; }; }; "@babel/plugin-proposal-private-methods-7.18.6" = { @@ -454,13 +454,13 @@ let sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.20.5" = { + "@babel/plugin-proposal-private-property-in-object-7.21.0" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.20.5"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz"; - sha512 = "Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz"; + sha512 = "ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw=="; }; }; "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { @@ -508,13 +508,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.19.0" = { + "@babel/plugin-syntax-decorators-7.21.0" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.19.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz"; - sha512 = "xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz"; + sha512 = "tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -688,22 +688,22 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.20.15" = { + "@babel/plugin-transform-block-scoping-7.21.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.20.15"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.15.tgz"; - sha512 = "Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz"; + sha512 = "Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ=="; }; }; - "@babel/plugin-transform-classes-7.20.7" = { + "@babel/plugin-transform-classes-7.21.0" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz"; - sha512 = "LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz"; + sha512 = "RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ=="; }; }; "@babel/plugin-transform-computed-properties-7.20.7" = { @@ -751,22 +751,22 @@ let sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.19.0" = { + "@babel/plugin-transform-flow-strip-types-7.21.0" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.19.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz"; - sha512 = "sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz"; + sha512 = "FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w=="; }; }; - "@babel/plugin-transform-for-of-7.18.8" = { + "@babel/plugin-transform-for-of-7.21.0" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.18.8"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; - sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz"; + sha512 = "LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ=="; }; }; "@babel/plugin-transform-function-name-7.18.9" = { @@ -805,13 +805,13 @@ let sha512 = "NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.20.11" = { + "@babel/plugin-transform-modules-commonjs-7.21.2" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.20.11"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz"; - sha512 = "S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz"; + sha512 = "Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA=="; }; }; "@babel/plugin-transform-modules-systemjs-7.20.11" = { @@ -895,13 +895,13 @@ let sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA=="; }; }; - "@babel/plugin-transform-react-jsx-7.20.13" = { + "@babel/plugin-transform-react-jsx-7.21.0" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.20.13"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz"; - sha512 = "MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz"; + sha512 = "6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg=="; }; }; "@babel/plugin-transform-react-jsx-development-7.18.6" = { @@ -940,13 +940,13 @@ let sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; }; }; - "@babel/plugin-transform-runtime-7.19.6" = { + "@babel/plugin-transform-runtime-7.21.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.19.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz"; - sha512 = "PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz"; + sha512 = "ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.18.6" = { @@ -994,13 +994,13 @@ let sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-typescript-7.20.13" = { + "@babel/plugin-transform-typescript-7.21.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.20.13"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.13.tgz"; - sha512 = "O7I/THxarGcDZxkgWKMUrk7NK1/WbHAg3Xx86gqS6x9MTrNL6AwIluuZ96ms4xeDe6AVx6rjHbWHP7x26EPQBA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.0.tgz"; + sha512 = "xo///XTPp3mDzTtrqXoBlK9eiAYW3wv9JXglcn/u1bi60RW11dEUxIgA8cbnDhutS1zacjMRmAwxE0gMklLnZg=="; }; }; "@babel/plugin-transform-unicode-escapes-7.18.10" = { @@ -1048,13 +1048,13 @@ let sha512 = "zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg=="; }; }; - "@babel/preset-typescript-7.18.6" = { + "@babel/preset-typescript-7.21.0" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.18.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz"; - sha512 = "s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.0.tgz"; + sha512 = "myc9mpoVA5m1rF8K8DgLEatOYFDpwC+RkMkjZ0Du6uI62YvDe8uxIEYVs/VCdSJ097nlALiU/yBC7//3nI+hNg=="; }; }; "@babel/regjsgen-0.8.0" = { @@ -1066,13 +1066,13 @@ let sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="; }; }; - "@babel/runtime-7.20.13" = { + "@babel/runtime-7.21.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.13"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"; - sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz"; + sha512 = "xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw=="; }; }; "@babel/template-7.20.7" = { @@ -1084,22 +1084,22 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.20.13" = { + "@babel/traverse-7.21.2" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.20.13"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz"; - sha512 = "kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz"; + sha512 = "ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw=="; }; }; - "@babel/types-7.20.7" = { + "@babel/types-7.21.2" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.20.7"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz"; - sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz"; + sha512 = "3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -1372,13 +1372,22 @@ let sha512 = "AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="; }; }; - "@eslint/eslintrc-1.4.1" = { + "@eslint/eslintrc-2.0.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.4.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; - sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz"; + sha512 = "fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A=="; + }; + }; + "@eslint/js-8.35.0" = { + name = "_at_eslint_slash_js"; + packageName = "@eslint/js"; + version = "8.35.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz"; + sha512 = "JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw=="; }; }; "@humanwhocodes/config-array-0.11.8" = { @@ -1660,13 +1669,13 @@ let sha512 = "SPANMk6K757Q1x48nCwPGdSNb8B71d+2hPMJ0V12VWerpSsbjZtvAPi5FAn13l2O5mwWkvI0Kne+0tCgnNxMNw=="; }; }; - "@mui/material-5.11.9" = { + "@mui/material-5.11.10" = { name = "_at_mui_slash_material"; packageName = "@mui/material"; - version = "5.11.9"; + version = "5.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/material/-/material-5.11.9.tgz"; - sha512 = "Wb3WzjzYyi/WKSl/XlF7aC8kk2NE21IoHMF7hNQMkPb0GslbWwR4OUjlBpxtG+RSZn44wMZkEDNB9Hw0TDsd8g=="; + url = "https://registry.npmjs.org/@mui/material/-/material-5.11.10.tgz"; + sha512 = "hs1WErbiedqlJIZsljgoil908x4NMp8Lfk8di+5c7o809roqKcFTg2+k3z5ucKvs29AXcsdXrDB/kn2K6dGYIw=="; }; }; "@mui/private-theming-5.11.9" = { @@ -2155,13 +2164,13 @@ let sha512 = "oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="; }; }; - "@types/http-proxy-1.17.9" = { + "@types/http-proxy-1.17.10" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.9"; + version = "1.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz"; - sha512 = "QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz"; + sha512 = "Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g=="; }; }; "@types/istanbul-lib-coverage-2.0.4" = { @@ -2218,13 +2227,13 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; - "@types/node-18.14.0" = { + "@types/node-18.14.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.14.0"; + version = "18.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz"; - sha512 = "5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz"; + sha512 = "1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA=="; }; }; "@types/parse-json-4.0.0" = { @@ -2353,13 +2362,13 @@ let sha512 = "d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg=="; }; }; - "@types/serve-static-1.15.0" = { + "@types/serve-static-1.15.1" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz"; + sha512 = "NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ=="; }; }; "@types/sockjs-0.3.33" = { @@ -2425,85 +2434,85 @@ let sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; - "@typescript-eslint/eslint-plugin-5.52.0" = { + "@typescript-eslint/eslint-plugin-5.53.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.52.0.tgz"; - sha512 = "lHazYdvYVsBokwCdKOppvYJKaJ4S41CgKBcPvyd0xjZNbvQdhn/pnJlGtQksQ/NhInzdaeaSarlBjDXHuclEbg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.53.0.tgz"; + sha512 = "alFpFWNucPLdUOySmXCJpzr6HKC3bu7XooShWM+3w/EL6J2HIoB2PFxpLnq4JauWVk6DiVeNKzQlFEaE+X9sGw=="; }; }; - "@typescript-eslint/experimental-utils-5.52.0" = { + "@typescript-eslint/experimental-utils-5.53.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.52.0.tgz"; - sha512 = "kd8CRr04mNE3hw4et6+0T0NI5vli2H6dJCGzjX1r12s/FXUehLVadmvo2Nl3DN80YqAh1cVC6zYZAkpmGiVJ5g=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.53.0.tgz"; + sha512 = "4SklZEwRn0jqkhtW+pPZpbKFXprwGneBndRM0TGzJu/LWdb9QV2hBgFIVU9AREo02BzqFvyG/ypd+xAW5YGhXw=="; }; }; - "@typescript-eslint/parser-5.52.0" = { + "@typescript-eslint/parser-5.53.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.52.0.tgz"; - sha512 = "e2KiLQOZRo4Y0D/b+3y08i3jsekoSkOYStROYmPUnGMEoA0h+k2qOH5H6tcjIc68WDvGwH+PaOrP1XRzLJ6QlA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.53.0.tgz"; + sha512 = "MKBw9i0DLYlmdOb3Oq/526+al20AJZpANdT6Ct9ffxcV8nKCHz63t/S0IhlTFNsBIHJv+GY5SFJ0XfqVeydQrQ=="; }; }; - "@typescript-eslint/scope-manager-5.52.0" = { + "@typescript-eslint/scope-manager-5.53.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.52.0.tgz"; - sha512 = "AR7sxxfBKiNV0FWBSARxM8DmNxrwgnYMPwmpkC1Pl1n+eT8/I2NAUPuwDy/FmDcC6F8pBfmOcaxcxRHspgOBMw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz"; + sha512 = "Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w=="; }; }; - "@typescript-eslint/type-utils-5.52.0" = { + "@typescript-eslint/type-utils-5.53.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.52.0.tgz"; - sha512 = "tEKuUHfDOv852QGlpPtB3lHOoig5pyFQN/cUiZtpw99D93nEBjexRLre5sQZlkMoHry/lZr8qDAt2oAHLKA6Jw=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.53.0.tgz"; + sha512 = "HO2hh0fmtqNLzTAme/KnND5uFNwbsdYhCZghK2SoxGp3Ifn2emv+hi0PBUjzzSh0dstUIFqOj3bp0AwQlK4OWw=="; }; }; - "@typescript-eslint/types-5.52.0" = { + "@typescript-eslint/types-5.53.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.52.0.tgz"; - sha512 = "oV7XU4CHYfBhk78fS7tkum+/Dpgsfi91IIDy7fjCyq2k6KB63M6gMC0YIvy+iABzmXThCRI6xpCEyVObBdWSDQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.53.0.tgz"; + sha512 = "5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A=="; }; }; - "@typescript-eslint/typescript-estree-5.52.0" = { + "@typescript-eslint/typescript-estree-5.53.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.52.0.tgz"; - sha512 = "WeWnjanyEwt6+fVrSR0MYgEpUAuROxuAH516WPjUblIrClzYJj0kBbjdnbQXLpgAN8qbEuGywiQsXUVDiAoEuQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz"; + sha512 = "eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w=="; }; }; - "@typescript-eslint/utils-5.52.0" = { + "@typescript-eslint/utils-5.53.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.52.0.tgz"; - sha512 = "As3lChhrbwWQLNk2HC8Ree96hldKIqk98EYvypd3It8Q1f8d5zWyIoaZEp2va5667M4ZyE7X8UUR+azXrFl+NA=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.53.0.tgz"; + sha512 = "VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g=="; }; }; - "@typescript-eslint/visitor-keys-5.52.0" = { + "@typescript-eslint/visitor-keys-5.53.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.52.0.tgz"; - sha512 = "qMwpw6SU5VHCPr99y274xhbm+PRViK/NATY6qzt+Et7+mThGuFSl/ompj2/hrBlRP/kq+BFdgagnOSgw9TB0eA=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz"; + sha512 = "JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -3424,13 +3433,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001456" = { + "caniuse-lite-1.0.30001458" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001456"; + version = "1.0.30001458"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001456.tgz"; - sha512 = "XFHJY5dUgmpMV25UqaD4kVq2LsiaU5rS8fb0f17pCoXQiQslzmFgnfOxfvo1bTpTqf7dwG/N/05CnLCnOEKmzA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz"; + sha512 = "lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w=="; }; }; "case-sensitive-paths-webpack-plugin-2.4.0" = { @@ -3784,31 +3793,31 @@ let sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; - "core-js-3.28.0" = { + "core-js-3.29.0" = { name = "core-js"; packageName = "core-js"; - version = "3.28.0"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.28.0.tgz"; - sha512 = "GiZn9D4Z/rSYvTeg1ljAIsEqFm0LaN9gVtwDCrKL80zHtS31p9BAjmTxVqTQDMpwlMolJZOFntUG2uwyj7DAqw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.29.0.tgz"; + sha512 = "VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="; }; }; - "core-js-compat-3.28.0" = { + "core-js-compat-3.29.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.28.0"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.28.0.tgz"; - sha512 = "myzPgE7QodMg4nnd3K1TDoES/nADRStM8Gpz0D6nhkwbmwEnE0ZGJgoWsvQ722FR8D7xS0n0LV556RcEicjTyg=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.0.tgz"; + sha512 = "ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ=="; }; }; - "core-js-pure-3.28.0" = { + "core-js-pure-3.29.0" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.28.0"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.28.0.tgz"; - sha512 = "DSOVleA9/v3LNj/vFxAPfUHttKTzrB2RXhAPvR5TPXn4vrra3Z2ssytvRyt8eruJwAfwAiFADEbrjcRdcvPLQQ=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.29.0.tgz"; + sha512 = "v94gUjN5UTe1n0yN/opTihJ8QBWD2O8i19RfTZR7foONPWArnjB96QA/wk5ozu1mm6ja3udQCzOzwQXTxi3xOQ=="; }; }; "core-util-is-1.0.3" = { @@ -4504,13 +4513,13 @@ let sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "electron-to-chromium-1.4.302" = { + "electron-to-chromium-1.4.311" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.302"; + version = "1.4.311"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.302.tgz"; - sha512 = "Uk7C+7aPBryUR1Fwvk9VmipBcN9fVsqBO57jV2ZjTm+IZ6BMNqu7EDVEg2HxCNufk6QcWlFsBkhQyQroB2VWKw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz"; + sha512 = "RoDlZufvrtr2Nx3Yx5MB8jX3aHIxm8nRWPJm3yVvyHmyKaRvn90RjzB6hNnt0AkhS3IInJdyRfQb4mWhPvUjVw=="; }; }; "emittery-0.10.2" = { @@ -4720,13 +4729,13 @@ let sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; }; - "eslint-8.34.0" = { + "eslint-8.35.0" = { name = "eslint"; packageName = "eslint"; - version = "8.34.0"; + version = "8.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz"; - sha512 = "1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz"; + sha512 = "BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw=="; }; }; "eslint-config-react-app-7.0.1" = { @@ -7636,13 +7645,13 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "open-8.4.1" = { + "open-8.4.2" = { name = "open"; packageName = "open"; - version = "8.4.1"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.1.tgz"; - sha512 = "/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg=="; + url = "https://registry.npmjs.org/open/-/open-8.4.2.tgz"; + sha512 = "7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="; }; }; "optionator-0.8.3" = { @@ -8905,22 +8914,22 @@ let sha512 = "Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="; }; }; - "readable-stream-2.3.7" = { + "readable-stream-2.3.8" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; + sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; }; }; - "readable-stream-3.6.0" = { + "readable-stream-3.6.1" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; + sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; }; }; "readdirp-3.6.0" = { @@ -9985,13 +9994,13 @@ let sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; }; }; - "terser-5.16.4" = { + "terser-5.16.5" = { name = "terser"; packageName = "terser"; - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.4.tgz"; - sha512 = "5yEGuZ3DZradbogeYQ1NaGz7rXVBDWujWlx1PT8efXO6Txn+eWbfKqB2bTDVmFXmePFkoLU6XI8UektMIEA0ug=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.5.tgz"; + sha512 = "qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg=="; }; }; "terser-webpack-plugin-5.3.6" = { @@ -10129,13 +10138,13 @@ let sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; }; }; - "tsconfig-paths-3.14.1" = { + "tsconfig-paths-3.14.2" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.14.1"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; - sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz"; + sha512 = "o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g=="; }; }; "tslib-1.14.1" = { @@ -11012,8 +11021,8 @@ let sources."@ampproject/remapping-2.2.0" sources."@apideck/better-ajv-errors-0.3.6" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.14" - (sources."@babel/core-7.20.12" // { + sources."@babel/compat-data-7.21.0" + (sources."@babel/core-7.21.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -11024,7 +11033,7 @@ let sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.14" // { + (sources."@babel/generator-7.21.1" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -11036,8 +11045,8 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.20.12" - sources."@babel/helper-create-regexp-features-plugin-7.20.5" + sources."@babel/helper-create-class-features-plugin-7.21.0" + sources."@babel/helper-create-regexp-features-plugin-7.21.0" (sources."@babel/helper-define-polyfill-provider-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -11045,11 +11054,11 @@ let }) sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-explode-assignable-expression-7.18.6" - sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.20.7" + sources."@babel/helper-member-expression-to-functions-7.21.0" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.11" + sources."@babel/helper-module-transforms-7.21.2" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" @@ -11059,17 +11068,17 @@ let sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helper-validator-option-7.21.0" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.13" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.15" + sources."@babel/parser-7.21.2" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-class-static-block-7.20.7" - sources."@babel/plugin-proposal-decorators-7.20.13" + sources."@babel/plugin-proposal-class-static-block-7.21.0" + sources."@babel/plugin-proposal-decorators-7.21.0" sources."@babel/plugin-proposal-dynamic-import-7.18.6" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" sources."@babel/plugin-proposal-json-strings-7.18.6" @@ -11078,15 +11087,15 @@ let sources."@babel/plugin-proposal-numeric-separator-7.18.6" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.20.7" + sources."@babel/plugin-proposal-optional-chaining-7.21.0" sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.20.5" + sources."@babel/plugin-proposal-private-property-in-object-7.21.0" sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-decorators-7.19.0" + sources."@babel/plugin-syntax-decorators-7.21.0" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-flow-7.18.6" @@ -11106,20 +11115,20 @@ let sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.15" - sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-block-scoping-7.21.0" + sources."@babel/plugin-transform-classes-7.21.0" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" - sources."@babel/plugin-transform-flow-strip-types-7.19.0" - sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-flow-strip-types-7.21.0" + sources."@babel/plugin-transform-for-of-7.21.0" sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" sources."@babel/plugin-transform-modules-amd-7.20.11" - sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.21.2" sources."@babel/plugin-transform-modules-systemjs-7.20.11" sources."@babel/plugin-transform-modules-umd-7.18.6" sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5" @@ -11129,12 +11138,12 @@ let sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-react-constant-elements-7.20.2" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.13" + sources."@babel/plugin-transform-react-jsx-7.21.0" sources."@babel/plugin-transform-react-jsx-development-7.18.6" sources."@babel/plugin-transform-react-pure-annotations-7.18.6" sources."@babel/plugin-transform-regenerator-7.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" - (sources."@babel/plugin-transform-runtime-7.19.6" // { + (sources."@babel/plugin-transform-runtime-7.21.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -11144,7 +11153,7 @@ let sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-typescript-7.20.13" + sources."@babel/plugin-transform-typescript-7.21.0" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" (sources."@babel/preset-env-7.20.2" // { @@ -11154,12 +11163,12 @@ let }) sources."@babel/preset-modules-0.1.5" sources."@babel/preset-react-7.18.6" - sources."@babel/preset-typescript-7.18.6" + sources."@babel/preset-typescript-7.21.0" sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.20.13" + sources."@babel/runtime-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.13" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@bcoe/v8-coverage-0.2.3" sources."@csstools/normalize.css-12.0.0" sources."@csstools/postcss-cascade-layers-1.1.1" @@ -11190,13 +11199,14 @@ let sources."@emotion/use-insertion-effect-with-fallbacks-1.0.0" sources."@emotion/utils-1.2.0" sources."@emotion/weak-memoize-0.3.0" - (sources."@eslint/eslintrc-1.4.1" // { + (sources."@eslint/eslintrc-2.0.0" // { dependencies = [ sources."argparse-2.0.1" sources."globals-13.20.0" sources."js-yaml-4.1.0" ]; }) + sources."@eslint/js-8.35.0" sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" @@ -11292,7 +11302,7 @@ let }) sources."@mui/core-downloads-tracker-5.11.9" sources."@mui/icons-material-5.11.9" - (sources."@mui/material-5.11.9" // { + (sources."@mui/material-5.11.10" // { dependencies = [ sources."react-is-18.2.0" ]; @@ -11366,14 +11376,14 @@ let sources."@types/express-serve-static-core-4.17.33" sources."@types/graceful-fs-4.1.6" sources."@types/html-minifier-terser-6.1.0" - sources."@types/http-proxy-1.17.9" + sources."@types/http-proxy-1.17.10" sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" sources."@types/json-schema-7.0.11" sources."@types/json5-0.0.29" sources."@types/mime-3.0.1" - sources."@types/node-18.14.0" + sources."@types/node-18.14.2" sources."@types/parse-json-4.0.0" sources."@types/prettier-2.7.2" sources."@types/prop-types-15.7.5" @@ -11388,27 +11398,27 @@ let sources."@types/scheduler-0.16.2" sources."@types/semver-7.3.13" sources."@types/serve-index-1.9.1" - sources."@types/serve-static-1.15.0" + sources."@types/serve-static-1.15.1" sources."@types/sockjs-0.3.33" sources."@types/stack-utils-2.0.1" sources."@types/trusted-types-2.0.3" sources."@types/ws-8.5.4" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" - sources."@typescript-eslint/eslint-plugin-5.52.0" - sources."@typescript-eslint/experimental-utils-5.52.0" - sources."@typescript-eslint/parser-5.52.0" - sources."@typescript-eslint/scope-manager-5.52.0" - sources."@typescript-eslint/type-utils-5.52.0" - sources."@typescript-eslint/types-5.52.0" - sources."@typescript-eslint/typescript-estree-5.52.0" - (sources."@typescript-eslint/utils-5.52.0" // { + sources."@typescript-eslint/eslint-plugin-5.53.0" + sources."@typescript-eslint/experimental-utils-5.53.0" + sources."@typescript-eslint/parser-5.53.0" + sources."@typescript-eslint/scope-manager-5.53.0" + sources."@typescript-eslint/type-utils-5.53.0" + sources."@typescript-eslint/types-5.53.0" + sources."@typescript-eslint/typescript-estree-5.53.0" + (sources."@typescript-eslint/utils-5.53.0" // { dependencies = [ sources."eslint-scope-5.1.1" sources."estraverse-4.3.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.52.0" + sources."@typescript-eslint/visitor-keys-5.53.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -11544,7 +11554,7 @@ let sources."camelcase-6.3.0" sources."camelcase-css-2.0.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001456" + sources."caniuse-lite-1.0.30001458" sources."case-sensitive-paths-webpack-plugin-2.4.0" (sources."chalk-2.4.2" // { dependencies = [ @@ -11596,9 +11606,9 @@ let sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.28.0" - sources."core-js-compat-3.28.0" - sources."core-js-pure-3.28.0" + sources."core-js-3.29.0" + sources."core-js-compat-3.29.0" + sources."core-js-pure-3.29.0" sources."core-util-is-1.0.3" sources."cosmiconfig-7.1.0" sources."cross-fetch-3.1.5" @@ -11713,7 +11723,7 @@ let sources."duplexer-0.1.2" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.302" + sources."electron-to-chromium-1.4.311" sources."emittery-0.8.1" sources."emoji-regex-9.2.2" sources."emojis-list-3.0.0" @@ -11741,7 +11751,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.34.0" // { + (sources."eslint-8.35.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."argparse-2.0.1" @@ -11923,7 +11933,7 @@ let (sources."hpack.js-2.1.6" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" ]; }) @@ -12364,7 +12374,7 @@ let sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.1" + sources."open-8.4.2" sources."optionator-0.9.1" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -12553,7 +12563,7 @@ let sources."react-scripts-5.0.1" sources."react-transition-group-4.4.5" sources."read-cache-1.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readdirp-3.6.0" sources."recursive-readdir-2.2.3" sources."regenerate-1.4.2" @@ -12741,7 +12751,7 @@ let ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.16.4" // { + (sources."terser-5.16.5" // { dependencies = [ sources."commander-2.20.3" ]; @@ -12763,7 +12773,7 @@ let }) sources."tr46-0.0.3" sources."tryer-1.0.1" - (sources."tsconfig-paths-3.14.1" // { + (sources."tsconfig-paths-3.14.2" // { dependencies = [ sources."json5-1.0.2" ]; From 51d6b4cc2798e6989ff893ee43159cc02392faec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 10:12:58 +0100 Subject: [PATCH 26/58] dbx: add changelog to meta --- pkgs/applications/misc/dbx/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index cbcebae31237..76081e90c9a1 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "databrickslabs"; repo = "dbx"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-P/cniy0xYaDoUbKdvV7KCubCpmOAhYp3cg2VBRA+a6I="; }; @@ -73,6 +73,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "CLI tool for advanced Databricks jobs management"; homepage = "https://github.com/databrickslabs/dbx"; + changelog = "https://github.com/databrickslabs/dbx/blob/v${version}/CHANGELOG.md"; license = licenses.databricks-dbx; maintainers = with maintainers; [ GuillaumeDesforges ]; }; From faa5ecad9da89e42fe7f8376e29326a5892c7953 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 10:25:33 +0100 Subject: [PATCH 27/58] dbx: 0.7.6 -> 0.8.8 Diff: https://github.com/databrickslabs/dbx/compare/refs/tags/v0.7.6...v0.8.8 Changelog: https://github.com/databrickslabs/dbx/blob/v0.8.8/CHANGELOG.md --- pkgs/applications/misc/dbx/default.nix | 29 +++++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 76081e90c9a1..8e627af02872 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -6,16 +6,22 @@ python3.pkgs.buildPythonApplication rec { pname = "dbx"; - version = "0.7.6"; + version = "0.8.8"; format = "setuptools"; src = fetchFromGitHub { owner = "databrickslabs"; repo = "dbx"; rev = "refs/tags/v${version}"; - hash = "sha256-P/cniy0xYaDoUbKdvV7KCubCpmOAhYp3cg2VBRA+a6I="; + hash = "sha256-nx6fz+atlnB/KxdznnZArHpyv41cuBDQauG0irq1Zyc="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "mlflow-skinny>=1.28.0,<3.0.0" "mlflow" \ + --replace "rich==12.6.0" "rich" + ''; + propagatedBuildInputs = with python3.pkgs; [ aiohttp click @@ -34,6 +40,19 @@ python3.pkgs.buildPythonApplication rec { watchdog ] ++ typer.optional-dependencies.all; + passthru.optional-dependencies = with python3.pkgs; { + aws = [ + boto3 + ]; + azure = [ + azure-storage-blob + azure-identity + ]; + gcp = [ + google-cloud-storage + ]; + }; + nativeCheckInputs = [ git ] ++ (with python3.pkgs; [ @@ -43,12 +62,6 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]); - postPatch = '' - substituteInPlace setup.py \ - --replace "mlflow-skinny>=1.28.0,<=2.0.0" "mlflow" \ - --replace "rich==12.5.1" "rich" - ''; - preCheck = '' export HOME=$(mktemp -d) export PATH="$PATH:$out/bin" From 369ab08b5726ea3718ec12c45292dbf227b37fc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 10:40:34 +0100 Subject: [PATCH 28/58] python311Packages.karton-dashboard: move to pythonRelaxDepsHook - relax mistune constraint as we have a patch already --- .../karton-dashboard/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 986c7ec27b6a..a055c423374b 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -8,6 +8,7 @@ , networkx , prometheus-client , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -25,6 +26,7 @@ buildPythonPackage rec { }; patches = [ + # Allow later mistune, https://github.com/CERT-Polska/karton-dashboard/pull/68 (fetchpatch { name = "update-mistune.patch"; url = "https://github.com/CERT-Polska/karton-dashboard/commit/d0a2a1ffd21e9066acca77434acaff7b20e460d0.patch"; @@ -32,6 +34,17 @@ buildPythonPackage rec { }) ]; + pythonRelaxDeps = [ + "Flask" + "mistune" + "networkx" + "prometheus-client" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ flask karton-core @@ -40,13 +53,6 @@ buildPythonPackage rec { prometheus-client ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "Flask==2.0.3" "Flask" \ - --replace "networkx==2.6.3" "networkx" \ - --replace "prometheus_client==0.11.0" "prometheus_client" - ''; - # Project has no tests. pythonImportsCheck requires MinIO configuration doCheck = false; From 9166649c3ee430bd9a5d20c2b62ec311ac6a4f68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 11:18:41 +0100 Subject: [PATCH 29/58] khoj: add changelog to meta --- pkgs/servers/search/khoj/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/servers/search/khoj/default.nix index b49be53ec207..b440b8681d5e 100644 --- a/pkgs/servers/search/khoj/default.nix +++ b/pkgs/servers/search/khoj/default.nix @@ -69,6 +69,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos"; homepage = "https://github.com/debanjum/khoj"; + changelog = "https://github.com/debanjum/khoj/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ dit7ya ]; }; From 9c1c08a57e2d565195340e5b810e3300b63522c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 11:46:23 +0100 Subject: [PATCH 30/58] khoj: 0.2.6 -> 0.3.0 Changelog: https://github.com/debanjum/khoj/releases/tag/0.3.0 --- pkgs/servers/search/khoj/default.nix | 104 ++++++++++++++++++--------- 1 file changed, 69 insertions(+), 35 deletions(-) diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/servers/search/khoj/default.nix index b440b8681d5e..6859562d4f62 100644 --- a/pkgs/servers/search/khoj/default.nix +++ b/pkgs/servers/search/khoj/default.nix @@ -1,27 +1,56 @@ { lib , fetchFromGitHub -, python3Packages +, python3 , qt6 }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "khoj"; - version = "0.2.6"; - format = "setuptools"; + version = "0.3.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "debanjum"; repo = "khoj"; rev = "refs/tags/${version}"; - hash = "sha256-QcxP+USj7vlLKPno2mV53nFonZM38VzL8D4zY6d8y3k="; + hash = "sha256-9kKK0DXpLfPB2LMnYcC6BKgZaoRsNHBZVe4thI7b9tk="; }; - propagatedBuildInputs = with python3Packages; [ - aiofiles + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "dateparser == 1.1.1" "dateparser" \ + --replace "defusedxml == 0.7.1" ""defusedxml"" \ + --replace "fastapi == 0.77.1" "fastapi" \ + --replace "jinja2 == 3.1.2" "jinja2" \ + --replace "openai == 0.20.0" "openai" \ + --replace "pillow == 9.3.0" "pillow" \ + --replace "pydantic == 1.9.1" "pydantic" \ + --replace "pyyaml == 6.0" "pyyaml" \ + --replace "pyqt6 == 6.3.1" "pyqt6" \ + --replace "rich >= 13.3.1" "rich" \ + --replace "schedule == 1.1.0" "schedule" \ + --replace "sentence-transformers == 2.2.2" "sentence-transformers" \ + --replace "torch == 1.13.1" "torch" \ + --replace "uvicorn == 0.17.6" "uvicorn" + ''; + + nativeBuildInputs = with python3.pkgs; [ + hatch-vcs + hatchling + ] ++ (with qt6; [ + wrapQtAppsHook + ]); + + buildInputs = with qt6; [ + qtwayland + ]; + + propagatedBuildInputs = with python3.pkgs; [ dateparser defusedxml fastapi - huggingface-hub jinja2 numpy openai @@ -29,43 +58,48 @@ python3Packages.buildPythonApplication rec { pydantic pyqt6 pyyaml + rich schedule sentence-transformers torch - torchvision - transformers uvicorn ]; - buildInputs = with qt6; [ - qtwayland + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook ]; - nativeBuildInputs = with qt6; [ - wrapQtAppsHook - ]; - - checkInputs = with python3Packages; [ - pytest - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "aiofiles == 0.8.0" "aiofiles >= 0.8.0" \ - --replace "openai == 0.20.0" "openai >= 0.20.0" \ - --replace "pytest == 7.1.2" "pytest >= 7.1.2" \ - --replace "fastapi == 0.77.1" "fastapi >= 0.77.1" \ - --replace "numpy == 1.22.4" "numpy >= 1.22.4" \ - --replace "huggingface_hub == 0.8.1" "huggingface_hub >= 0.8.1" \ - --replace "dateparser == 1.1.1" "dateparser >= 1.1.1" \ - --replace "sentence-transformers == 2.1.0" "sentence-transformers >= 2.1.0" \ - --replace "transformers == 4.21.0" "transformers >= 4.21.0" \ - --replace "torchvision == 0.14.1" "torchvision" \ - --replace "pydantic == 1.9.1" "pydantic >= 1.9.1" \ - --replace "pyqt6 == 6.3.1" "pyqt6 >= 6.3.1" \ - --replace "uvicorn == 0.17.6" "uvicorn >= 0.17.6" + preCheck = '' + export HOME=$(mktemp -d) ''; + pythonImportsCheck = [ + "khoj" + ]; + + disabledTests = [ + # Tests require network access + "test_search_with_valid_content_type" + "test_update_with_valid_content_type" + "test_regenerate_with_valid_content_type" + "test_image_search" + "test_notes_search" + "test_notes_search_with_only_filters" + "test_notes_search_with_include_filter" + "test_notes_search_with_exclude_filter" + "test_image_metadata" + "test_image_search" + "test_image_search_query_truncated" + "test_image_search_by_filepath" + "test_asymmetric_setup_with_missing_file_raises_error" + "test_asymmetric_setup_with_empty_file_raises_error" + "test_asymmetric_reload" + "test_asymmetric_setup" + "test_asymmetric_search" + "test_entry_chunking_by_max_tokens" + "test_incremental_update" + ]; + meta = with lib; { description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos"; homepage = "https://github.com/debanjum/khoj"; From 1a24bd868c3726c3118157fc906344bf070ea3c0 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 27 Feb 2023 08:05:44 -0300 Subject: [PATCH 31/58] kaniko: add jk as maintainer As requested: https://github.com/NixOS/nixpkgs/pull/217850#pullrequestreview-1311428701 --- pkgs/applications/networking/cluster/kaniko/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index ace2d3dee355..6bae7297917b 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -47,7 +47,7 @@ buildGoModule rec { homepage = "https://github.com/GoogleContainerTools/kaniko"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.superherointj ]; + maintainers = with lib.maintainers; [ jk superherointj ]; mainProgram = "executor"; }; } From d2ca40be87deebcbc3c337686ccd890af53227e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 12:06:38 +0100 Subject: [PATCH 32/58] python310Packages.shap: add changelog to meta --- pkgs/development/python-modules/shap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index a16e645a814c..fa79b9e028db 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -146,6 +146,7 @@ buildPythonPackage rec { meta = with lib; { description = "A unified approach to explain the output of any machine learning model"; homepage = "https://github.com/slundberg/shap"; + changelog = "https://github.com/slundberg/shap/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; From 1c5e5f4dffd8b4084cd6f45df28c7aaed1ce9be3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 12:08:00 +0100 Subject: [PATCH 33/58] python310Packages.shap: mark as broken No support for scikit-learn > 1.2 https://github.com/slundberg/shap/issues/2866 --- pkgs/development/python-modules/shap/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index fa79b9e028db..a7c9b139ac5c 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -150,5 +150,8 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; + # No support for scikit-learn > 1.2 + # https://github.com/slundberg/shap/issues/2866 + broken = true; }; } From edcfe3f6b979a10feb6485b81ad592d3ac4fba45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Feb 2023 10:58:33 +0100 Subject: [PATCH 34/58] python310Packages.mocket: add changelog to meta python310Packages.mocket: disable on unsupported Python releases python310Packages.mocket: add optional-dependencies --- .../python-modules/mocket/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index c36747d3ddc7..3e2294bfd564 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -17,16 +17,19 @@ , requests , sure , pook +, pythonOlder }: buildPythonPackage rec { pname = "mocket"; version = "3.10.9"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw="; + hash = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw="; }; propagatedBuildInputs = [ @@ -36,6 +39,12 @@ buildPythonPackage rec { urllib3 ]; + passthru.optional-dependencies = { + pook = [ + pook + ]; + }; + nativeCheckInputs = [ pytestCheckHook pytest-mock @@ -46,11 +55,11 @@ buildPythonPackage rec { redis requests sure - pook - ]; + ] ++ passthru.optional-dependencies.pook; # skip http tests SKIP_TRUE_HTTP = true; + pytestFlagsArray = [ # Requires a live Redis instance "--ignore=tests/main/test_redis.py" @@ -77,8 +86,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "mocket" ]; meta = with lib; { - description = "A socket mock framework - for all kinds of socket animals, web-clients included"; + description = "A socket mock framework for all kinds of sockets including web-clients"; homepage = "https://github.com/mindflayer/python-mocket"; + changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; }; From 65f898d6e4195214230707b00fb34c30b910ee70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Feb 2023 11:35:03 +0100 Subject: [PATCH 35/58] python310Packages.geoip2: add changelog to meta python310Packages.geoip2: remove postPatch section python311Packages.geoip2: disable failing tests --- .../python-modules/geoip2/default.nix | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 0563b8ae997a..c821c5a0cda3 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -1,28 +1,35 @@ -{ buildPythonPackage, lib, fetchPypi, pythonOlder +{ lib , aiohttp +, buildPythonPackage +, fetchPypi , maxminddb , mocket +, pytestCheckHook +, pythonAtLeast +, pythonOlder , requests , requests-mock , urllib3 -, pytestCheckHook }: buildPythonPackage rec { - version = "4.6.0"; pname = "geoip2"; + version = "4.6.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8OgLzoCwa7OL0Iv0h31ahONU6TIJXmzPtNJ7tZj6T4M="; + hash = "sha256-8OgLzoCwa7OL0Iv0h31ahONU6TIJXmzPtNJ7tZj6T4M="; }; - patchPhase = '' - substituteInPlace requirements.txt --replace "requests>=2.24.0,<3.0.0" "requests" - ''; - - propagatedBuildInputs = [ aiohttp maxminddb requests urllib3 ]; + propagatedBuildInputs = [ + aiohttp + maxminddb + requests + urllib3 + ]; nativeCheckInputs = [ mocket @@ -30,11 +37,21 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "geoip2" ]; + pythonImportsCheck = [ + "geoip2" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/maxmind/GeoIP2-python/pull/136 + "TestAsyncClient" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_request" + ]; meta = with lib; { description = "GeoIP2 webservice client and database reader"; homepage = "https://github.com/maxmind/GeoIP2-python"; + changelog = "https://github.com/maxmind/GeoIP2-python/blob/v${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 8eee919c90f19fadf4b14693525078845a48ddec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 12:41:36 +0100 Subject: [PATCH 36/58] python310Packages.mocket: 3.10.9 -> 3.11.0 --- .../python-modules/mocket/default.nix | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 3e2294bfd564..ff8d2856cc99 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -1,40 +1,40 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, isPy3k -, decorator -, http-parser -, python-magic -, urllib3 -, pytestCheckHook -, pytest-mock , aiohttp +, asgiref +, buildPythonPackage +, decorator , fastapi +, fetchPypi , gevent +, httptools , httpx +, isPy3k +, pook +, pytest-mock +, pytestCheckHook +, python-magic +, pythonOlder , redis , requests , sure -, pook -, pythonOlder +, urllib3 }: buildPythonPackage rec { pname = "mocket"; - version = "3.10.9"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw="; + hash = "sha256-OIdLP3hHnPZ9MqrHt6G5t2SSO342+jTACgzxM6RjVYM="; }; propagatedBuildInputs = [ decorator - http-parser + httptools python-magic urllib3 ]; @@ -46,26 +46,24 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytestCheckHook - pytest-mock aiohttp + asgiref fastapi gevent httpx + pytest-mock + pytestCheckHook redis requests sure ] ++ passthru.optional-dependencies.pook; - # skip http tests + # Skip http tests SKIP_TRUE_HTTP = true; - pytestFlagsArray = [ + disabledTestPaths = [ # Requires a live Redis instance - "--ignore=tests/main/test_redis.py" - ] ++ lib.optionals (pythonOlder "3.8") [ - # Uses IsolatedAsyncioTestCase which is only available >= 3.8 - "--ignore=tests/tests38/test_http_aiohttp.py" + "tests/main/test_redis.py" ]; disabledTests = [ @@ -83,7 +81,9 @@ buildPythonPackage rec { "test_gethostbyname" ]; - pythonImportsCheck = [ "mocket" ]; + pythonImportsCheck = [ + "mocket" + ]; meta = with lib; { description = "A socket mock framework for all kinds of sockets including web-clients"; From 930b1c06b14c906fae4f529c6978e53250dce09c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Feb 2023 13:14:03 +0100 Subject: [PATCH 37/58] =?UTF-8?q?ocamlPackages.base64:=203.5.0=20=E2=86=92?= =?UTF-8?q?=203.5.1=20(#218580)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ocamlPackages.otr: use Dune 3 * ocamlPackages.h2: use Dune 3 * ocamlPackages.index: use Dune 3 * ocamlPackages.progress: use Dune 3 * ocamlPackages.repr: use Dune 3 * ocamlPackages.emile: use Dune 3 * ocamlPackages.bistro: use Dune 3 * ocamlPackages.base64: 3.5.0 → 3.5.1 --- pkgs/development/ocaml-modules/base64/default.nix | 7 ++++--- pkgs/development/ocaml-modules/bistro/default.nix | 2 +- pkgs/development/ocaml-modules/emile/default.nix | 10 ++++------ pkgs/development/ocaml-modules/h2/default.nix | 1 + pkgs/development/ocaml-modules/index/default.nix | 3 ++- pkgs/development/ocaml-modules/otr/default.nix | 6 +++--- pkgs/development/ocaml-modules/progress/default.nix | 2 +- pkgs/development/ocaml-modules/repr/default.nix | 3 ++- pkgs/development/ocaml-modules/repr/ppx.nix | 1 + 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index db1a4e856467..be8dabf7f60e 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -2,13 +2,14 @@ buildDunePackage rec { pname = "base64"; - version = "3.5.0"; + version = "3.5.1"; minimalOCamlVersion = "4.03"; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz"; - sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q="; + url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-${version}.tbz"; + hash = "sha256-2P7apZvRL+rnrMCLWSjdR4qsUj9MqNJARw0lAGUcZe0="; }; nativeBuildInputs = [ findlib ]; diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index 43cbd33f738c..192bb470a66d 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { pname = "bistro"; version = "unstable-2022-05-07"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "pveber"; diff --git a/pkgs/development/ocaml-modules/emile/default.nix b/pkgs/development/ocaml-modules/emile/default.nix index f1c61ce27e8d..44764033d6a2 100644 --- a/pkgs/development/ocaml-modules/emile/default.nix +++ b/pkgs/development/ocaml-modules/emile/default.nix @@ -15,11 +15,12 @@ buildDunePackage rec { pname = "emile"; version = "1.1"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/dinosaure/emile/releases/download/v${version}/emile-v${version}.tbz"; - sha256 = "0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p"; + hash = "sha256:0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p"; }; buildInputs = [ cmdliner ]; @@ -32,10 +33,7 @@ buildDunePackage rec { uutf ]; - # technically emile is available for ocaml >= 4.03, but alcotest - # and angstrom (fmt) are only available for >= 4.08. Disabling - # tests for < 4.08 at least improves the error message - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; checkInputs = [ alcotest ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix index 95272890e15f..1a8d0c5d6395 100644 --- a/pkgs/development/ocaml-modules/h2/default.nix +++ b/pkgs/development/ocaml-modules/h2/default.nix @@ -30,6 +30,7 @@ buildDunePackage rec { src ; + duneVersion = "3"; minimalOCamlVersion = "4.06"; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index 04373cbcce8d..ebc050787555 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -10,10 +10,11 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "sha256-rPwNzqkWqDak2mDTDIBqIvachY1vfOIzFmwaXjZea+4="; + hash = "sha256-rPwNzqkWqDak2mDTDIBqIvachY1vfOIzFmwaXjZea+4="; }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; buildInputs = [ stdlib-shims diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index d2ed78d51b8a..108f4b79d782 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -6,14 +6,14 @@ buildDunePackage rec { pname = "otr"; version = "0.3.10"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-v${version}.tbz"; - sha256 = "0dssc7p6s7z53n0mddyipjghzr8ld8bb7alaxqrx9gdpspwab1gq"; + hash = "sha256:0dssc7p6s7z53n0mddyipjghzr8ld8bb7alaxqrx9gdpspwab1gq"; }; - useDune2 = true; + duneVersion = "3"; propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk astring base64 ]; diff --git a/pkgs/development/ocaml-modules/progress/default.nix b/pkgs/development/ocaml-modules/progress/default.nix index 4c00ff98465a..b714cdf33712 100644 --- a/pkgs/development/ocaml-modules/progress/default.nix +++ b/pkgs/development/ocaml-modules/progress/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { pname = "progress"; minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; inherit (terminal) version src; diff --git a/pkgs/development/ocaml-modules/repr/default.nix b/pkgs/development/ocaml-modules/repr/default.nix index f5a11919c5db..47c19154689e 100644 --- a/pkgs/development/ocaml-modules/repr/default.nix +++ b/pkgs/development/ocaml-modules/repr/default.nix @@ -8,10 +8,11 @@ buildDunePackage rec { owner = "mirage"; repo = "repr"; rev = version; - sha256 = "sha256-jF8KmaG07CT26O/1ANc6s1yHFJqhXDtd0jgTA04tIgw="; + hash = "sha256-jF8KmaG07CT26O/1ANc6s1yHFJqhXDtd0jgTA04tIgw="; }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; strictDeps = true; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix index 1eb762563621..b1091114ce27 100644 --- a/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "ppx_repr"; inherit (repr) src version strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ ppx_deriving From c246d9af83c959eb642998794d5791bd0a8e4522 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 13:38:05 +0100 Subject: [PATCH 38/58] python311Packages.django-cacheops: re-add six six was removed in the current master and not 6.2 --- pkgs/development/python-modules/django-cacheops/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 2e1a791ac4da..8122af7e28b9 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -7,6 +7,7 @@ , pytest-django , pytestCheckHook , pythonOlder +, six }: buildPythonPackage rec { @@ -25,6 +26,7 @@ buildPythonPackage rec { django funcy redis + six ]; nativeCheckInputs = [ From 4ec20c70d8229219f6c0744e9547192f8ec47a07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Feb 2023 10:16:43 +0100 Subject: [PATCH 39/58] python310Packages.flask-appbuilder: add changelog to meta --- pkgs/development/python-modules/flask-appbuilder/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index b122d6020bc3..8fbc0974972d 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -94,6 +94,7 @@ buildPythonPackage rec { meta = with lib; { description = "Application development framework, built on top of Flask"; homepage = "https://github.com/dpgaspar/flask-appbuilder/"; + changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; From 605b230af97bba3c294077ada2be263fe055008c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Feb 2023 10:34:17 +0100 Subject: [PATCH 40/58] python310Packages.apispec: add optional-dependencies --- .../python-modules/apispec/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 1a85922e5dd5..d7fc0929ec43 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -4,6 +4,7 @@ , marshmallow , mock , openapi-spec-validator +, packaging , prance , pytestCheckHook , pythonOlder @@ -23,16 +24,26 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pyyaml - prance + packaging ]; + passthru.optional-dependencies = { + marshmallow = [ + marshmallow + ]; + yaml = [ + pyyaml + ]; + validation = [ + openapi-spec-validator + prance + ]; + }; + nativeCheckInputs = [ - openapi-spec-validator - marshmallow mock pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "apispec" From 435086885c953ce70e8f3bfd1eb833da21998388 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 26 Feb 2023 14:58:44 +0100 Subject: [PATCH 41/58] electron-bin: rename from electron --- .../tools/electron/{ => binary}/default.nix | 32 ++++++------ .../tools/electron/{ => binary}/generic.nix | 0 pkgs/top-level/all-packages.nix | 51 ++++++++++++------- 3 files changed, 50 insertions(+), 33 deletions(-) rename pkgs/development/tools/electron/{ => binary}/default.nix (92%) rename pkgs/development/tools/electron/{ => binary}/generic.nix (100%) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/binary/default.nix similarity index 92% rename from pkgs/development/tools/electron/default.nix rename to pkgs/development/tools/electron/binary/default.nix index ae1a158ec11a..95f155914f8b 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -24,9 +24,9 @@ let in rec { - electron = electron_23; + electron-bin = electron_23-bin; - electron_9 = mkElectron "9.4.4" { + electron_9-bin = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; x86_64-darwin = "f41c0bf874ddbba00c3d6989d07f74155a236e2d5a3eaf3d1d19ef8d3eb2256c"; i686-linux = "40e37f8f908a81c9fac1073fe22309cd6df2d68e685f83274c6d2f0959004187"; @@ -35,7 +35,7 @@ rec { headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; }; - electron_10 = mkElectron "10.4.7" { + electron_10-bin = mkElectron "10.4.7" { x86_64-linux = "e3ea75fcedce588c6b59cfa3a6e46ba67b789e14dc2e5b9dfe1ddf3f82b0f995"; x86_64-darwin = "8f01e020563b7fce68dc2e3d4bbf419320d13b088e89eb64f9645e9d73ad88fb"; i686-linux = "dd7fde9b3993538333ec701101554050b27d0b680196d0883ab563e8e696fc79"; @@ -44,7 +44,7 @@ rec { headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6"; }; - electron_11 = mkElectron "11.5.0" { + electron_11-bin = mkElectron "11.5.0" { x86_64-linux = "613ef8ac00c5abda425dfa48778a68f58a2e9c7c1f82539bb1a41afabbd6193f"; x86_64-darwin = "32937dca29fc397f0b15dbab720ed3edb88eee24f00f911984b307bf12dc8fd5"; i686-linux = "cd154c56d02d7b1f16e2bcd5650bddf0de9141fdbb8248adc64f6d607e5fb725"; @@ -54,7 +54,7 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.2.3" { + electron_12-bin = mkElectron "12.2.3" { armv7l-linux = "4de83c34987ac7b3b2d0c8c84f27f9a34d9ea2764ae1e54fb609a95064e7e71a"; aarch64-linux = "d29d234c09ba810d89ed1fba9e405b6975916ea208d001348379f89b50d1835c"; x86_64-linux = "deae6d0941762147716b8298476080d961df2a32d0f6f57b244cbe3a2553cd24"; @@ -64,7 +64,7 @@ rec { headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.9" { + electron_13-bin = mkElectron "13.6.9" { armv7l-linux = "e70cf80ac17850f3291c19a89235c59a7a6e0c791e7965805872ce584479c419"; aarch64-linux = "cb570f77e46403a75b99740c41b297154f057dc3b9aa75fd235dccc5619972cf"; x86_64-linux = "5e29701394041ba2acd8a9bb042d77967c399b8fe007d7ffbd1d3e6bfdb9eb8a"; @@ -74,7 +74,7 @@ rec { headers = "0vvizddmhprprbdf6bklasz6amwc254bpc9j0zlx23d1pgyxpnhc"; }; - electron_14 = mkElectron "14.2.9" { + electron_14-bin = mkElectron "14.2.9" { armv7l-linux = "02ae6cd9ec9c2dcb2f550923576a0c851fff3e796a5048dd3806947c541fd564"; aarch64-linux = "631ba0f716d0272931418de42468114360bd21ec72875605fc32d67620743d2c"; x86_64-linux = "0a62a41e8ac4592aba347c82f9c40f3fb4c84c7d00b6bb9501d02375cd49cb7d"; @@ -84,7 +84,7 @@ rec { headers = "181b2agnf4b5s81p2rdnd6wkw9c2ri4cv1x0wwf7rj60axvzvydm"; }; - electron_15 = mkElectron "15.5.2" { + electron_15-bin = mkElectron "15.5.2" { armv7l-linux = "da434095fd7cc17d85ebca5eab3510ec7ff73ace4edc933fe2f27a716ca711c0"; aarch64-linux = "bcec3f962c7acefc8690680a19df9d83721db7e5db55c7b7a8946365139457a6"; x86_64-linux = "a4a95888c313dbe279f5f9d9dfd99f56a2a1b6b905fb6cba3b284322fe19a530"; @@ -94,7 +94,7 @@ rec { headers = "0jbxazkjkm8g8b8d0ini2l4q9z7885mz5vyj74lf85lqdfqzgzc0"; }; - electron_16 = mkElectron "16.2.3" { + electron_16-bin = mkElectron "16.2.3" { armv7l-linux = "9b442b17349dcec08e6efadecf9d338a7f4b2955635fed2a78374af850ceee5d"; aarch64-linux = "eec581d162b494a7bcba4b0221f3beac9f359b48fb8612c83ce6ad7ac63094cd"; x86_64-linux = "2c032baff08b40f106dfcd86e7b63c6275f13e64d26b8c301af704563edf8600"; @@ -104,7 +104,7 @@ rec { headers = "1a9kb89iigwmahjwq14i74rr6gj21gmpc106pg0il73c50khaxpz"; }; - electron_17 = mkElectron "17.4.1" { + electron_17-bin = mkElectron "17.4.1" { armv7l-linux = "d1329468cb21039fb5b503fc813381f9be4d43422383b44f859b450be0e4200c"; aarch64-linux = "70d29bca5f884753341a11b0445ccf159c0f43dfae16eb60c53946582c3128b0"; x86_64-linux = "f9437a86947c418d92eabea14b268dcc4a5dde74cc6927530c1e9195e4aeddf8"; @@ -114,7 +114,7 @@ rec { headers = "064qnwv6gqn502r1cv7vi6ahvgyxcqq7mv0rmk2bxfpkr5x6hgmh"; }; - electron_18 = mkElectron "18.1.0" { + electron_18-bin = mkElectron "18.1.0" { armv7l-linux = "c2296f3f68938aab4cef07b747d2dd28973625b6717163b9c51fbcf1509fd8ff"; aarch64-linux = "13bd4998d0d86ccf4cb87d11f9581d5a6063b4585fc4828e130054527dfb9179"; x86_64-linux = "7f95069d58e6843e6ae2b8f02619d4dcef7db4c35bd6e90b903268d83b939fba"; @@ -124,7 +124,7 @@ rec { headers = "0gl30q2igr9c8sjlhyj5w57dm5navpkas5hnz9yl7sasbx66v10v"; }; - electron_19 = mkElectron "19.0.7" { + electron_19-bin = mkElectron "19.0.7" { armv7l-linux = "d6a6d2d7c0d658695783137d032a50f20843cdfe6582ef985451d741eef4dd32"; aarch64-linux = "58685d21bb92c2667d20063ab12aabc2e5c2518f3eda84e98a0fa2306456ce57"; x86_64-linux = "a4c20a068c54c238ae8c440ab8f46d39eda4168d6aa8cffcaae406800b539983"; @@ -133,7 +133,7 @@ rec { headers = "09dbx4qh0rgp5mdm6srz6fgx12zq6b9jqq1k6l3gzyvwigi3wny1"; }; - electron_20 = mkElectron "20.3.11" { + electron_20-bin = mkElectron "20.3.11" { armv7l-linux = "709b9eb958e9488f6375811041179556b9cd0b8fc1eab6b899ef4a89423f98b2"; aarch64-linux = "0f488ac9eeda2baa4c4e571fd75ac8e055dac9dcdf83051164232b1005a29224"; x86_64-linux = "7899bf391ae35e10d78a5da622e506dd4ae859cd8c18953cd2dc54f1a5e5225e"; @@ -142,7 +142,7 @@ rec { headers = "06s4z2hs9sbri4jsjrgybq0sn7rrx7zf3iwfg8da1wb6ahwqcd7w"; }; - electron_21 = mkElectron "21.4.0" { + electron_21-bin = mkElectron "21.4.0" { armv7l-linux = "20ed4fab8b2046e10c999592ea06cd6ef13bc5826bcd7e8874c6e5e3b3cdb5b7"; aarch64-linux = "5841060f67c23371f2739e043b51f56d04125fe781cc50e298590247477eacf2"; x86_64-linux = "1c0da48b2b9d1fb320577429298397d67d94fbf5864d6a4f3c6eeadee3114f2e"; @@ -151,7 +151,7 @@ rec { headers = "0zvwd3gz5y3yq5jgkswnarv75j05lfaz58w37fidq5aib1hi50hn"; }; - electron_22 = mkElectron "22.1.0" { + electron_22-bin = mkElectron "22.1.0" { armv7l-linux = "9bad02cd8e8604400eb90d9bd8fa58b6e400321cea8db7e774908611f4fca2a2"; aarch64-linux = "1d3e0011761f5ba05faf994a7f78cf518e49e0fef7e4528853e1bff9378d02cf"; x86_64-linux = "543e5fa7f2b602c3cd7e62a358441faf6f490e738de9b0bd796ad65d6bbd35ee"; @@ -160,7 +160,7 @@ rec { headers = "1vydsk4fxk5hlpcs0r1s21gdr1kvxip8qc88ncs5w7ybqg31hzsh"; }; - electron_23 = mkElectron "23.1.1" { + electron_23-bin = mkElectron "23.1.1" { armv7l-linux = "0f2db28e672021b3c03309155e36d94ec59c7541497847140d500fdec45baf09"; aarch64-linux = "5b5b6bf0a40d063e2a21e2868f3f97ce08a400690389355f2b68d606d4ae614f"; x86_64-linux = "4e820dc1ca957fbe9dbd168925ddf496b9b14c2001bbe5362159411a6bed0cea"; diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/binary/generic.nix similarity index 100% rename from pkgs/development/tools/electron/generic.nix rename to pkgs/development/tools/electron/binary/generic.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27359d4df425..7f46c24ecad7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17170,23 +17170,40 @@ with pkgs; aws-adfs = with python3Packages; toPythonApplication aws-adfs; - inherit (callPackages ../development/tools/electron { }) - electron - electron_9 - electron_10 - electron_11 - electron_12 - electron_13 - electron_14 - electron_15 - electron_16 - electron_17 - electron_18 - electron_19 - electron_20 - electron_21 - electron_22 - electron_23; + inherit (callPackages ../development/tools/electron/binary { }) + electron-bin + electron_9-bin + electron_10-bin + electron_11-bin + electron_12-bin + electron_13-bin + electron_14-bin + electron_15-bin + electron_16-bin + electron_17-bin + electron_18-bin + electron_19-bin + electron_20-bin + electron_21-bin + electron_22-bin + electron_23-bin; + + electron = electron-bin; + electron_9 = electron_9-bin; + electron_10 = electron_10-bin; + electron_11 = electron_11-bin; + electron_12 = electron_12-bin; + electron_13 = electron_13-bin; + electron_14 = electron_14-bin; + electron_15 = electron_15-bin; + electron_16 = electron_16-bin; + electron_17 = electron_17-bin; + electron_18 = electron_18-bin; + electron_19 = electron_19-bin; + electron_20 = electron_20-bin; + electron_21 = electron_21-bin; + electron_22 = electron_22-bin; + electron_23 = electron_23-bin; autobuild = callPackage ../development/tools/misc/autobuild { }; From 9d3aa1d2e9ef2eca6ea02880b3f5fa65faa84a2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Feb 2023 10:45:02 +0100 Subject: [PATCH 42/58] python310Packages.flask-sqlalchemy: 3.0.2 -> 3.0.3 Changelog: https://github.com/pallets-eco/flask-sqlalchemy/blob/3.0.3/CHANGES.rst --- pkgs/development/python-modules/flask-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 6b0ed16586bd..550d9adf416f 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,12 +1,12 @@ { lib , buildPythonPackage , fetchPypi -, pdm-pep517 , flask , mock -, sqlalchemy +, pdm-pep517 , pytestCheckHook , pythonOlder +, sqlalchemy }: buildPythonPackage rec { From 94a9f07625497bb1d1a2bf36d820bddbe2cc1a16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Feb 2023 10:50:07 +0100 Subject: [PATCH 43/58] python310Packages.flask-appbuilder: 4.1.3 -> 4.2.1, mark as broken --- .../flask-appbuilder/default.nix | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 8fbc0974972d..c9c4bbff7262 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , apispec , colorama , click @@ -27,7 +26,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.1.3"; + version = "4.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,23 +34,9 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-8NaTr0RcnsVik/AB4g8QL+FkcRlgkkASFe8fXIvFt/A="; + hash = "sha256-rZbu0Bif5pOa/zu6MCrbGJpkqUdYzWyVgp6tqRzGyIc="; }; - patches = [ - (fetchpatch { - # https://github.com/dpgaspar/Flask-AppBuilder/pull/1734 - name = "flask-appbuilder-wtf3.patch"; - url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch"; - hash = "sha256-24mlS3HIs77wKOlwdHah5oks31OOmCBHmcafZT2ITOc="; - excludes = [ - "requirements.txt" - "setup.py" - "examples/employees/app/views.py" - ]; - }) - ]; - propagatedBuildInputs = [ apispec colorama @@ -73,13 +58,13 @@ buildPythonPackage rec { pyjwt pyyaml sqlalchemy-utils - ]; + ] ++ apispec.optional-dependencies.yaml; postPatch = '' substituteInPlace setup.py \ - --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3" \ - --replace "Flask-WTF>=0.14.2, <1.0.0" "Flask-WTF" \ - --replace "WTForms<3.0.0" "WTForms" \ + --replace "apispec[yaml]>=3.3, <6" "apispec[yaml]" \ + --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \ + --replace "Flask-Babel>=1, <3" "Flask-Babel" \ --replace "marshmallow-sqlalchemy>=0.22.0, <0.27.0" "marshmallow-sqlalchemy" \ --replace "prison>=0.2.1, <1.0.0" "prison" ''; @@ -97,5 +82,7 @@ buildPythonPackage rec { changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; + # Support for flask-sqlalchemy >= 3.0 is missing, https://github.com/dpgaspar/Flask-AppBuilder/pull/1940 + broken = true; }; } From 45c2057059a8db33627c6e2c7e6720758454de19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 13:53:57 +0100 Subject: [PATCH 44/58] python310Packages.oci: update homepage and add changelog --- pkgs/development/python-modules/oci/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 3a8df43b31b8..e67c716bd37a 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -49,7 +49,8 @@ buildPythonPackage rec { meta = with lib; { description = "Oracle Cloud Infrastructure Python SDK"; - homepage = "https://oracle-cloud-infrastructure-python-sdk.readthedocs.io/"; + homepage = "https://github.com/oracle/oci-python-sdk"; + changelog = "https://github.com/oracle/oci-python-sdk/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 /* or */ upl ]; maintainers = with maintainers; [ ilian ]; }; From fc14705f97f6f42de392b3a61e5d4a6f9614d6e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 13:59:58 +0100 Subject: [PATCH 45/58] python310Packages.oci: 2.92.0 -> 2.93.0 Diff: https://github.com/oracle/oci-python-sdk/compare/refs/tags/v2.92.0...v2.93.0 Changelog: https://github.com/oracle/oci-python-sdk/blob/v2.93.0/CHANGELOG.rst --- .../python-modules/oci/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index e67c716bd37a..7b1232decd61 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -7,23 +7,33 @@ , pyopenssl , python-dateutil , pythonOlder +, pythonRelaxDepsHook , pytz }: buildPythonPackage rec { pname = "oci"; - version = "2.92.0"; + version = "2.93.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-evxY/1MhSCZOTjhH/2tI5amnZpd+fCdSdFBD4W9uZ+c="; + hash = "sha256-yH9SCrTASP+O9VLVs6tliteCOWi+Pc7nDOgiboHQE4s="; }; + pythonRelaxDeps = [ + "cryptography" + "pyOpenSSL" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ certifi circuitbreaker @@ -33,13 +43,6 @@ buildPythonPackage rec { pytz ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "configparser==4.0.2 ; python_version < '3'" "" \ - --replace "cryptography>=3.2.1,<=37.0.2" "cryptography" \ - --replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL" - ''; - # Tests fail: https://github.com/oracle/oci-python-sdk/issues/164 doCheck = false; From 18a5e5afdda6c97be90b47fca0b4144e27b48531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 27 Feb 2023 13:16:55 +0000 Subject: [PATCH 46/58] docopts: support darwin --- pkgs/development/tools/misc/docopts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix index 7a3202df40f3..1b7834318772 100644 --- a/pkgs/development/tools/misc/docopts/default.nix +++ b/pkgs/development/tools/misc/docopts/default.nix @@ -26,6 +26,6 @@ buildGoPackage rec { description = "docopt CLI tool for shell scripting"; license = licenses.mit; maintainers = [ maintainers.confus ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 4fa6026eaab69736d7bbcabc78ef41dbaed17e25 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 27 Feb 2023 12:10:34 +0100 Subject: [PATCH 47/58] copyq: set meta.mainProgram --- pkgs/applications/misc/copyq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 954d16ce3e73..a66b4cec245e 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. platforms = platforms.linux; + mainProgram = "copyq"; }; } From fab5be185cd4f9834090c10b505d53424028a369 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 15:37:45 +0100 Subject: [PATCH 48/58] python311Packages.pyairvisual: drop asynctest --- pkgs/development/python-modules/pyairvisual/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 228844f53021..9be744b74aa9 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , numpy @@ -23,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-xzTho4HsIU2YLURz9DfFfaRL3tsrtVi8n5IA2bRkyzw="; }; @@ -39,10 +38,10 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-aiohttp pytest-asyncio pytestCheckHook + pytestCheckHook ]; disabledTestPaths = [ From b8aa3ead714b36b0eefc9290776fd1035c3122d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 15:45:01 +0100 Subject: [PATCH 49/58] trufflehog: 3.28.0 -> 3.28.1 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.28.0...3.28.1 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.28.1 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 530b9ac2ec45..35166f50ffb4 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.28.0"; + version = "3.28.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-qag8e7m4mfHmaeMg//sAZpiHTIoXt1vQMKv5PdtvvKc="; + hash = "sha256-sLADYTjC2jXhKkZbq1ft61SDLjY6xpQjwlhS3XkitBo="; }; - vendorHash = "sha256-CVCAP2JMfLN23Sgf2d+CSK4uetomWzPUX0BRmutW7pI="; + vendorHash = "sha256-+N/aF/aDufOzejpsd49EtkAJGqPZd666KHL0khmS+OA="; # Test cases run git clone and require network access doCheck = false; From 529946c468c3f34c050fd5805abe42d5792160c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 15:45:05 +0100 Subject: [PATCH 50/58] python310Packages.peaqevcore: 12.2.0 -> 12.2.1 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 43a8ca617848..3333331e85f6 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "12.2.0"; + version = "12.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C7LF3mJwmu6mBA0Od2L1P0RxJWckC74irNuRkE9kxfY="; + hash = "sha256-WOuKGVrNZzvY7F0Mvj3MjSdTu47c5Y11ySe1qorzlWE="; }; postPatch = '' From 64b341c997ceedd314bd16692b20ac5d1e0e636c Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Mon, 27 Feb 2023 15:34:17 +0100 Subject: [PATCH 51/58] ferretdb: 0.9.1->0.9.2 --- pkgs/servers/nosql/ferretdb/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index c89d3f789e15..2b7431ba9d28 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - sha256 = "sha256-iqoz7axU5U6MdRl8I2vS3Nh37XZZPI4bRb3oFxpQs6M="; + sha256 = "sha256-lJlj5GNgrllcaEednxVCmMPHG2aU4z3mKkm9t0cO5Tk="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorSha256 = "sha256-qtxR1vk/EZZmCRP1Z+EFObfMbQXKiRaSiI1Dsv268b8="; + vendorSha256 = "sha256-I5ucq3K0lRsokG9lahmBUH9mIYa5tgHnL+vxKSzW1hw="; CGO_ENABLED = 0; @@ -31,6 +31,6 @@ buildGoModule rec { description = "A truly Open Source MongoDB alternative"; homepage = "https://www.ferretdb.io/"; license = licenses.asl20; - maintainers = with maintainers; [ dit7ya noisersup ]; + maintainers = with maintainers; [ dit7ya noisersup julienmalka ]; }; } From 869e91ec782d5192b1d472981a0c19a305af43a1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 27 Feb 2023 09:05:57 -0300 Subject: [PATCH 52/58] awscli2: 2.10.1 -> 2.10.3 Release: https://github.com/aws/aws-cli/releases/tag/2.10.3 --- pkgs/tools/admin/awscli2/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index f42f0fe7a252..420149b51f96 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -25,16 +25,22 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.10.1"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.10.3"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-omg4WNX/DegN6xjHBBGwEijqtvd/b9VfcCC71KfXq98="; + hash = "sha256-ogwJTsd2xrWp54utcyG1QO7hGxBC6S4hVlmmGESyPBQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "distro>=1.5.0,<1.6.0" "distro>=1.5.0" \ + --replace "cryptography>=3.3.2,<38.0.5" "cryptography>=3.3.2" + ''; + nativeBuildInputs = [ flit-core ]; @@ -63,10 +69,6 @@ with py.pkgs; buildPythonApplication rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml --replace "distro>=1.5.0,<1.6.0" "distro>=1.5.0" - ''; - postInstall = '' mkdir -p $out/${python3.sitePackages}/awscli/data ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index From 2378d1a21466f58e85a0394fef54bfa5a93e7711 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 27 Feb 2023 17:04:48 +0100 Subject: [PATCH 53/58] nixos/klipper: fix assert message to match actual assertion This error was introduced in 849c40b5f5071617db0c7bbaa1d3438dd616420d. --- nixos/modules/services/misc/klipper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index a2158e9461bc..9f8539980aaa 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -135,7 +135,7 @@ in } { assertion = (cfg.configFile != null) != (cfg.settings != null); - message = "You need to either specify services.klipper.settings or services.klipper.defaultConfig."; + message = "You need to either specify services.klipper.settings or services.klipper.configFile."; } ]; From ff7dfcba57fd60c53c333285012f78fd48da6920 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Mon, 27 Feb 2023 16:49:27 +0100 Subject: [PATCH 54/58] nixos/opensearch: fix opensearch startup --- nixos/modules/services/search/opensearch.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix index df699b56747e..9a50e7963138 100644 --- a/nixos/modules/services/search/opensearch.nix +++ b/nixos/modules/services/search/opensearch.nix @@ -199,12 +199,16 @@ in # java.security.AccessControlException: # access denied ("java.io.FilePermission" "/var/lib/opensearch/config/opensearch.yml" "read") + rm -f ${configDir}/opensearch.yml cp ${opensearchYml} ${configDir}/opensearch.yml # Make sure the logging configuration for old OpenSearch versions is removed: rm -f "${configDir}/logging.yml" + rm -f ${configDir}/${loggingConfigFilename} cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename} mkdir -p ${configDir}/scripts + + rm -f ${configDir}/jvm.options cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options # redirect jvm logs to the data directory From b4c4419b05700f5a0af8a9d603f293404d75854e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Feb 2023 17:25:14 -0800 Subject: [PATCH 55/58] libwacom-surface: init at 2.4.0 --- .../libraries/libwacom/surface.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/libwacom/surface.nix diff --git a/pkgs/development/libraries/libwacom/surface.nix b/pkgs/development/libraries/libwacom/surface.nix new file mode 100644 index 000000000000..6168686cf50b --- /dev/null +++ b/pkgs/development/libraries/libwacom/surface.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, libwacom +}: + +let + libwacom-surface = fetchFromGitHub { + owner = "linux-surface"; + repo = "libwacom-surface"; + rev = "v2.6.0-1"; + hash = "sha256-4UOO9LMyCJd4LkqU0uva/0Xc44fIVdIQi27tJOtNEFk="; + }; +in libwacom.overrideAttrs (old: { + pname = "libwacom-surface"; + + # These patches will not be included upstream: + # https://github.com/linux-surface/libwacom/issues/2 + patches = old.patches or [ ] ++ map (p: "${libwacom-surface}/patches/v2/${p}") [ + "0001-Add-support-for-BUS_VIRTUAL.patch" + "0002-Add-support-for-Intel-Management-Engine-bus.patch" + "0003-data-Add-Microsoft-Surface-Pro-3.patch" + "0004-data-Add-Microsoft-Surface-Pro-4.patch" + "0005-data-Add-Microsoft-Surface-Pro-5.patch" + "0006-data-Add-Microsoft-Surface-Pro-6.patch" + "0007-data-Add-Microsoft-Surface-Pro-7.patch" + "0008-data-Add-Microsoft-Surface-Book.patch" + "0009-data-Add-Microsoft-Surface-Book-2-13.5.patch" + "0010-data-Add-Microsoft-Surface-Book-2-15.patch" + "0011-data-Add-Microsoft-Surface-Book-3-13.5.patch" + "0012-data-Add-Microsoft-Surface-Book-3-15.patch" + ]; + + meta = old.meta // { + homepage = "https://github.com/linux-surface/libwacom-surface"; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4e5b5b91761..150f50889ce0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22125,6 +22125,8 @@ with pkgs; libwacom = callPackage ../development/libraries/libwacom { }; + libwacom-surface = callPackage ../development/libraries/libwacom/surface.nix { }; + lightning = callPackage ../development/libraries/lightning { }; lightlocker = callPackage ../misc/screensavers/light-locker { }; From 2cbded08a287aab6721479772604fd2146606290 Mon Sep 17 00:00:00 2001 From: Dacio Date: Mon, 27 Feb 2023 08:44:42 -0800 Subject: [PATCH 56/58] wezterm: add vulkan-loader to library path (#218410) * wezterm: add vulkan-loader to library path * wezterm: switch to patchelf instead of wrapProgram --- pkgs/applications/terminal-emulators/wezterm/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 74de8d070750..15a605a32846 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -27,6 +27,7 @@ , UserNotifications , nixosTests , runCommand +, vulkan-loader }: rustPlatform.buildRustPackage rec { @@ -106,7 +107,10 @@ rustPlatform.buildRustPackage rec { ''; preFixup = lib.optionalString stdenv.isLinux '' - patchelf --add-needed "${libGL}/lib/libEGL.so.1" $out/bin/wezterm-gui + patchelf \ + --add-needed "${libGL}/lib/libEGL.so.1" \ + --add-needed "${vulkan-loader}/lib/libvulkan.so.1" \ + $out/bin/wezterm-gui '' + lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" OUT_APP="$out/Applications/WezTerm.app" From 7b6e7dd796f8fe17f673b7434e9366f2f7dbd67e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 27 Feb 2023 18:03:46 +0100 Subject: [PATCH 57/58] electron-bin: move print-hashes.sh script --- pkgs/development/tools/electron/{ => binary}/print-hashes.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/development/tools/electron/{ => binary}/print-hashes.sh (100%) diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/binary/print-hashes.sh similarity index 100% rename from pkgs/development/tools/electron/print-hashes.sh rename to pkgs/development/tools/electron/binary/print-hashes.sh From a12ccf900be540e6c2216f50628b377cd074e9b8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 12 Feb 2023 22:22:49 +0000 Subject: [PATCH 58/58] python3.pkgs.wordcloud: 1.8.1 -> unstable-2023-01-04 Adds support for Python 3.11, which hasn't made it into a release yet. --- .../python-modules/wordcloud/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index 08ae8cfc3477..9886f2db1cb4 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "wordcloud"; - version = "1.8.1"; + version = "unstable-2023-01-04"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "amueller"; - repo = pname; - rev = version; - hash = "sha256-4EFQfv+Jn9EngUAyDoJP0yv9zr9Tnbrdwq1YzDacB9Q="; + repo = "word_cloud"; + rev = "dbf7ab7753a36e1c12c0e1b36aeeece5023f39f9"; + hash = "sha256-ogSkVcPUth7bh7mxwdDmF/Fc2ySDxbLA8ArmBNnPvw8="; }; nativeBuildInputs = [ @@ -40,14 +40,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - (fetchpatch { - # https://github.com/amueller/word_cloud/pull/616 - url = "https://github.com/amueller/word_cloud/commit/858a8ac4b5b08494c1d25d9e0b35dd995151a1e5.patch"; - sha256 = "sha256-+aDTMPtOibVwjPrRLxel0y4JFD5ERB2bmJi4zRf/asg="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace " --cov --cov-report xml --tb=short" ""