From ca2c7e00e8f486a80542e3e9d89dd71d85b140ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 23:24:12 +0000 Subject: [PATCH 01/85] miniupnpd: 2.3.4 -> 2.3.5 --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index dabf5194f881..1c3cb3f0e592 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "miniupnpd"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "https://miniupnp.tuxfamily.org/files/miniupnpd-${version}.tar.gz"; - sha256 = "sha256-5zAzSPyKxCfefwTw7rdX1J3Mg2cxHuJYJVLDj11toIo="; + sha256 = "sha256-ljekEsM9J3jNrlYQWJM7TgtnRl/xNOlnYaexl1Gy+g8="; }; buildInputs = [ iptables-legacy libuuid openssl ] From 8c43108d4449a27b5bbc5f8b695b08d3d0b33a4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Mar 2024 03:14:42 +0000 Subject: [PATCH 02/85] doomretro: 5.2.1 -> 5.3 --- pkgs/games/doom-ports/doomretro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/games/doom-ports/doomretro/default.nix index 5ff5b502f653..f2bfd656ff2c 100644 --- a/pkgs/games/doom-ports/doomretro/default.nix +++ b/pkgs/games/doom-ports/doomretro/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "5.2.1"; + version = "5.3"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-jM7SNZ8VsF0caB2Q2qOX8W6SuFxyZWpCo3+jD53R3qU="; + hash = "sha256-LCCBtsDEyjzsPS5ADPzsup714p84MO65FQDVjAHhSts="; }; nativeBuildInputs = [ From 6ed0cca1b99aa3176e7bc24537ec305e53ca7ccc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 12:27:27 +0000 Subject: [PATCH 03/85] tboot: 1.11.1 -> 1.11.2 --- pkgs/tools/security/tboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index e88c8e9aa742..62f6b7823e83 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tboot"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz"; - sha256 = "sha256-1sPCbF/e5tWOEfBHM67lnK/QFyHRFZjRjAKxXAfw6nc="; + sha256 = "sha256-faTdvjjTFXZEoHeVQ1HMTfU+215yruiliFQcQbc/1VA="; }; buildInputs = [ openssl trousers zlib ]; From 6d08d61a655c2f0d5a6ebdac7f2a7fbedb1b1c03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 00:22:24 +0000 Subject: [PATCH 04/85] liblouis: 3.28.0 -> 3.29.0 --- pkgs/development/libraries/liblouis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 6f22edae4f3d..a5c0bf92751f 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblouis"; - version = "3.28.0"; + version = "3.29.0"; outputs = [ "out" "dev" "info" "doc" ] # configure: WARNING: cannot generate manual pages while cross compiling @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "liblouis"; repo = "liblouis"; rev = "v${finalAttrs.version}"; - hash = "sha256-PvGlhsnAxQctcODiK628BDdzYaWUIF/F3dN2g//Gywg="; + hash = "sha256-TaMPl53FlUSZIsjhoTYcv3Y+j86fDHuBTjiyr/uP1tM="; }; strictDeps = true; From 05ba7a6c72296533f10298de8c0e8f2463b29b58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 01:08:41 +0000 Subject: [PATCH 05/85] kubectl-gadget: 0.25.1 -> 0.26.0 --- .../networking/cluster/kubectl-gadget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index d4545cfe990c..9dbee8d0a544 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-RbLc8c2F2Jy9jHwcd1FgqxhC5cl82oOauo/hsZ5zaG0="; + hash = "sha256-G2FvKnO+YuLlRlzfB1YMRhCHWa6v4sMFLyDqp12bzn4="; }; - vendorHash = "sha256-/1dDAcICf7+g8hxaIAUsUwR9FNqatMhgAsvXrOuvGyk="; + vendorHash = "sha256-IrSx1iCOd95CWyLo6WuEtTFm6p62se/t8dcBmH5eOP4="; CGO_ENABLED = 0; From 96eeaa30e99c2c0786299efeef978f168324b464 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 02:39:48 +0000 Subject: [PATCH 06/85] tar2ext4: 0.11.4 -> 0.12.0 --- pkgs/tools/filesystems/tar2ext4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index 81df5e64d9f3..3f042646841d 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-bu1uLJmFSetTv1R3qyCtZxba+wxjDDSkEpBwKNZ/meM="; + sha256 = "sha256-Zpcv3sSO1iQGgoy6PYfhf165BgGi2mkS9s+y8Ewhxa8="; }; sourceRoot = "${src.name}/cmd/tar2ext4"; From 957471018a18ec187e52acd4ef16d41fff035ef0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 08:19:41 +0000 Subject: [PATCH 07/85] rivalcfg: 4.11.0 -> 4.12.0 --- pkgs/misc/rivalcfg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/rivalcfg/default.nix b/pkgs/misc/rivalcfg/default.nix index f0a1d05d5f1c..7cfc23ffc367 100644 --- a/pkgs/misc/rivalcfg/default.nix +++ b/pkgs/misc/rivalcfg/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "rivalcfg"; - version = "4.11.0"; + version = "4.12.0"; src = fetchFromGitHub { owner = "flozz"; repo = "rivalcfg"; rev = "refs/tags/v${version}"; - sha256 = "sha256-6hgGb2BlXbnJ6uHbk8EUqrS/G1y65jTcw0zVCKt5+3k="; + sha256 = "sha256-fkZvEaJJIfzyVyXhlb7Jlv5dASNKyclDIlyXU0uu5wo="; }; propagatedBuildInputs = with python3Packages; [ hidapi setuptools ]; From dd8b266521cec9d01fec1cd6b0c648f53427dd10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 17:56:13 +0000 Subject: [PATCH 08/85] unpoller: 2.9.5 -> 2.10.0 --- pkgs/servers/monitoring/unpoller/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index 952f3190546d..c2e0f6c9f7ed 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.9.5"; + version = "2.10.0"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-hNDRzQGTS3sAdt/0ZdJV5zRpSdrBHGLDZJ62X+kFg7M="; + hash = "sha256-aJbK1Fhlfm0CrI1O7sWh1xjk+OR8gLa1goSnQ4wfrI0="; }; - vendorHash = "sha256-+fXNfDGzZy43WjQrvK2enOWtSv2qN3Zo+O+9Bn+KO1s="; + vendorHash = "sha256-iOfjjRjN07iD+B7GjWKbmQu/xNm5wjFQOTA4jBxMh/E="; ldflags = [ "-w" "-s" From bca104b0e57f59f293fc924e60d1adc4105f0ad6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 02:40:21 +0000 Subject: [PATCH 09/85] java-service-wrapper: 3.5.54 -> 3.5.56 --- pkgs/tools/system/java-service-wrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 955c0fe62a7a..9578941ef9a1 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.54"; + version = "3.5.56"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - hash = "sha256-t16i1WqvDqr4J5sDldeUk6+DAyN/6oWGV6eME5yj+i4="; + hash = "sha256-zZfJP/uf78D/6G51Km1bNRRIv5i8x69Xw+imho4/ZpQ="; }; strictDeps = true; From 5d79313cc735fdbd8d9ca4cc9a9402e04ac2a5d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Mar 2024 00:02:48 +0000 Subject: [PATCH 10/85] json-fortran: 8.3.0 -> 8.4.0 --- pkgs/development/libraries/json-fortran/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/json-fortran/default.nix b/pkgs/development/libraries/json-fortran/default.nix index 422248520fc4..410a767f9991 100644 --- a/pkgs/development/libraries/json-fortran/default.nix +++ b/pkgs/development/libraries/json-fortran/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "json-fortran"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "jacobwilliams"; repo = pname; rev = version; - hash = "sha256-96W9bzWEZ3EN4wtnDT3G3pvLdcI4SIhGJWBVPU3rNZ4="; + hash = "sha256-qy3CK8Op3YVNpXjq60UYq9V9qWBEXpX/li/lYxXW9Fk="; }; nativeBuildInputs = [ From 2ca352c59214ea765ddb79c35d6cf2c2ffde97d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Mar 2024 17:44:40 +0000 Subject: [PATCH 11/85] cloudlog: 2.6.5 -> 2.6.6 --- pkgs/applications/radio/cloudlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 31bcea6d588d..7d4df1d0e9bb 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.5"; + version = "2.6.6"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-RxA0joF+hqIL+eElVVwG0kxvzxkt3YsFaomf9GIHtCw="; + hash = "sha256-wq7CCf+IJ7BpbLwXBemDrsqXy2dHITubQKNR2bUfqW0="; }; postPatch = '' From 6cc231f5e326e3713cf47e7eb46a95215c683f83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Mar 2024 22:29:50 +0000 Subject: [PATCH 12/85] mmc-utils: unstable-2023-10-10 -> unstable-2024-03-07 --- pkgs/os-specific/linux/mmc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 0fea46da56d2..5817a4b6a2d5 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2023-10-10"; + version = "unstable-2024-03-07"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "b5ca140312d279ad2f22068fd72a6230eea13436"; - sha256 = "QU4r8eajrrhT6u6WHEf1xtB1iyecBeHxu4vS+QcwAgM="; + passthru.rev = "e1281d4de9166b7254ba30bb58f9191fc2c9e7fb"; + sha256 = "/lkcZ/ArdBAStV9usavrbfjULXenqb+h2rbDJzxZjJk="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; From b78c76fbad6762911e8707ade1155e7f22ac04ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 00:15:51 +0000 Subject: [PATCH 13/85] jfsw: 20211225 -> 20240303 --- pkgs/games/jfsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/jfsw/default.nix b/pkgs/games/jfsw/default.nix index e170f0024531..9b631551b579 100644 --- a/pkgs/games/jfsw/default.nix +++ b/pkgs/games/jfsw/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "jfsw"; - version = "20211225"; + version = "20240303"; src = fetchFromGitHub { owner = "jonof"; repo = "jfsw"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-oRJHVsVo+KQfJyd8TcPxTMPPi993qxQb0wnD9nR4vJY="; + hash = "sha256-bOUgRa9zWufTFEj5huXAKeRerV8PqfqQVDoVUvRrj2I="; }; nativeBuildInputs = [ From c06519879b5aa5a565afb1b04a3291bf33ac8c2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 00:16:08 +0000 Subject: [PATCH 14/85] glab: 1.36.0 -> 1.37.0 --- pkgs/applications/version-management/glab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index c44eb1706a88..b6c49f47dc56 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-BS5v+R3DqkLLNZScr2PutMMrLZCI4tUK9HDN/viFYMU="; + hash = "sha256-H1yYjI7ct/YO44czX5J0cHc/YbhxtXJQThJcARyUEq0="; }; - vendorHash = "sha256-x96ChhozvTrX0eBWt3peX8dpd4gyukJ28RkqcD2W/OM="; + vendorHash = "sha256-4CQ4NPHAs736LQxDxvKWEH9TQvIKAouJ6zVReAoZTec="; ldflags = [ "-s" From 44bfd5263843016da33758ec3eef15e987ba728b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 14:17:48 +0000 Subject: [PATCH 15/85] media-downloader: 4.3.1 -> 4.4.0 --- pkgs/applications/video/media-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index b0a40aaa8a34..8a9f287c0c21 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-+vPGfPncb8f5c9OiBmpMvvDh3X6ZMHPbyngcDfrP9qQ="; + hash = "sha256-/W0SkKe9rcwf8HBIEcdJCPdZEnx9eh+twBu9wa6Sq30="; }; nativeBuildInputs = [ From 645c0b4b6694c83af5812da21790b1e87a0f29f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 16:01:00 +0000 Subject: [PATCH 16/85] phosh-mobile-settings: 0.36.0 -> 0.37.0 --- .../window-managers/phosh/phosh-mobile-settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 71d051159de1..a988e1369ce7 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.36.0"; + version = "0.37.0"; src = fetchurl { # This tarball includes the meson wrapped subproject 'gmobile'. url = "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-rktrEBRjOUWGb0Qfcyr03dSxpU2XnC0xHb07x8qc9JU="; + hash = "sha256-HW3wM/lb8pvr+eDoeqa0iHXiKhBQ8ybBIy0wwHPsrOg="; }; nativeBuildInputs = [ From 57e0eafb5e7b50392d0356b87a2e62b6bb7f1910 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Mar 2024 12:12:53 +0000 Subject: [PATCH 17/85] libspelling: 0.2.0 -> 0.2.1 --- pkgs/development/libraries/libspelling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libspelling/default.nix b/pkgs/development/libraries/libspelling/default.nix index 812dddcc4a17..874e9eff22c4 100644 --- a/pkgs/development/libraries/libspelling/default.nix +++ b/pkgs/development/libraries/libspelling/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libspelling"; - version = "0.2.0"; + version = "0.2.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "chergert"; repo = "libspelling"; rev = version; - hash = "sha256-OOSQgdtnEx6/5yKwavCGdY/5L0Mr3XW0Srmd42ZTdUk="; + hash = "sha256-0OGcwPGWtYYf0XmvzXEaQgebBOW/6JWcDuF4MlQjCZQ="; }; nativeBuildInputs = [ From cb7c67bfc8c28ea29d7b81d9b3e017892fbcf8d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 00:42:08 +0000 Subject: [PATCH 18/85] isolate: 1.10.1 -> 2.0 --- pkgs/tools/security/isolate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/isolate/default.nix b/pkgs/tools/security/isolate/default.nix index 4aa592029600..abc491d95c70 100644 --- a/pkgs/tools/security/isolate/default.nix +++ b/pkgs/tools/security/isolate/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "isolate"; - version = "1.10.1"; + version = "2.0"; src = fetchFromGitHub { owner = "ioi"; repo = "isolate"; rev = "v${version}"; - hash = "sha256-xY2omzqIJYElLtzj4byy/QG4pW4erCxc+cD2X9nA2jM="; + hash = "sha256-kKXkXPVB9ojyIERvEdkHkXC//Agin8FPcpTBmTxh/ZE="; }; nativeBuildInputs = [ From a312b41117930031b659bdf12c4f3f4120952656 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 10:06:54 +0000 Subject: [PATCH 19/85] deeptools: 3.5.4 -> 3.5.5 --- pkgs/applications/science/biology/deeptools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/applications/science/biology/deeptools/default.nix index a7a1f77dfe90..2abd0825e6e3 100644 --- a/pkgs/applications/science/biology/deeptools/default.nix +++ b/pkgs/applications/science/biology/deeptools/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "deeptools"; - version = "3.5.4"; + version = "3.5.5"; pyproject = true; src = fetchFromGitHub { owner = "deeptools"; repo = "deepTools"; - rev = version; - hash = "sha256-A8YdlMptmJyxWW0EYLjXFIWjIO/mttEC7VYdlCe9MaI="; + rev = "refs/tags/${version}"; + hash = "sha256-2kSlL7Y5f/FjVtStnmz+GlTw2oymrtxOCaXlqgbQ7FU="; }; nativeBuildInputs = with python3.pkgs; [ From a6d61a96676d1b4ca2ba9edcb8c8dda4b4662fbd Mon Sep 17 00:00:00 2001 From: Simon Hollingshead Date: Sun, 10 Mar 2024 04:01:50 +0000 Subject: [PATCH 20/85] bcache-tools: 1.0.7 -> 1.0.8 https://github.com/g2p/bcache-tools/compare/v1.0.7...v1.0.8 --- .../bcache-tools/bcache-udev-modern.patch | 30 +++++++------------ .../filesystems/bcache-tools/default.nix | 4 +-- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch b/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch index c6cf79785b73..bdf78dcc3cd4 100644 --- a/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch +++ b/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch @@ -1,15 +1,15 @@ This patch does two things: -1) Drops probe-bcache, so now new util-linux detecting functionality is used. -2) Drops bcache-register, using kmod (built in udev) and moving registering device - into rule using 'sh'. -This reduces things that need to be present in initrd, replacing them with already -existing functionality and reducing overall initrd size. +1) Drops probe-bcache, so now util-linux detecting functionality is used. +2) Drops bcache-register, moving registering device functionality into rule + using 'sh'. +This reduces things that need to be present in initrd, replacing them with +already existing functionality and reducing overall initrd size. diff --git a/69-bcache.rules b/69-bcache.rules -index 5d28e70..6a52893 100644 +index 9cc7f0d..6a52893 100644 --- a/69-bcache.rules +++ b/69-bcache.rules -@@ -10,15 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end" +@@ -10,16 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end" # It recognised bcache (util-linux 2.24+) ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found" # It recognised something else; bail @@ -22,31 +22,21 @@ index 5d28e70..6a52893 100644 +GOTO="bcache_backing_end" LABEL="bcache_backing_found" + RUN{builtin}+="kmod load bcache" -RUN+="bcache-register $tempnode" -+RUN{builtin}+="kmod load bcache" +RUN+="/bin/sh -c 'echo $tempnode > /sys/fs/bcache/register_quiet'" LABEL="bcache_backing_end" # Cached devices: symlink diff --git a/Makefile b/Makefile -index 3f8d87b..15638a7 100644 +index c824ae3..c5f7309 100644 --- a/Makefile +++ b/Makefile -@@ -9,7 +9,7 @@ all: make-bcache probe-bcache bcache-super-show +@@ -9,7 +9,6 @@ all: make-bcache probe-bcache bcache-super-show bcache-register install: make-bcache probe-bcache bcache-super-show $(INSTALL) -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/ - $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/ -+# $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/ $(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/ $(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/ $(INSTALL) -D -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache -diff --git a/bcache-register b/bcache-register -index 9b592bc..75b4faf 100755 ---- a/bcache-register -+++ b/bcache-register -@@ -1,4 +1,3 @@ - #!/bin/sh --/sbin/modprobe -qba bcache - test -f /sys/fs/bcache/register_quiet && echo "$1" > /sys/fs/bcache/register_quiet - diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 58f6a05992e9..9cd8199005b9 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bcache-tools"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "g2p"; repo = "bcache-tools"; rev = "v${version}"; - hash = "sha256-Ors2xXRrVTf8Cq3BYnSVSfJy/nyGjT5BGLSNpxOcHR4="; + hash = "sha256-6gy0ymecMgEHXbwp/nXHlrUEeDFnmFXWZZPlzP292g4="; }; nativeBuildInputs = [ pkg-config ]; From a63d891dcda2c81acfef03aedbf17a521c9c5449 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Mar 2024 00:29:49 +0000 Subject: [PATCH 21/85] wgetpaste: 2.33 -> 2.34 --- pkgs/tools/text/wgetpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 9a60b991a7f9..465e19883b30 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wgetpaste"; - version = "2.33"; + version = "2.34"; src = fetchurl { url = "https://github.com/zlin/wgetpaste/releases/download/${version}/wgetpaste-${version}.tar.xz"; - sha256 = "sha256-6TWdhKOmO7vRKGIVNcUwLy46heI6UiAOgej6ubd+lxs="; + sha256 = "sha256-vW0G7ZAaPWPJyMVxJghP8JlPCZAb+xY4uHlT6sHpQz8="; }; # currently zsh-autocompletion support is not installed From c43e14016368d508ea4b300c599739ff9af29f10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Mar 2024 10:24:55 +0000 Subject: [PATCH 22/85] readarr: 0.3.19.2437 -> 0.3.20.2452 --- pkgs/servers/readarr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 2c80eb30e458..3f29cc8d7f23 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-uNZQizvOPygP+LVyBAGshBcfjC4rrX9mGtaqv8pBWKA="; - arm64-linux_hash = "sha256-6wXqUZ1D3E3LB+FlJDhQ0XVawHYQ2QtiAYOeJKZv/ek="; - x64-osx_hash = "sha256-JowEooaANOaMTlQCGuXwSp87EdULjbGmY+1RBfddcng="; + x64-linux_hash = "sha256-4kCDbmq47wb7OuE5JzHPZ/mM9w6wcupFblJieu5dFxc="; + arm64-linux_hash = "sha256-Val9dEB4E3dnfeXT2ERwE+VoITSXeA7Lc51dyz1jJyQ="; + x64-osx_hash = "sha256-LvjAeftlNw5F6YFyhKLW9Fv9UIk6AgnGnxOu6ctmQNg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.19.2437"; + version = "0.3.20.2452"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; From 6232015d7ae0133ccb8d9749acaac9880d892977 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 01:18:00 +0000 Subject: [PATCH 23/85] nats-server: 2.10.11 -> 2.10.12 --- pkgs/servers/nats-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index ae556728d3b3..a1014b44ab66 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.11"; + version = "2.10.12"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-fRbjAqu1tFLUUk7aeIkEifcWkDUhNCbVZ957b2ntD+o="; + hash = "sha256-T0rwSa1xTPUZHkFDu9hnD2Kk1ME/vMUa4iK+Zbic6PM="; }; - vendorHash = "sha256-lVCWTZvzLkYl+o+EUQ0kzIhgl9C236w9i3RRA5o+IAw="; + vendorHash = "sha256-pSjtUSbJPclsd30KLhLOkN4u6pSn307s3RohroxmExc="; doCheck = false; From d5346f1f1f183b6858e1fbcfa999780df19b18a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 15:22:12 +0000 Subject: [PATCH 24/85] rqlite: 8.22.1 -> 8.23.0 --- pkgs/servers/sql/rqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index d8bcadbb9df9..3f06ae1e43da 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.22.1"; + version = "8.23.0"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g5W+rHD4gUS82E+wFLQ3VTSwIWQUogwTutwPTtf+IdM="; + sha256 = "sha256-n4ALjayvcOR+VcpKPRh6WswAEEdlYyxhYyfPRje98Rs="; }; - vendorHash = "sha256-onR4n6ok6y9APRwGjBoMISbidGDVw19D48TkogRp1uM="; + vendorHash = "sha256-UYO5asCX+KpESAT1ws7O91QaOJ8zPbd06JzHexBiWj0="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; From 8a4808e9d981a928520d2bbfe263acc0075b9e75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 17:35:51 +0000 Subject: [PATCH 25/85] snyk: 1.1281.0 -> 1.1284.0 --- pkgs/development/tools/analysis/snyk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index 4eacb2b476f5..1078df45ae9a 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "snyk"; - version = "1.1281.0"; + version = "1.1284.0"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "v${version}"; - hash = "sha256-QxmYArH9HRq2vkGzfhWlCPLS++UiwdzAStUQxhGF85Q="; + hash = "sha256-CM9172gSeWf+12e6tsro6O1NtiZqUAT0EsA6LAhZ+8s="; }; - npmDepsHash = "sha256-JxX4r1I/F3PEzg9rLfFNEIa4Q8jwuUWC6krH1oSoc8s="; + npmDepsHash = "sha256-aode80HyGSyZoEiCdsnEPrVo8KSqTW0GxxsGdRyNdiQ="; postPatch = '' substituteInPlace package.json --replace '"version": "1.0.0-monorepo"' '"version": "${version}"' From 717a342253000d1d9bd6ce0458ae6d9ee9751f1b Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:40:46 -0300 Subject: [PATCH 26/85] k3s: fix update script for 1.26, 1.27 versions Fixes previous code not listing all tag versions and failing to pick the latest version. --- pkgs/applications/networking/cluster/k3s/update-script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index dc41d7325b6c..19b0a6d9309e 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -25,8 +25,8 @@ LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \ K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') K3S_COMMIT=$(curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - https://api.github.com/repos/k3s-io/k3s/tags \ - | jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") + https://api.github.com/repos/k3s-io/k3s/git/refs/tags \ + | jq -r "map(select(.ref == \"refs/tags/${LATEST_TAG_NAME}\")) | .[0] | .object.sha") K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz) From 551ef9c87b5cf04c7b52fd1a2b912cdeb1aff3e0 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:42:06 -0300 Subject: [PATCH 27/85] k3s: pin go version to k3s go.mod - Go 1.20 is being removed. #295077 - K3s should use go compiler version from go.mod file for each version. --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f643b2a0946..f81cb037f6a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32547,10 +32547,8 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; inherit (callPackage ../applications/networking/cluster/k3s { - buildGoModule = buildGo120Module; - }) k3s_1_26 k3s_1_27 k3s_1_28; - inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_29; - + buildGoModule = buildGo121Module; + }) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29; k3s = k3s_1_29; k3sup = callPackage ../applications/networking/cluster/k3sup { }; From eb170ecf6ee535402a76c4d58f6a9d509ed2e62f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 15 Mar 2024 11:02:19 -0300 Subject: [PATCH 28/85] k3s: remove restriction on runtime checking of golang version --- .../applications/networking/cluster/k3s/builder.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 2173748cd2df..01659d9236c8 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -187,13 +187,12 @@ let patches = # Disable: Add runtime checking of golang version - lib.optional (lib.versionAtLeast k3sVersion "1.28") - (fetchpatch { - # https://github.com/k3s-io/k3s/pull/9054 - url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch"; - hash = "sha256-xBOY2jnLhT9dtVKtq26V9QUnuX1q6E/9UcO9IaU719U="; - revert = true; - }); + (fetchpatch { + # https://github.com/k3s-io/k3s/pull/9054 + url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch"; + hash = "sha256-xBOY2jnLhT9dtVKtq26V9QUnuX1q6E/9UcO9IaU719U="; + revert = true; + }); nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp sqlite.dev ]; From 29a874f92dd44581d91dd0a576d170d540b3a829 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:42:32 -0300 Subject: [PATCH 29/85] k3s_1_26: 1.26.9+k3s1 -> 1.26.14+k3s1 Release: https://github.com/k3s-io/k3s/tree/v1.26.14%2Bk3s1 --- .../cluster/k3s/1_26/chart-versions.nix | 8 ++++---- .../networking/cluster/k3s/1_26/versions.nix | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix index d3ff99358af2..1acca4d0e101 100644 --- a/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-21.2.1+up21.2.0.tgz"; - sha256 = "05j3vyikb7g2z2i07rij9h4ki5lb2hb2rynpiqfd4l1y5qm0qhw9"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; + sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-21.2.1+up21.2.0.tgz"; - sha256 = "0gvz0yzph2893scd0q10b938yc7f36b3zqs57pkjgqqpl1d0nwhg"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; + sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/versions.nix index 5bbfbcf380a5..efca8313d584 100644 --- a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.26.9+k3s1"; - k3sCommit = "4e217286a7ea41b82f1b67ab851d444ecf9a0f9b"; - k3sRepoSha256 = "1rf2gzf3ilcd1gc6d4k1w6cficr70x8lwzcq81njpz72dr6883z3"; - k3sVendorHash = "sha256-heCQNRaa0qFNkL69KEiIH2qEg+pukgS+fLOSWcwFddA="; + k3sVersion = "1.26.14+k3s1"; + k3sCommit = "c7e6922aa84369b3c0d28bb800e67bb162895a1c"; + k3sRepoSha256 = "1spvyyzk711g4ik1pv21xaasy7va5l5gcvbfkamfv4ijn0wz4mjx"; + k3sVendorHash = "sha256-ursq2Vq1J9MdkwDl3kKioxizhR46yo2urNc3VpwVH2A="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; - k3sCNIVersion = "1.3.0-k3s1"; - k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; - containerdVersion = "1.7.6-k3s1.26"; - containerdSha256 = "1bj7nggfmkrrgm5yk08p665z1mw1y376k4g3vjbkqldfglzpx7sq"; + k3sCNIVersion = "1.4.0-k3s2"; + k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; + containerdVersion = "1.7.11-k3s2.26"; + containerdSha256 = "0413a81kzb05xkklwyngg8g6a0w4icsi938rim69jmr2sijc89ww"; criCtlVersion = "1.26.0-rc.0-k3s1"; } From 403e92df40ea0ffed89c0839e5505c55567f4ada Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:42:54 -0300 Subject: [PATCH 30/85] k3s_1_27: 1.27.9+k3s1 -> 1.27.11+k3s1 Release: https://github.com/k3s-io/k3s/releases/tag/v1.27.11%2Bk3s1 --- .../networking/cluster/k3s/1_27/versions.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix index 596f21ab55cd..de7fbe181351 100644 --- a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -1,13 +1,13 @@ { - k3sVersion = "1.27.9+k3s1"; - k3sCommit = "2c249a39358bd36438ab53aedef5487d950fd558"; - k3sRepoSha256 = "16zcp1ih34zpz6115ivbcs49n5yikgj8mpiv177jvvb2vakmkgv6"; - k3sVendorHash = "sha256-zvoBN1mErSXovv/xVzjntHyZjVyCfPzsOdlcTSIwKus="; + k3sVersion = "1.27.11+k3s1"; + k3sCommit = "06d6bc80b469a61e5e90438b1f2639cd136a89e7"; + k3sRepoSha256 = "0qkm8yqs9p34kb5k2q0j5wiykj78qc12n65n0clas5by23jrqcqa"; + k3sVendorHash = "sha256-+z8pr30+28puv7yjA7ZvW++I0ipNEmen2OhCxFMzYOY="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; - k3sCNIVersion = "1.3.0-k3s1"; - k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; + k3sCNIVersion = "1.4.0-k3s2"; + k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; containerdVersion = "1.7.11-k3s2.27"; containerdSha256 = "0xjxc5dgh3drk2glvcabd885damjffp9r4cs0cm1zgnrrbhlipra"; criCtlVersion = "1.26.0-rc.0-k3s1"; From 7f75d9396523ffe5ff3bf9814e61c238f2c13db6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Mar 2024 23:22:51 +0000 Subject: [PATCH 31/85] python311Packages.pyvista: 0.43.3 -> 0.43.4 --- pkgs/development/python-modules/pyvista/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 6f6e909f1a56..3c1d7d2982e2 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.43.3"; + version = "0.43.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yJEggiWK73zzUPvOsPucpalmSMxywinE9t2e2dqBM9M="; + hash = "sha256-nesI3rYGPCih+rckT6E6pyy6kZdfxBOjpfwvzKt8c6I="; }; nativeBuildInputs = [ From 5affe35ae19f8eac53a685c55ba67a01be55d1fa Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 15 Mar 2024 11:57:54 +0800 Subject: [PATCH 32/85] nixops-dns: use buildGoModule --- pkgs/by-name/ni/nixops-dns/deps.nix | 20 -------------------- pkgs/by-name/ni/nixops-dns/package.nix | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 pkgs/by-name/ni/nixops-dns/deps.nix diff --git a/pkgs/by-name/ni/nixops-dns/deps.nix b/pkgs/by-name/ni/nixops-dns/deps.nix deleted file mode 100644 index 7da38f83e7fe..000000000000 --- a/pkgs/by-name/ni/nixops-dns/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "75229eecb7af00b2736e93b779a78429dcb19472"; - sha256 = "1vsjy07kkyx11iz4qsihhykac3ddq3ywdgv6bwrv407504f7x6wl"; - }; - } -] diff --git a/pkgs/by-name/ni/nixops-dns/package.nix b/pkgs/by-name/ni/nixops-dns/package.nix index cf633a65ca53..624b6a0ae517 100644 --- a/pkgs/by-name/ni/nixops-dns/package.nix +++ b/pkgs/by-name/ni/nixops-dns/package.nix @@ -1,23 +1,24 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "nixops-dns"; - version = "1.0"; - - goDeps = ./deps.nix; - goPackagePath = "github.com/kamilchm/nixops-dns"; + version = "1.0.1"; src = fetchFromGitHub { - owner = "kamilchm"; + owner = "museoa"; repo = "nixops-dns"; rev = "v${version}"; - sha256 = "1fyqwk2knrv40zpf71a56bjyaycr3p6fzrqq7gaan056ydy83cai"; + hash = "sha256-d3vVm6YeQTOAE5HFSKI01L9ZqfbQKrdoLsMwHP5HulE="; }; + vendorHash = "sha256-3DVNjvW0AAdogpTi3GMnn92FqqOUWNdQvRBityyKwcI="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { - homepage = "https://github.com/kamilchm/nixops-dns/"; + homepage = "https://github.com/museoa/nixops-dns"; description = "DNS server for resolving NixOps machines"; license = licenses.mit; maintainers = with maintainers; [ kamilchm sorki ]; From b0b63f4ede7d85c685fe72df36cfd91eb0c3de63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Mar 2024 04:52:55 +0000 Subject: [PATCH 33/85] exodus: 24.2.12 -> 24.11.5 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 323bca0844cc..60189088b201 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "exodus"; - version = "24.2.12"; + version = "24.11.5"; src = fetchurl { name = "exodus-linux-x64-${version}.zip"; url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; - sha256 = "sha256-oT0CgmfNXq9Kdoo+l+GHW2NVcT12MxJxq9BlIP7lMDE="; + sha256 = "sha256-sh6Ym+Dm5UIEiESIu1cuY8XSsnJcENCzW7b4S562ax8="; }; nativeBuildInputs = [ unzip ]; From fcdbe5b717d9d54b8feb484992a37f6afc80814f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Mar 2024 09:46:07 +0000 Subject: [PATCH 34/85] treesheets: unstable-2024-01-30 -> unstable-2024-03-14 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 1fda91523a5e..b8252ab6d286 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2024-01-30"; + version = "unstable-2024-03-14"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "f11a3418cb6e403898be215f3efcc2fcb7bc0f19"; - sha256 = "FOeRfNPX1ER1ZMUWy+4b67XfrATPPZntfhywjaGgDpo="; + rev = "4910f91cc067b1022d773a40d5762b0ebd47d0f3"; + sha256 = "We3+Y2V2izsgem0fJ0/2pPj5tyjXhOEuubP7lIhnEQ0="; }; nativeBuildInputs = [ From 6057b49379d99782e2f18eab2a42a769f311a312 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Mar 2024 19:52:11 +0000 Subject: [PATCH 35/85] librewolf-unwrapped: 123.0-1 -> 123.0.1-1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 40f22d2096f6..0f829613200b 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "123.0-1", + "packageVersion": "123.0.1-1", "source": { - "rev": "123.0-1", - "sha256": "1ic71b9sf6pgvsyinz0r8qhbpkryfdbj7lz6lh02d27xhnw9jd93" + "rev": "123.0.1-1", + "sha256": "1rw10n0na7v2syf0dqmjl91d6jhnhzb6xbcd13frwclp1v5j0irk" }, "settings": { "rev": "8a499ecdab8a5136faee50aae1fdd48997711de6", "sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6" }, "firefox": { - "version": "123.0", - "sha512": "a19567a13e1b663e538c4af17491146adad1f0ab977995e8da9ce9ed428008ad20902dee4efb82d54e1319a0e31768609696bc822563d75732b622760129d8bb" + "version": "123.0.1", + "sha512": "e9af61c1ca800edd16ab7a0d24c9a36bbb34813ed0a11ff62389aa38fa83deba394bca5d95cdaad55ad29ffa3c0e5d3dd15ac1099f7fa3649f4b6c835b7498c2" } } From f2af085973fa9fe136300ec0d6b72fa17d13ea56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Mar 2024 19:58:24 +0000 Subject: [PATCH 36/85] bun: 1.0.30 -> 1.0.31 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 2bf713852025..454370e396c6 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.30"; + version = "1.0.31"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-8S8fC7t7aRstWDvhlJe2gsYWaAvZJZqINv1sMyvmWsE="; + hash = "sha256-0w+Vp1SkZ3brx5HJOp36vED4K/DWPo4w8+tYi5lHgOk="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-7jMs7I7LWY9z/SX1xiNe/hi7ikqTY0qm26UsB0GZWhE="; + hash = "sha256-TAD41TlVMut2Fjlo8FGJBf8R7MIMlnts5RTRLqFwvT4="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-qZqbFQCpX5zoXOhIGQq5FLXuKpbro8qTGHV/KaynLWE="; + hash = "sha256-2hkCgIdgdCiIEQzOi/cWi4PwS4ShZr2qRnHnxsKL938="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-ZrBAukdbxmK0pfXptmt/VwfJFr9T4XGjXLeWCNzO55I="; + hash = "sha256-Z8eOFiodmE/VrYy8gejJblBkcHsppOamg4akfiM/oEE="; }; }; updateScript = writeShellScript "update-bun" '' From 00115e7a573d4222df36483402666345b9ed81b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Mar 2024 23:26:29 +0000 Subject: [PATCH 37/85] signalbackup-tools: 20240306 -> 20240314 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 631bc6b292f3..03219a724817 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240306"; + version = "20240314"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-KN4FkqgWj92LqPtwU/Wyk1qe8AyUsWlobypq5WgRVyI="; + hash = "sha256-m22OD2pq7bIN8X5FNCtkNt+VnWDAflXF2nYGgMepLzs="; }; postPatch = '' From f6ae97b37c762646078b0d811b6578c2ffce889e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 23:34:56 +0000 Subject: [PATCH 38/85] unciv: 4.10.15 -> 4.10.19 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 703ee9b18b9f..b017677e8b59 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.10.15"; + version = "4.10.19"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-SikrApaaGCAQc6ncqI4vRfXSgG/hgfO1wn5B5fj+W6Y="; + hash = "sha256-f9fg2Clz9CjoC8xzCguJ2A3Aczom+KjEyIlMJC2oS/o="; }; dontUnpack = true; From 60452dc8715005ece22916d73c346247f35b9be3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 17 Mar 2024 01:32:23 +0100 Subject: [PATCH 39/85] unciv: move to pkgs/by-name --- pkgs/{games/unciv/default.nix => by-name/un/unciv/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/unciv/default.nix => by-name/un/unciv/package.nix} (100%) diff --git a/pkgs/games/unciv/default.nix b/pkgs/by-name/un/unciv/package.nix similarity index 100% rename from pkgs/games/unciv/default.nix rename to pkgs/by-name/un/unciv/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d03765c9b5c..a7a8abe2b2ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38027,8 +38027,6 @@ with pkgs; umoria = callPackage ../games/umoria { }; - unciv = callPackage ../games/unciv { }; - unnethack = callPackage ../games/unnethack { }; uqm = callPackage ../games/uqm { }; From 74f896c5ecb62769cc69bade9cb7bf049e3213aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 00:44:55 +0000 Subject: [PATCH 40/85] fleng: 19 -> 20 --- pkgs/by-name/fl/fleng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/fleng/package.nix b/pkgs/by-name/fl/fleng/package.nix index 3f825bde28cc..e7010f3882bd 100644 --- a/pkgs/by-name/fl/fleng/package.nix +++ b/pkgs/by-name/fl/fleng/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fleng"; - version = "19"; + version = "20"; src = fetchurl { url = "http://www.call-with-current-continuation.org/fleng/fleng-${finalAttrs.version}.tgz"; - hash = "sha256-xYMNGS3avZ9JsR8kJlSHz+C2XsLmhsDO/KTr5JquRK8="; + hash = "sha256-kkouDNbdVGE7vskmu8kISA/RHIGed5vLY/ch4qgew3g="; }; doCheck = true; From e7adf6a098cb0adf9a30b46451a70a8fa4def290 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 05:20:57 +0000 Subject: [PATCH 41/85] flexget: 3.11.23 -> 3.11.24 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 26cc701b7e58..3bc1768654fa 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.23"; + version = "3.11.24"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-qEGgXpwECt9vAV+0GfAIQSuHwWtz4vFxy+6QuVUe5Rs="; + hash = "sha256-GivnZ7WWoS4fc7/uUfZFTdT0W+pW7W6Vhb56CmkEb0k="; }; postPatch = '' From 133b8d5e36cd02ea302b8f0d19bc4cbd0b2b0667 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 05:56:32 +0000 Subject: [PATCH 42/85] uxn: unstable-2024-03-10 -> unstable-2024-03-16 --- pkgs/by-name/ux/uxn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 86162829b87d..0569d11fa1f2 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "unstable-2024-03-10"; + version = "unstable-2024-03-16"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "cf964e43777bcce2e938964a5c764d1318e52ea6"; - hash = "sha256-NBIfpdZT9MjSUX+JUAoN1kkHKknsbRvaPMSaGmBXmac="; + rev = "5d3cf8b61457fea833d3e232297b378ba54c8350"; + hash = "sha256-PXXsMKAPRUs4/Y4s/NBorcJmv7RtNK7UlRgmyowrm3A="; }; outputs = [ "out" "projects" ]; From a89e9c88410251fb2a318947890cdf0ef8f24685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 17 Mar 2024 10:16:23 +0100 Subject: [PATCH 43/85] nixos-anywhere: 1.1.1 -> 1.1.2 Diff: https://github.com/numtide/nixos-anywhere/compare/1.1.1...1.1.2 --- pkgs/by-name/ni/nixos-anywhere/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index e8b7790ab1c8..197a320d4c62 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -28,12 +28,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-GN0G3g3QEzb2ZG3zSzbRaRBsmQsWJu81CZy9mIofRZ0="; + hash = "sha256-JzgZnHQ4Bknh1ebE4iMVzR3cWZG+8k7MRy0X7cNSnBE="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 719631fcf2126aff564392cd3988ef0a39c4aff0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 17 Mar 2024 10:52:43 +0100 Subject: [PATCH 44/85] spyder: 5.5.1 -> 5.5.3 Changelog: https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md --- pkgs/development/python-modules/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 47010b63a7c1..db72bacf47d0 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.5.1"; + version = "5.5.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+z8Jj0eA/mYH1r8ZQUyYUFMk7h1mBxjoTD5YZk0cH0k="; + hash = "sha256-i3OEKbiELfEmgff3EQfr6xGc74f1kMx1e+PbbXprkis="; }; patches = [ From c4e1ffb96bc05290f4ba1ebaab7bf8ba3999a5d0 Mon Sep 17 00:00:00 2001 From: Patka Date: Sun, 17 Mar 2024 12:21:41 +0100 Subject: [PATCH 45/85] engelsystem: 3.4.1 -> 3.5.0 Release notes: https://github.com/engelsystem/engelsystem/releases/tag/v3.5.0 --- nixos/modules/services/web-apps/engelsystem.nix | 4 +++- pkgs/servers/web-apps/engelsystem/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/engelsystem.nix b/nixos/modules/services/web-apps/engelsystem.nix index 669620debce5..7fb912415643 100644 --- a/nixos/modules/services/web-apps/engelsystem.nix +++ b/nixos/modules/services/web-apps/engelsystem.nix @@ -3,6 +3,8 @@ let inherit (lib) mkDefault mkEnableOption mkIf mkOption types mkPackageOption; cfg = config.services.engelsystem; + phpExt = pkgs.php.withExtensions + ({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql mbstring ] ++ enabled); in { options = { services.engelsystem = { @@ -99,7 +101,7 @@ in { ''; services.phpfpm.pools.engelsystem = { - phpPackage = pkgs.php81; + phpPackage = phpExt; user = "engelsystem"; settings = { "listen.owner" = config.services.nginx.user; diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index 9b9cf0ff3bfe..8274f3e88418 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -2,15 +2,15 @@ let phpExt = php.withExtensions - ({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]); + ({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql mbstring ] ++ enabled); in stdenv.mkDerivation rec { pname = "engelsystem"; - version = "3.4.1"; + version = "3.5.0"; src = fetchzip { url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip"; - hash = "sha256-5KniP1nrLfmWHruXnUJmlvgL95U+EsDmCs4tg/YLWtw="; + hash = "sha256-RbzAHBZN02u14WaLtq5EOh4XwIdHKvzX7NhDBhn/CaU="; }; buildInputs = [ phpExt ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f6edde48394..acd7f66f5b61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25999,7 +25999,7 @@ with pkgs; dspam = callPackage ../servers/mail/dspam { }; - engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; }; + engelsystem = callPackage ../servers/web-apps/engelsystem { }; envoy = callPackage ../servers/http/envoy { go = go_1_20; From 98748903e37098d8de1efae05cee5e8c85c08912 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:31:56 +0000 Subject: [PATCH 46/85] build(deps): bump actions/labeler from 4.3.0 to 5.0.0 Bumps [actions/labeler](https://github.com/actions/labeler) from 4.3.0 to 5.0.0. - [Release notes](https://github.com/actions/labeler/releases) - [Commits](https://github.com/actions/labeler/compare/ac9175f8a1f3625fd0d4fb234536d26811351594...8558fd74291d67161a8a78ce36a881fa63b766a9) --- updated-dependencies: - dependency-name: actions/labeler dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/labeler.yml | 409 +++++++++++++++++++++++------------ .github/workflows/labels.yml | 2 +- 2 files changed, 267 insertions(+), 144 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 35d1d140d94e..de580e129cf9 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,224 +1,347 @@ "6.topic: agda": - - doc/languages-frameworks/agda.section.md - - nixos/tests/agda.nix - - pkgs/build-support/agda/**/* - - pkgs/development/libraries/agda/**/* - - pkgs/top-level/agda-packages.nix + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/agda.section.md + - nixos/tests/agda.nix + - pkgs/build-support/agda/**/* + - pkgs/development/libraries/agda/**/* + - pkgs/top-level/agda-packages.nix "6.topic: cinnamon": - - pkgs/desktops/cinnamon/**/* - - nixos/modules/services/x11/desktop-managers/cinnamon.nix - - nixos/tests/cinnamon.nix + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/desktops/cinnamon/**/* + - nixos/modules/services/x11/desktop-managers/cinnamon.nix + - nixos/tests/cinnamon.nix "6.topic: emacs": - - nixos/modules/services/editors/emacs.nix - - nixos/modules/services/editors/emacs.xml - - nixos/tests/emacs-daemon.nix - - pkgs/applications/editors/emacs/elisp-packages/**/* - - pkgs/applications/editors/emacs/**/* - - pkgs/build-support/emacs/**/* - - pkgs/top-level/emacs-packages.nix + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/editors/emacs.nix + - nixos/modules/services/editors/emacs.xml + - nixos/tests/emacs-daemon.nix + - pkgs/applications/editors/emacs/elisp-packages/**/* + - pkgs/applications/editors/emacs/**/* + - pkgs/build-support/emacs/**/* + - pkgs/top-level/emacs-packages.nix "6.topic: Enlightenment DE": - - nixos/modules/services/x11/desktop-managers/enlightenment.nix - - pkgs/desktops/enlightenment/**/* - - pkgs/development/python-modules/python-efl/* + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/x11/desktop-managers/enlightenment.nix + - pkgs/desktops/enlightenment/**/* + - pkgs/development/python-modules/python-efl/* "6.topic: erlang": - - doc/languages-frameworks/beam.section.md - - pkgs/development/beam-modules/**/* - - pkgs/development/interpreters/elixir/**/* - - pkgs/development/interpreters/erlang/**/* - - pkgs/development/tools/build-managers/rebar/**/* - - pkgs/development/tools/build-managers/rebar3/**/* - - pkgs/development/tools/erlang/**/* - - pkgs/top-level/beam-packages.nix + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/beam.section.md + - pkgs/development/beam-modules/**/* + - pkgs/development/interpreters/elixir/**/* + - pkgs/development/interpreters/erlang/**/* + - pkgs/development/tools/build-managers/rebar/**/* + - pkgs/development/tools/build-managers/rebar3/**/* + - pkgs/development/tools/erlang/**/* + - pkgs/top-level/beam-packages.nix "6.topic: fetch": - - pkgs/build-support/fetch*/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/build-support/fetch*/**/* "6.topic: flakes": - - '**/flake.nix' - - lib/systems/flake-systems.nix - - nixos/modules/config/nix-flakes.nix + - any: + - changed-files: + - any-glob-to-any-file: + - '**/flake.nix' + - lib/systems/flake-systems.nix + - nixos/modules/config/nix-flakes.nix "6.topic: GNOME": - - doc/languages-frameworks/gnome.section.md - - nixos/modules/services/desktops/gnome/**/* - - nixos/modules/services/x11/desktop-managers/gnome.nix - - nixos/tests/gnome-xorg.nix - - nixos/tests/gnome.nix - - pkgs/desktops/gnome/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/gnome.section.md + - nixos/modules/services/desktops/gnome/**/* + - nixos/modules/services/x11/desktop-managers/gnome.nix + - nixos/tests/gnome-xorg.nix + - nixos/tests/gnome.nix + - pkgs/desktops/gnome/**/* "6.topic: golang": - - doc/languages-frameworks/go.section.md - - pkgs/build-support/go/**/* - - pkgs/development/compilers/go/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/go.section.md + - pkgs/build-support/go/**/* + - pkgs/development/compilers/go/**/* "6.topic: haskell": - - doc/languages-frameworks/haskell.section.md - - maintainers/scripts/haskell/**/* - - pkgs/development/compilers/ghc/**/* - - pkgs/development/haskell-modules/**/* - - pkgs/development/tools/haskell/**/* - - pkgs/test/haskell/**/* - - pkgs/top-level/haskell-packages.nix - - pkgs/top-level/release-haskell.nix + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/haskell.section.md + - maintainers/scripts/haskell/**/* + - pkgs/development/compilers/ghc/**/* + - pkgs/development/haskell-modules/**/* + - pkgs/development/tools/haskell/**/* + - pkgs/test/haskell/**/* + - pkgs/top-level/haskell-packages.nix + - pkgs/top-level/release-haskell.nix "6.topic: jupyter": - - pkgs/development/python-modules/jupyter*/**/* - - pkgs/development/python-modules/mkdocs-jupyter/* - - nixos/modules/services/development/jupyter/**/* - - pkgs/applications/editors/jupyter-kernels/**/* - - pkgs/applications/editors/jupyter/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/development/python-modules/jupyter*/**/* + - pkgs/development/python-modules/mkdocs-jupyter/* + - nixos/modules/services/development/jupyter/**/* + - pkgs/applications/editors/jupyter-kernels/**/* + - pkgs/applications/editors/jupyter/**/* "6.topic: kernel": - - pkgs/build-support/kernel/**/* - - pkgs/os-specific/linux/kernel/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/build-support/kernel/**/* + - pkgs/os-specific/linux/kernel/**/* "6.topic: lib": - - lib/** + - any: + - changed-files: + - any-glob-to-any-file: + - lib/** "6.topic: lua": - - pkgs/development/interpreters/lua-5/**/* - - pkgs/development/interpreters/luajit/**/* - - pkgs/development/lua-modules/**/* - - pkgs/top-level/lua-packages.nix + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/development/interpreters/lua-5/**/* + - pkgs/development/interpreters/luajit/**/* + - pkgs/development/lua-modules/**/* + - pkgs/top-level/lua-packages.nix "6.topic: Lumina DE": - - nixos/modules/services/x11/desktop-managers/lumina.nix - - pkgs/desktops/lumina/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/x11/desktop-managers/lumina.nix + - pkgs/desktops/lumina/**/* "6.topic: LXQt": - - nixos/modules/services/x11/desktop-managers/lxqt.nix - - pkgs/desktops/lxqt/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/x11/desktop-managers/lxqt.nix + - pkgs/desktops/lxqt/**/* "6.topic: mate": - - nixos/modules/services/x11/desktop-managers/mate.nix - - nixos/tests/mate.nix - - pkgs/desktops/mate/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/x11/desktop-managers/mate.nix + - nixos/tests/mate.nix + - pkgs/desktops/mate/**/* "6.topic: module system": - - lib/modules.nix - - lib/types.nix - - lib/options.nix - - lib/tests/modules.sh - - lib/tests/modules/** + - any: + - changed-files: + - any-glob-to-any-file: + - lib/modules.nix + - lib/types.nix + - lib/options.nix + - lib/tests/modules.sh + - lib/tests/modules/** "6.topic: nixos": - - nixos/**/* - - pkgs/os-specific/linux/nixos-rebuild/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/**/* + - pkgs/os-specific/linux/nixos-rebuild/**/* "6.topic: nim": - - doc/languages-frameworks/nim.section.md - - pkgs/development/compilers/nim/* - - pkgs/development/nim-packages/**/* - - pkgs/top-level/nim-packages.nix + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/nim.section.md + - pkgs/development/compilers/nim/* + - pkgs/development/nim-packages/**/* + - pkgs/top-level/nim-packages.nix "6.topic: nodejs": - - doc/languages-frameworks/javascript.section.md - - pkgs/build-support/node/**/* - - pkgs/development/node-packages/**/* - - pkgs/development/tools/yarn/* - - pkgs/development/tools/yarn2nix-moretea/**/* - - pkgs/development/web/nodejs/* + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/javascript.section.md + - pkgs/build-support/node/**/* + - pkgs/development/node-packages/**/* + - pkgs/development/tools/yarn/* + - pkgs/development/tools/yarn2nix-moretea/**/* + - pkgs/development/web/nodejs/* "6.topic: ocaml": - - doc/languages-frameworks/ocaml.section.md - - pkgs/development/compilers/ocaml/**/* - - pkgs/development/compilers/reason/**/* - - pkgs/development/ocaml-modules/**/* - - pkgs/development/tools/ocaml/**/* - - pkgs/top-level/ocaml-packages.nix + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/ocaml.section.md + - pkgs/development/compilers/ocaml/**/* + - pkgs/development/compilers/reason/**/* + - pkgs/development/ocaml-modules/**/* + - pkgs/development/tools/ocaml/**/* + - pkgs/top-level/ocaml-packages.nix "6.topic: pantheon": - - nixos/modules/services/desktops/pantheon/**/* - - nixos/modules/services/x11/desktop-managers/pantheon.nix - - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix - - nixos/tests/pantheon.nix - - pkgs/desktops/pantheon/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/desktops/pantheon/**/* + - nixos/modules/services/x11/desktop-managers/pantheon.nix + - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix + - nixos/tests/pantheon.nix + - pkgs/desktops/pantheon/**/* "6.topic: php": - - doc/languages-frameworks/php.section.md - - pkgs/build-support/php/**/* - - pkgs/development/interpreters/php/* - - pkgs/development/php-packages/**/* - - pkgs/test/php/default.nix - - pkgs/top-level/php-packages.nix + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/php.section.md + - pkgs/build-support/php/**/* + - pkgs/development/interpreters/php/* + - pkgs/development/php-packages/**/* + - pkgs/test/php/default.nix + - pkgs/top-level/php-packages.nix "6.topic: policy discussion": - - .github/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - .github/**/* "6.topic: printing": - - nixos/modules/services/printing/cupsd.nix - - pkgs/misc/cups/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/printing/cupsd.nix + - pkgs/misc/cups/**/* "6.topic: python": - - doc/languages-frameworks/python.section.md - - pkgs/development/interpreters/python/**/* - - pkgs/development/python-modules/**/* - - pkgs/top-level/python-packages.nix + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/python.section.md + - pkgs/development/interpreters/python/**/* + - pkgs/development/python-modules/**/* + - pkgs/top-level/python-packages.nix "6.topic: qt/kde": - - doc/languages-frameworks/qt.section.md - - nixos/modules/services/x11/desktop-managers/plasma5.nix - - nixos/tests/plasma5.nix - - pkgs/applications/kde/**/* - - pkgs/desktops/plasma-5/**/* - - pkgs/development/libraries/kde-frameworks/**/* - - pkgs/development/libraries/qt-5/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/qt.section.md + - nixos/modules/services/x11/desktop-managers/plasma5.nix + - nixos/tests/plasma5.nix + - pkgs/applications/kde/**/* + - pkgs/desktops/plasma-5/**/* + - pkgs/development/libraries/kde-frameworks/**/* + - pkgs/development/libraries/qt-5/**/* "6.topic: ruby": - - doc/languages-frameworks/ruby.section.md - - pkgs/development/interpreters/ruby/**/* - - pkgs/development/ruby-modules/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/ruby.section.md + - pkgs/development/interpreters/ruby/**/* + - pkgs/development/ruby-modules/**/* "6.topic: rust": - - doc/languages-frameworks/rust.section.md - - pkgs/build-support/rust/**/* - - pkgs/development/compilers/rust/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/rust.section.md + - pkgs/build-support/rust/**/* + - pkgs/development/compilers/rust/**/* "6.topic: stdenv": - - pkgs/stdenv/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/stdenv/**/* "6.topic: steam": - - pkgs/games/steam/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/games/steam/**/* "6.topic: systemd": - - pkgs/os-specific/linux/systemd/**/* - - nixos/modules/system/boot/systemd*/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/os-specific/linux/systemd/**/* + - nixos/modules/system/boot/systemd*/**/* "6.topic: TeX": - - doc/languages-frameworks/texlive.section.md - - pkgs/test/texlive/** - - pkgs/tools/typesetting/tex/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/texlive.section.md + - pkgs/test/texlive/** + - pkgs/tools/typesetting/tex/**/* "6.topic: vim": - - doc/languages-frameworks/vim.section.md - - pkgs/applications/editors/vim/**/* - - pkgs/applications/editors/vim/plugins/**/* - - nixos/modules/programs/neovim.nix - - pkgs/applications/editors/neovim/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/vim.section.md + - pkgs/applications/editors/vim/**/* + - pkgs/applications/editors/vim/plugins/**/* + - nixos/modules/programs/neovim.nix + - pkgs/applications/editors/neovim/**/* "6.topic: vscode": - - pkgs/applications/editors/vscode/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/applications/editors/vscode/**/* "6.topic: xfce": - - nixos/doc/manual/configuration/xfce.xml - - nixos/modules/services/x11/desktop-managers/xfce.nix - - nixos/tests/xfce.nix - - pkgs/desktops/xfce/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/doc/manual/configuration/xfce.xml + - nixos/modules/services/x11/desktop-managers/xfce.nix + - nixos/tests/xfce.nix + - pkgs/desktops/xfce/**/* "6.topic: zig": - - pkgs/development/compilers/zig/**/* - - doc/hooks/zig.section.md + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/development/compilers/zig/**/* + - doc/hooks/zig.section.md "8.has: changelog": - - nixos/doc/manual/release-notes/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/doc/manual/release-notes/**/* "8.has: documentation": - - doc/**/* - - nixos/doc/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - doc/**/* + - nixos/doc/**/* "8.has: module (update)": - - nixos/modules/**/* + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/**/* diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 4dc690e88bbc..2912e64c115b 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4.3.0 + - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} sync-labels: true From 3bab44a59e04d575453ca62ad7f18292e76f5c7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 12:19:20 +0000 Subject: [PATCH 47/85] i3lock: 2.14.1 -> 2.15 --- pkgs/applications/window-managers/i3/lock.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index b7cca2b66376..41096a70a68d 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "i3lock"; - version = "2.14.1"; + version = "2.15"; src = fetchFromGitHub { owner = "i3"; repo = "i3lock"; rev = version; - sha256 = "sha256-cC908c47fkU6msLqZSxpEbKxO1/PatH81QeuCzBSZGw="; + sha256 = "sha256-OyV6GSLnNV3GUqrfs3OBnIaBvicH2PXgeY4acOk5dR4="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From dbf28693ccce563c48a72b31268223caee613bb0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 16 Mar 2024 17:53:08 +0000 Subject: [PATCH 48/85] liferea: 1.15.5 -> 1.15.6 Changes: https://github.com/lwindolf/liferea/releases/tag/v1.15.6 --- .../networking/newsreaders/liferea/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 0851d0f30e79..06ec0b304576 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , pkg-config , intltool , python3Packages @@ -25,23 +24,13 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.15.5"; + version = "1.15.6"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-7lanrs63N6ZnqxvjcW/+cUZVDqUbML2gftQUc/sLr3Q="; + hash = "sha256-4P/0fwHofsRjZcLuFdkUKxWIp/9P5yXA2ED/zqTGd94="; }; - patches = [ - # Pull upstream fix for libxml2-2.12 compatibility: - # https://github.com/lwindolf/liferea/pull/1329 - (fetchpatch { - name = "libxml2-2.12.patch"; - url = "https://github.com/lwindolf/liferea/commit/be8ef494586d9ef73c04ec4ca058a9a158ae3562.patch"; - hash = "sha256-K1R7dJMm7ui6QKQqAHCo/ZrLCW3PhPU1EKRPEICtCsQ="; - }) - ]; - nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython From 6dc5ec580506ae2796beae5a64faf3d4363e31cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 12:35:52 +0000 Subject: [PATCH 49/85] python312Packages.xiaomi-ble: 0.27.0 -> 0.27.1 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 8264a5b9fb17..548609caaaa2 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.27.0"; + version = "0.27.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-D1LqIdnusCs7vzVCPnbhXqRER/+uPKWoVsfeGe2M6b8="; + hash = "sha256-/LOq35YrGacXXP1Izl9xoF5rrCQGONPGj/u2zGOqbt0="; }; postPatch = '' From 534cf72df854529aeeac24310f657d01b956bba0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 14:16:48 +0100 Subject: [PATCH 50/85] python312Packages.openstackdocstheme: disable ```` python3.12-pbr-6.0.0/lib/python3.12/site-packages/pbr/packaging.py", line 23, in from distutils.command import install as du_install ModuleNotFoundError: No module named 'distutils' ```` --- .../development/python-modules/openstackdocstheme/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 819bf7508d41..1ac6b6cae546 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -4,6 +4,7 @@ , dulwich , pbr , sphinx +, pythonAtLeast }: buildPythonPackage rec { @@ -11,6 +12,9 @@ buildPythonPackage rec { version = "3.2.0"; format = "setuptools"; + # breaks on import due to distutils import through pbr.packaging + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; hash = "sha256-PwSWLJr5Hjwz8cRXXutnE4Jc+vLcL3TJTZl6biK/4E4="; From 9f6c7a41720cc084153c163b9a70820c457041e5 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 17 Mar 2024 14:27:46 +0100 Subject: [PATCH 51/85] =?UTF-8?q?gnome-user-docs:=2045.1=20=E2=86=92=2045.?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/45.1...45.5 --- pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index bfe64459f46b..30382918c6d0 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "45.1"; + version = "45.5"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "L5DGgntfFgXfLt++orNChwMAqamBvDktyWIU2WfzrfE="; + sha256 = "sha256-dBZ/z0KgTZ5dPMEw0nvCA9h7aFzmBqhGdN8k4f9xnlQ="; }; nativeBuildInputs = [ From 743c5f584bc76f2901f7e9dce00f81d87804f2fa Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 17 Mar 2024 14:28:28 +0100 Subject: [PATCH 52/85] =?UTF-8?q?gnome.eog:=2045.2=20=E2=86=92=2045.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/45.2...45.3 --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 0fab995beca8..6790c764a82d 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "45.2"; + version = "45.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2UzDnYLIDO5ygbgqzkLIIll2rV0MPvmVx+Aw9rqyIZw="; + sha256 = "sha256-hlD2YtSSHYOnkE9rucokW69zX3F7R/rFs38NkOXokag="; }; patches = [ From 4e64f160485fe337c9a1e35a379cb0d8f23a140c Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 17 Mar 2024 14:29:02 +0100 Subject: [PATCH 53/85] =?UTF-8?q?gnome.gnome-shell:=2045.4=20=E2=86=92=204?= =?UTF-8?q?5.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/45.4...45.5 --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 93103100a064..aa74bec26696 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "45.4"; + version = "45.5"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - sha256 = "W/6jeeEgscfyN/PsNprSfvXC9ZMMffFjs5J4LYWCCQ0="; + sha256 = "sha256-vVw9PQKNRyM+QgUiPwrAKsmpc7aZvCd0OQlNQaeNarA="; }; patches = [ From a1ac8ac9a265acf0124b3f053ddbd59bad079355 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 17 Mar 2024 14:29:25 +0100 Subject: [PATCH 54/85] =?UTF-8?q?gnome.mutter:=2045.4=20=E2=86=92=2045.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/45.4...45.5 --- pkgs/desktops/gnome/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index e5d1cda681db..8722c95f2386 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -67,13 +67,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "45.4"; + version = "45.5"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "kRQIN74VWC8sdTvmYauOQtrVXUobDwZQvQssk/Ar16s="; + sha256 = "sha256-UcMyS4qXX5luWsaTqzhWPElubxQubNM1e0lQ0lAzSHQ="; }; mesonFlags = [ From ccf23b94f6082e2ec5adea09c9d380f980a86490 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 17 Mar 2024 14:29:50 +0100 Subject: [PATCH 55/85] =?UTF-8?q?gnome-online-accounts:=203.48.0=20?= =?UTF-8?q?=E2=86=92=203.48.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.48.0...3.48.1 --- .../libraries/gnome-online-accounts/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 9b13a780250f..aee2056a8563 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , vala , glib @@ -33,23 +32,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.48.0"; + version = "3.48.1"; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-QYu5/P/b1yqYIFrTZRN2F/weNVGlTedPapjUXSZhdb8="; + hash = "sha256-PqDHEIS/WVzOXKo3zv8uhT0OyWRLsB/UZDMArblRf4o="; }; - patches = [ - # Fix crash with EWS and libxml2.12. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/commit/b9638e2418408be4906752297e700506766dcf20.patch"; - hash = "sha256-l9+qS9WF3RuG9NtQQzSjpFSLNJV4FkXxOsLKYbINqrQ="; - }) - ]; - mesonFlags = [ "-Dfedora=false" # not useful in NixOS or for NixOS users. "-Dgoabackend=${lib.boolToString enableBackend}" From dc9a2159be79245280c80dfcdbd946c932d0070f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 14:44:51 +0100 Subject: [PATCH 56/85] python312Packages.scipy: drop dependecy on nosetests --- pkgs/development/python-modules/scipy/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index d630767c3c68..2870e5ec3bbd 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -13,7 +13,6 @@ , pkg-config , pythran , wheel -, nose , setuptools , hypothesis , pytestCheckHook @@ -116,7 +115,6 @@ in buildPythonPackage { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - nose hypothesis # Failed: DID NOT WARN. No warnings of type (, , ) were emitted. (pytestCheckHook.override { pytest = pytest_7; }) From e264d4f4ac03dd7c1ed0e17c5279277199b3a9cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 14:45:12 +0100 Subject: [PATCH 57/85] python311Packages.scikit-learn: stop testing on darwin On darwin the test session fails immediately, because it resolves some symlink to /nix/nix-installer, tries to stat that, and fails with PermissionError. The traceback is unfortunately completely outside of the projects code path, so kinda hard to debug. --- .../python-modules/scikit-learn/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index b789c748c8ee..b6c703d7870d 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -75,18 +75,12 @@ buildPythonPackage rec { export SKLEARN_BUILD_PARALLEL=$NIX_BUILD_CORES ''; - doCheck = !stdenv.isAarch64; + # PermissionError: [Errno 1] Operation not permitted: '/nix/nix-installer' + doCheck = !stdenv.isDarwin; disabledTests = [ # Skip test_feature_importance_regression - does web fetch "test_feature_importance_regression" - - # failing on macos - "check_regressors_train" - "check_classifiers_train" - "xfail_ignored_in_check_estimator" - ] ++ lib.optionals (stdenv.isDarwin) [ - "test_graphical_lasso" ]; pytestFlagsArray = [ From 593be02a6366d2a58726a2238820bf3c2726b917 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 14:53:49 +0100 Subject: [PATCH 58/85] python311Packages.drf-spectacular: disable failing test --- pkgs/development/python-modules/drf-spectacular/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index 063c3cc53b93..f38a2fbf86bc 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -79,6 +79,8 @@ buildPythonPackage rec { disabledTests = [ # requires django with gdal "test_rest_framework_gis" + # outdated test artifact + "test_pydantic_decoration" ]; pythonImportsCheck = [ "drf_spectacular" ]; From 6a92f1a8d6cddf51595ce6eaf9c9d15e242640d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 15:00:55 +0100 Subject: [PATCH 59/85] selenium-manager: fix darwin build --- pkgs/by-name/se/selenium-manager/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index cb33ac210e3f..d3703ba66993 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -1,6 +1,8 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform +, darwin }: rustPlatform.buildRustPackage rec { @@ -18,6 +20,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-BystESOFIitw3ER2K1TPOf5luOBvKXFuqc/unL93yRY="; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + # TODO: enable tests # The test suite depends on a number of browsers and network requests, # check the Gentoo package for inspiration From b9c691349086a844fe42ef26031cd504c16348c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 15:04:05 +0100 Subject: [PATCH 60/85] python311Packages.selenium: fix tests on darwin --- pkgs/development/python-modules/selenium/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 2e0717d87b0f..9f8336201eb9 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -64,6 +64,8 @@ buildPythonPackage rec { pytest-trio ]; + __darwinAllowLocalNetworking = true; + passthru.tests = { testing-vaultwarden = nixosTests.vaultwarden; }; From 5a459174ce15e6f846edef049177b751d13d62f8 Mon Sep 17 00:00:00 2001 From: hexchen Date: Sun, 17 Mar 2024 14:13:35 +0000 Subject: [PATCH 61/85] VictoriaMetrics: re-include vmalert This was broken by https://github.com/NixOS/nixpkgs/pull/293328 / ee411f2c1ba132a5d96199b6e3132611b7443293 --- pkgs/by-name/vi/victoriametrics/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index f441e03d8371..ad76b67df1bd 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -21,6 +21,7 @@ buildGoModule rec { "app/vlstorage" "app/vmagent" "app/vmalert-tool" + "app/vmalert" "app/vmauth" "app/vmctl" "app/vminsert" From 3c9fad42d259b36b3e5a383ace74f8d387ff9c3e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 16:01:16 +0100 Subject: [PATCH 62/85] home-assistant: propagate hass-nabucasa Was promoted to a core dependency in 2024.3.1, and that was missed during the build, because it enters the environment through test dependencies through `default_config`, which satifies the dependency check. --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2d7b18a10bf0..74cf6ff27817 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -482,6 +482,7 @@ in python.pkgs.buildPythonApplication rec { certifi ciso8601 cryptography + hass-nabucasa httpx home-assistant-bluetooth ifaddr From d0fb3eab9f9375e0d1458ad73aebe6bc9cb2db8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 16:21:10 +0100 Subject: [PATCH 63/85] python311Packages.glean-parser: disable failing test --- pkgs/development/python-modules/glean-parser/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 69e0689d740b..2068b89fc3dd 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { disabledTests = [ # Network access "test_validate_ping" + "test_logging" # Fails since yamllint 1.27.x "test_yaml_lint" ]; From 51076bc32a0af81f7ba7ec1da0bc289188183105 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 16:13:37 +0100 Subject: [PATCH 64/85] python312Packages.capstone: disable --- pkgs/development/python-modules/capstone/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 55503c9f6205..be8fa4fba9f4 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -3,6 +3,7 @@ , capstone , stdenv , setuptools +, pythonAtLeast }: buildPythonPackage rec { @@ -10,6 +11,9 @@ buildPythonPackage rec { version = lib.getVersion capstone; format = "setuptools"; + # distutils usage + disabled = pythonAtLeast "3.12"; + src = capstone.src; sourceRoot = "${src.name}/bindings/python"; From 7453e15cf9aef56ed925cf55b2d7adceb1a61ed9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 16:07:10 +0100 Subject: [PATCH 65/85] python312Packages.case: fix build by replacing nose with pynose. --- .../python-modules/case/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix index 36efc1aab3bc..5a244096bcd5 100644 --- a/pkgs/development/python-modules/case/default.nix +++ b/pkgs/development/python-modules/case/default.nix @@ -1,16 +1,17 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pynose , pythonOlder -, pytestCheckHook +, pythonRelaxDepsHook +, setuptools , six }: buildPythonPackage rec { pname = "case"; version = "1.5.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,8 +20,18 @@ buildPythonPackage rec { sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1"; }; - propagatedBuildInputs = [ - nose + build-system = [ + setuptools + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + # replaced with pynopse for python 3.12 compat + "nose" + ]; + + dependencies = [ + pynose six ]; From 2723115b1f58d9416de86b5addf3b192ce96f0ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 16:05:11 +0100 Subject: [PATCH 66/85] python311Packages.dvc: fix src hash --- pkgs/development/python-modules/dvc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 63c2803ed8f8..08271da15ad4 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-k41MvkHuZEanOBXOcwsaSSRY0r446ks5eEGyqQbTZAY="; + hash = "sha256-NY3fwo7063hrgYK0a7/PLlPORxhqGgowNtLWo/CN+PY="; }; pythonRelaxDeps = [ From ee44ceb40ee8cf26bad7b612263e829a97ab79ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 15:35:06 +0100 Subject: [PATCH 67/85] python311Packages.gcsfs: 2023.4.0 -> 2024.2.0 https://github.com/fsspec/gcsfs/raw/2024.2.0/docs/source/changelog.rst --- pkgs/development/python-modules/gcsfs/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 04af8e58ef79..71d52947b0c4 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2023.4.0"; + version = "2024.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FHS+g0SuYH9OPiE/+p2SHrsWfzBQ82GM6hTph8koh+o="; + hash = "sha256-6O09lP2cWLzeMTBathb3O/tVGZPEHSqujfUPWZIBUJI="; }; propagatedBuildInputs = [ @@ -50,11 +50,18 @@ buildPythonPackage rec { vcrpy ]; + disabledTests =[ + # Cannot connect to host storage.googleapis.com:443 + "test_credentials_from_raw_token" + ]; + disabledTestPaths = [ # Tests require a running Docker instance "gcsfs/tests/test_core.py" "gcsfs/tests/test_mapping.py" "gcsfs/tests/test_retry.py" + "gcsfs/tests/derived/gcsfs_test.py" + "gcsfs/tests/test_inventory_report_listing.py" ]; pytestFlagsArray = [ From 1f57f24114a26bb2c1f4338f853318823b680a64 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 16:46:58 +0100 Subject: [PATCH 68/85] hydra-check: unpin python version We don't support Python 3.10 anymore, and it has incurred breakages that blocked the build of this package. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23fd14f87276..43895295980b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21741,7 +21741,7 @@ with pkgs; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; - hydra-check = with python310.pkgs; toPythonApplication hydra-check; + hydra-check = with python3.pkgs; toPythonApplication hydra-check; hyena = callPackage ../development/libraries/hyena { }; From 1eee251d945e8739d38fdd8e409d72c2dbc0428d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 16:51:51 +0100 Subject: [PATCH 69/85] python310Packages.virtualenv: disable failing test --- pkgs/development/python-modules/virtualenv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index d291bbbbeccd..7a92056a6db9 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -71,6 +71,8 @@ buildPythonPackage rec { "test_seed_link_via_app_data" # Permission Error "test_bad_exe_py_info_no_raise" + ] ++ lib.optionals (pythonOlder "3.11") [ + "test_help" ] ++ lib.optionals (isPyPy) [ # encoding problems "test_bash" From 40f7f66326df176998c0cc5f8cc18e83a322a76b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 17:14:49 +0100 Subject: [PATCH 70/85] python311Packages.rq: 1.15.1 -> 1.16.1 https://github.com/rq/rq/releases/tag/v1.16.0 https://github.com/rq/rq/releases/tag/v1.16.1 Convert to PEP517 builder and enable tests on Linux. --- .../development/python-modules/rq/default.nix | 41 ++++++++++++++++--- pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index b8e19d46f790..36ddd4d95b34 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,15 +1,27 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , pythonOlder + +# build-system +, hatchling + +# dependencies , click , redis + +# tests +, psutil +, pytestCheckHook +, redis-server +, sentry-sdk }: buildPythonPackage rec { pname = "rq"; - version = "1.15.1"; - format = "setuptools"; + version = "1.16.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,16 +29,33 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-cymNXFI+6YEVw2Pc7u6+vroC0428oW7BTLxyBgPqLng="; + hash = "sha256-1E7jPTSQCjuKZVFL4uZqL1WZHnxWSLTNcnpyvfHz7oY="; }; - propagatedBuildInputs = [ + build-system = [ + hatchling + ]; + + dependencies = [ click redis ]; - # Tests require a running Redis rerver - doCheck = false; + nativeCheckInputs = [ + psutil + pytestCheckHook + sentry-sdk + ]; + + preCheck = lib.optionalString stdenv.isLinux '' + PATH=$out/bin:$PATH + ${redis-server}/bin/redis-server & + REDIS_PID=$! + ''; + + postCheck = lib.optionalString stdenv.isLinux '' + kill $REDIS_PID + ''; pythonImportsCheck = [ "rq" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6796de6a9e9..c27a9ab74032 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13101,7 +13101,9 @@ self: super: with self; { rpyc4 = callPackage ../development/python-modules/rpyc4 { }; - rq = callPackage ../development/python-modules/rq { }; + rq = callPackage ../development/python-modules/rq { + redis-server = pkgs.redis; + }; rsa = callPackage ../development/python-modules/rsa { }; From d2f7a37ba51e4a45cb53072f9c9475875b90806f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 17:30:23 +0100 Subject: [PATCH 71/85] python311Packages.green: refresh tests patch --- .../python-modules/green/tests.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/green/tests.patch b/pkgs/development/python-modules/green/tests.patch index 7e1c3be62e3f..82826834518f 100644 --- a/pkgs/development/python-modules/green/tests.patch +++ b/pkgs/development/python-modules/green/tests.patch @@ -1,22 +1,23 @@ diff --git a/green/test/test_integration.py b/green/test/test_integration.py -index 0cf8cbb..40d9f6b 100644 +index 9a2d824..372e6e0 100644 --- a/green/test/test_integration.py +++ b/green/test/test_integration.py -@@ -41,9 +41,7 @@ class TestFinalizer(unittest.TestCase): +@@ -37,9 +37,7 @@ class TestFinalizer(unittest.TestCase): + ) ) - fh.close() args = [ - sys.executable, - "-m", - "green.cmdline", -+ "@green@", - "--finalizer=test_finalizer0.msg", ++ "@green@" + "--finalizer=test_finalizer.msg", "--maxtasksperchild=1", ] -@@ -58,6 +56,5 @@ class TestFinalizer(unittest.TestCase): +@@ -54,7 +52,6 @@ class TestFinalizer(unittest.TestCase): stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env, - timeout=10, - ).stdout.decode("utf-8") - self.assertIn("finalizer worked", output) + encoding="utf-8", + check=True, + ).stdout From 351dce2515af83ef217592d3920f524e26338cec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 17:42:06 +0100 Subject: [PATCH 72/85] python311Packages.pytest-django: fix build, enable tests --- .../python-modules/django-csp/default.nix | 39 ++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix index dcb52264ade4..e8f04f188a54 100644 --- a/pkgs/development/python-modules/django-csp/default.nix +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -1,20 +1,47 @@ -{ lib, fetchPypi, buildPythonPackage, django }: +{ lib +, fetchPypi +, buildPythonPackage + +# build-system +, setuptools + +# dependencies +, django + +# tests +, jinja2 +, pytest-django +, pytestCheckHook +}: buildPythonPackage rec { pname = "django-csp"; version = "3.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; pname = "django_csp"; - sha256 = "sha256-7w8an32Nporm4WnALprGYcDs8E23Dg0dhWQFEqaEccA="; + hash = "sha256-7w8an32Nporm4WnALprGYcDs8E23Dg0dhWQFEqaEccA="; }; - # too complicated to setup - needs a running django instance - doCheck = false; + postPatch = '' + sed -i "/addopts =/d" pyproject.toml + ''; - propagatedBuildInputs = [ django ]; + build-system = [ + setuptools + ]; + + dependencies = [ + django + ]; + + nativeCheckInputs = [ + jinja2 + pytest-django + pytestCheckHook + ]; meta = with lib; { description = "Adds Content-Security-Policy headers to Django"; From 1dda3f13c31458e4b2dec0fd0df569816ce3bbf2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 17:56:54 +0100 Subject: [PATCH 73/85] pretalx: relax djano-csp, python-dateutil constraint --- pkgs/by-name/pr/pretalx/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index d353fa6462f5..9544d7babcd0 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -78,6 +78,14 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext + ] ++ (with python.pkgs; [ + pythonRelaxDepsHook + setuptools + ]); + + pythonRelaxDeps = [ + "django-csp" + "python-dateutil" ]; propagatedBuildInputs = with python.pkgs; [ From 0166a7a0331b7d7e5554b2edf20c041c496a2584 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 18:20:26 +0100 Subject: [PATCH 74/85] python311Packages.django-storages: disable failing tests Likely requires an older moto version. --- pkgs/development/python-modules/django-storages/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 29b4aff06309..b835a6fb0766 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -80,6 +80,11 @@ buildPythonPackage rec { "test_storage_save_gzip" ]; + disabledTestPaths = [ + # ImportError: cannot import name 'mock_s3' from 'moto' + "tests/test_s3.py" + ]; + meta = with lib; { description = "Collection of custom storage backends for Django"; changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; From ce78b8a0c1256c5b40d8a479cc908c0a00411777 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 15:29:43 +0100 Subject: [PATCH 75/85] python311Packages.fsspec: 2023.10.0 -> 2024.3.0 https://github.com/fsspec/filesystem_spec/raw/2024.3.0/docs/source/changelog.rst --- pkgs/development/python-modules/fsspec/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index a90fe66a48cc..648879ec85cb 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2023.10.0"; + version = "2024.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; rev = "refs/tags/${version}"; - hash = "sha256-cLkCQQbb/AakDSz1NTrVlHh8LdgoqtjX8OPT+Nb1NA4="; + hash = "sha256-C+47BcIELZTEARXW8fAMHMjyKUWxU1tNKWGoPPtt/fQ="; }; propagatedBuildInputs = [ @@ -126,6 +126,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + __darwinAllowLocalNetworking = true; disabledTests = [ @@ -144,6 +148,8 @@ buildPythonPackage rec { # this two tests however, assume nanosecond resolution "test_modified" "test_touch" + # tries to access /home, ignores $HOME + "test_directories" ]; disabledTestPaths = [ From 1bb2d72a784409ca92af346270beb383ddf06c21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 18:24:57 +0100 Subject: [PATCH 76/85] python311Packages.adlfs: fix build --- pkgs/development/python-modules/adlfs/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix index ad8375e27e83..c425495221b3 100644 --- a/pkgs/development/python-modules/adlfs/default.nix +++ b/pkgs/development/python-modules/adlfs/default.nix @@ -8,12 +8,14 @@ , fetchFromGitHub , fsspec , pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "adlfs"; version = "2024.2.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +26,12 @@ buildPythonPackage rec { hash = "sha256-/Qakr7ISlzDqunoshUf8mpWCvFXOH3haUx/C79j4RZA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ aiohttp azure-core azure-datalake-store From ea57d4e8074b925dc7c2fbd03bf7e39ea3b9c380 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 18:32:03 +0100 Subject: [PATCH 77/85] python311Packages.hydra-core: disable failing test --- pkgs/development/python-modules/hydra-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix index 0f984e835f23..fb73910aaf1f 100644 --- a/pkgs/development/python-modules/hydra-core/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -73,6 +73,8 @@ buildPythonPackage rec { "test_bash_completion_with_dot_in_path" "test_install_uninstall" "test_config_search_path" + # does not raise UserWarning + "test_initialize_compat_version_base" ]; disabledTestPaths = [ From a0882c84d38ac481b448da4194c7b0f8116278f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 18:41:19 +0100 Subject: [PATCH 78/85] python311Packages.dvclive: fix missing deps --- pkgs/development/python-modules/dvclive/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 5712cb1d2492..f233461939c5 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -17,13 +17,13 @@ , optuna , pandas , pillow -, pytestCheckHook +, psutil +, pynvml , pythonOlder , ruamel-yaml , scikit-learn , scmrepo , setuptools-scm -, tabulate , tensorflow , torch , transformers @@ -56,6 +56,8 @@ buildPythonPackage rec { gto ruamel-yaml scmrepo + psutil + pynvml ]; passthru.optional-dependencies = { From 1c30e585f2a4f43eefa8845d05e967b47918eaa7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 16 Mar 2024 10:33:07 +0100 Subject: [PATCH 79/85] unifont: 15.1.04 -> 15.1.05 --- pkgs/data/fonts/unifont/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 7f2e9a1b158b..0868abcdd58c 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.1.04"; + version = "15.1.05"; otf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; - hash = "sha256-J8g8ojXDq5nV013zXXi1rEAYQhpCh7G06mV7IpmZbTg="; + hash = "sha256-e2K1CsuxhmidwwxEbOQ2e4fXlInpkHuDJV+fvg3PueE="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-XHKP8xx+GvhFYBW03Sambpd2gclKvQUz1JAjIlb59OI="; + hash = "sha256-zpc9Z4XXvma/tXRYOvAAQIpjyYS+1XPiaLZF4xYPTbw="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; From a4120ecc95f8570f19bed92887d2fe0bb799fa47 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 18:43:47 +0100 Subject: [PATCH 80/85] python311Packages.favicon: suppress pytest8 warnings --- pkgs/development/python-modules/favicon/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 1b42710b16fc..0800994eb61d 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -34,6 +34,10 @@ buildPythonPackage rec { requests-mock ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + pythonImportsCheck = [ "favicon" ]; From fc0fca24875f7e8dfd7574aa171fcec4d57c4b62 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 18:45:32 +0100 Subject: [PATCH 81/85] python311Packages.flask-session-captcha: drop patch --- .../python-modules/flask-session-captcha/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/python-modules/flask-session-captcha/default.nix b/pkgs/development/python-modules/flask-session-captcha/default.nix index 0f7ddd907640..c70a6baf7e6a 100644 --- a/pkgs/development/python-modules/flask-session-captcha/default.nix +++ b/pkgs/development/python-modules/flask-session-captcha/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage # build-system @@ -28,14 +27,6 @@ buildPythonPackage rec { hash = "sha256-eLdpLw1I4t9H0ek3AR9Cteb7Gfxo/LepM287p34Zw3s="; }; - patches = [ - (fetchpatch { - # https://github.com/Tethik/flask-session-captcha/pull/44 - url = "https://github.com/Tethik/flask-session-captcha/commit/3f79c22a71c60dd60e9df61b550cce641603dcb6.patch"; - hash = "sha256-MXsoSytBNbcg3HU6IWlvf2MgNUL78T5ToxKGv4YMtZw="; - }) - ]; - nativeBuildInputs = [ setuptools ]; From 28e31d64853e860d5b25102d88f613d3094951b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 18:47:29 +0100 Subject: [PATCH 82/85] python311Packages.flet: propagate fastapi, uvicorn --- pkgs/development/python-modules/flet/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index aca3df376929..e5d81bff9a6c 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -7,6 +7,7 @@ , poetry-core # propagates +, fastapi , flet-core , flet-runtime , httpx @@ -14,6 +15,7 @@ , packaging , qrcode , cookiecutter +, uvicorn , watchdog , websocket-client , websockets @@ -40,8 +42,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + fastapi flet-core flet-runtime + uvicorn websocket-client watchdog oauthlib From 1065a74b58062ce3353179defbab61a517362c37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 18:50:31 +0100 Subject: [PATCH 83/85] python311Packages.ufo2ft: relax cffsubr constraint --- pkgs/development/python-modules/ufo2ft/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 1ceed6367d07..5cbcf1370372 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -9,6 +9,7 @@ , fonttools , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , setuptools-scm , skia-pathops , ufolib2 @@ -28,6 +29,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "cffsubr" ]; propagatedBuildInputs = [ From 01e1ce302e3078e1c87d478f04b99f3b342bcab3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 18:51:52 +0100 Subject: [PATCH 84/85] python311Packages.formulae: build with setuptools-scm --- pkgs/development/python-modules/formulae/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix index b0d6a4382f2c..02dcfd0fbd6e 100644 --- a/pkgs/development/python-modules/formulae/default.nix +++ b/pkgs/development/python-modules/formulae/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , setuptools +, setuptools-scm , pytestCheckHook , numpy , pandas @@ -23,7 +24,10 @@ buildPythonPackage rec { hash = "sha256-A0CI0bpoRYFAcPiNAf5haQu9BEqmBgxF7HfIl4qcML0="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; propagatedBuildInputs = [ numpy From dbc9291fb25827d068570f4f10c4efe7638171ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 17 Mar 2024 18:53:53 +0100 Subject: [PATCH 85/85] python311Package.gcovr: fix build --- pkgs/development/python-modules/gcovr/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index bd4876cf5630..1f2b4bc0e027 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -1,10 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, colorlog , jinja2 , lxml , pygments , pythonOlder +, tomli }: buildPythonPackage rec { @@ -20,9 +22,12 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + colorlog jinja2 lxml pygments + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; # There are no unit tests in the pypi tarball. Most of the unit tests on the @@ -32,7 +37,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "gcovr" - "gcovr.workers" "gcovr.configuration" ];