From abea1ca09b334d4256e284c397bf6b85c6f558ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 13 Sep 2025 16:40:58 +0200 Subject: [PATCH 001/542] ncompress: fix build against gcc15 --- pkgs/by-name/nc/ncompress/package.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/by-name/nc/ncompress/package.nix b/pkgs/by-name/nc/ncompress/package.nix index 4baac00754ee..4c7af6503565 100644 --- a/pkgs/by-name/nc/ncompress/package.nix +++ b/pkgs/by-name/nc/ncompress/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, }: stdenv.mkDerivation rec { @@ -15,6 +16,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-Yhs3C5/kR7Ve56E84usYJprxIMAIwXVahLi1N9TIfj0="; }; + patches = [ + # dependencies for gcc15 patch + (fetchpatch { + url = "https://github.com/vapier/ncompress/commit/af7d29d87ddf8b2002dad41152efa94e9c825b35.patch"; + excludes = [ "Changes" ]; + hash = "sha256-zc+59RHVt5/aw5a4OVnOmXyFdeoshqbARG2upDujEk4="; + }) + (fetchpatch { + url = "https://github.com/vapier/ncompress/commit/aa359df10ec29a56c12f6e5c2bcec8d8ecfa2740.patch"; + excludes = [ "Changes" ]; + hash = "sha256-wtZJBSfJ6QmYK+ywijQ263PnjGwD2mXcvFWvBNeODpc="; + }) + # fix build against gcc15 + # https://github.com/vapier/ncompress/pull/40 + (fetchpatch { + url = "https://github.com/vapier/ncompress/pull/40/commits/90810a7f11bf157b479c23c0fe6cee0bebec15c6.patch"; + hash = "sha256-aqIofwTxlg2lq2+ZBhG6X6MKUoafHrADZlw7Avj8anQ="; + }) + ]; + makeFlags = [ "PREFIX=$(out)" ]; installTargets = "install_core"; From f0dd13994c31ccda62747f98b60bc402fb2f0e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 13 Sep 2025 16:41:03 +0200 Subject: [PATCH 002/542] ncompress: update homepage --- pkgs/by-name/nc/ncompress/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/nc/ncompress/package.nix b/pkgs/by-name/nc/ncompress/package.nix index 4c7af6503565..b0177ddc441a 100644 --- a/pkgs/by-name/nc/ncompress/package.nix +++ b/pkgs/by-name/nc/ncompress/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://ncompress.sourceforge.net/"; + homepage = "https://vapier.github.io/ncompress/"; license = licenses.publicDomain; description = "Fast, simple LZW file compressor"; platforms = platforms.unix; From 1257f7b727f5e41c0ad8e8283172a87de1aa8711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ha=CC=88cker?= Date: Wed, 10 Sep 2025 20:43:32 +0200 Subject: [PATCH 003/542] genericBuild: extract phases definition This is very helpfull if you want to trigger partial builds in `nix develop .#$some_package` and just need the to see all the phases, so you can manually trigger them. --- pkgs/stdenv/generic/setup.sh | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index f051ae6c7d44..7f20b3b5de93 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1760,6 +1760,25 @@ runPhase() { fi } +definePhases() { + # only defines phases if it is not already defined + if [ -z "${phases[*]:-}" ]; then + phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-} \ + configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase \ + ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase \ + ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}" + fi +} + +printPhases() { + definePhases + # one phase per line, to make it easy to consume with tools like xargs + # explicitly uses the same splitting as genericBuild + local phase + for phase in ${phases[*]}; do + printf '%s\n' "$phase" + done +} genericBuild() { # variable used by our gzip wrapper to add -n. @@ -1775,12 +1794,7 @@ genericBuild() { return fi - if [ -z "${phases[*]:-}" ]; then - phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-} \ - configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase \ - ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase \ - ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}"; - fi + definePhases # The use of ${phases[*]} gives the correct behavior both with and # without structured attrs. This relies on the fact that each From eca6071a74d8ae6805f38c47065157c8ee017829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Sava=C3=ABte?= Date: Thu, 11 Sep 2025 23:37:41 +0200 Subject: [PATCH 004/542] nixosTestRunner: cache store path length to avoid useless calls --- pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch index 33c4ffff6fe5..9ece10973758 100644 --- a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch +++ b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch @@ -9,7 +9,7 @@ index 45e9a1f9b0..494ee00c66 100644 +static int is_in_store_path(const char *path) +{ + static char *store_path = NULL; -+ int store_path_len = -1; ++ static ssize_t store_path_len = -1; + + if (store_path_len == -1) { + if ((store_path = getenv("NIX_STORE")) != NULL) @@ -19,7 +19,7 @@ index 45e9a1f9b0..494ee00c66 100644 + } + + if (store_path_len > 0) -+ return strncmp(path, store_path, strlen(store_path)) == 0; ++ return strncmp(path, store_path, store_path_len) == 0; + return 0; +} + From 2b9bb8c6898a4d261f2c584556d309bbe7aa4632 Mon Sep 17 00:00:00 2001 From: winston Date: Tue, 16 Sep 2025 11:27:17 +0200 Subject: [PATCH 005/542] tree-sitter: fix pkgsStatic build --- .../tools/parsing/tree-sitter/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 542d0ac8be25..507b51c87b44 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -193,10 +193,19 @@ rustPlatform.buildRustPackage { }) ]; - postPatch = lib.optionalString webUISupport '' - substituteInPlace cli/loader/src/lib.rs \ - --replace-fail 'let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };' 'let emcc_name = "${lib.getExe' emscripten "emcc"}";' - ''; + postPatch = + lib.optionalString webUISupport '' + substituteInPlace cli/loader/src/lib.rs \ + --replace-fail 'let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };' 'let emcc_name = "${lib.getExe' emscripten "emcc"}";' + '' + # when building on static platforms: + # 1. remove the `libtree-sitter.$(SOEXT)` step from `all` + # 2. remove references to shared object files in the Makefile + + lib.optionalString stdenv.hostPlatform.isStatic '' + substituteInPlace ./Makefile \ + --replace-fail 'all: libtree-sitter.a libtree-sitter.$(SOEXT) tree-sitter.pc' 'all: libtree-sitter.a tree-sitter.pc' + sed -i '/^install:/,/^[^[:space:]]/ { /$(SOEXT/d; }' ./Makefile + ''; # Compile web assembly with emscripten. The --debug flag prevents us from # minifying the JavaScript; passing it allows us to side-step more Node @@ -209,8 +218,8 @@ rustPlatform.buildRustPackage { postInstall = '' PREFIX=$out make install - ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"} - ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"} + ${lib.optionalString (!enableShared) "rm -f $out/lib/*.so{,.*}"} + ${lib.optionalString (!enableStatic) "rm -f $out/lib/*.a"} '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd tree-sitter \ From 77ea77aa4dbb8075f61e5ed9d297e5cf72867244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Sep 2025 18:18:34 +0200 Subject: [PATCH 006/542] pypy3Packages.sphinx: ignore more failing tests --- .../python-modules/sphinx/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 5d4b4d581fa4..2ca3085ff812 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -103,6 +103,17 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; + disabledTestPaths = lib.optionals isPyPy [ + # internals are asserted which are sightly different in PyPy + "tests/test_extensions/test_ext_autodoc.py" + "tests/test_extensions/test_ext_autodoc_autoclass.py" + "tests/test_extensions/test_ext_autodoc_autofunction.py" + "tests/test_extensions/test_ext_autodoc_automodule.py" + "tests/test_extensions/test_ext_autodoc_preserve_defaults.py" + "tests/test_util/test_util_inspect.py" + "tests/test_util/test_util_typing.py" + ]; + disabledTests = [ # requires network access "test_latex_images" @@ -145,13 +156,10 @@ buildPythonPackage rec { # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous "test_autosummary_generate_content_for_module" "test_autosummary_generate_content_for_module_skipped" - # internals are asserted which are sightly different in PyPy - "test_autodoc_inherited_members_None" - "test_automethod_for_builtin" - "test_builtin_function" - "test_isattributedescriptor" - "test_methoddescriptor" - "test_partialfunction" + # Struct vs struct.Struct + "test_restify" + "test_stringify_annotation" + "test_stringify_type_union_operator" ]; passthru.tests = { From 1560ff43c7b4d5df495f61963cd8fa03f56123bb Mon Sep 17 00:00:00 2001 From: fzdslr-nw Date: Thu, 18 Sep 2025 10:18:15 +0000 Subject: [PATCH 007/542] webrtc-audio-processing_1: fix compilation against gcc15 --- pkgs/by-name/we/webrtc-audio-processing_1/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix index ccda7ac4af67..473b1d996e49 100644 --- a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/0630fa25465530c0e7358f00016bdc812894f67f/community/webrtc-audio-processing-1/add-loongarch-support.patch"; hash = "sha256-Cn3KwKSSV/QJm1JW0pkEWB6OmeA0fRlVkiMU8OzXNzY="; }) + # Fix compilation against gcc15 + (fetchurl { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/webrtc-audio-processing-1/-/raw/9de1306d3a6a78f435666453b85ba8ede0dd91ea/0001-Fix-compilation-with-GCC-15.patch"; + hash = "sha256-Ws7FRBX5+nIKWJv6cROqO5eSm5AJGyZVWrAjQ4R3n0I="; + }) ]; outputs = [ From 7f3f13c49233a4d93b529fa336ea444275f4275f Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 16 Sep 2025 14:33:09 +0300 Subject: [PATCH 008/542] xvidcore: fix build with gcc15 - add patch from fedora Fixes build failure with gcc15: ``` In file included from ../../src/bitstream/bitstream.h:31, from ../../src/decoder.c:40: ../../src/bitstream/../encoder.h:45:13: error: 'bool' cannot be defined via 'typedef' 45 | typedef int bool; | ^~~~ ../../src/bitstream/../encoder.h:45:13: note: 'bool' is a keyword with '-std=c23' onwards ../../src/bitstream/../encoder.h:45:1: warning: useless type name in empty declaration 45 | typedef int bool; | ^~~~~~~ ``` --- pkgs/by-name/xv/xvidcore/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/xv/xvidcore/package.nix b/pkgs/by-name/xv/xvidcore/package.nix index 6d73196e83ab..061ef905754b 100644 --- a/pkgs/by-name/xv/xvidcore/package.nix +++ b/pkgs/by-name/xv/xvidcore/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, yasm, autoconf, @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf"; }; + patches = [ + # Fix build with gcc15 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/xvidcore/raw/95382dbe529e5589a727fffceb620b0a89ff55f2/f/xvidcore-c23.patch"; + hash = "sha256-bGwWNmXIEIIw4Tc7lrMZ4jnhcQ+uKAsxL6fuAOosMVA="; + }) + ]; + preConfigure = '' # Configure script is not in the root of the source directory cd build/generic From d37a0bc69a69bc850b70a80fde352922f92cdc03 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Thu, 25 Sep 2025 15:47:26 +0300 Subject: [PATCH 009/542] xvidcore: cleanup - replace `rec` with `finalAttrs` - remove `with lib;` from `meta` - replace `sha256` with `hash` nix hash to-sri --type sha256 "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf" sha256-ruqulS1Ns5UkmDmjvQOEHWhEhD9aT4TCcf+I96oaz/c= --- pkgs/by-name/xv/xvidcore/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/xv/xvidcore/package.nix b/pkgs/by-name/xv/xvidcore/package.nix index 061ef905754b..05711bf2e003 100644 --- a/pkgs/by-name/xv/xvidcore/package.nix +++ b/pkgs/by-name/xv/xvidcore/package.nix @@ -9,13 +9,13 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xvidcore"; version = "1.3.7"; src = fetchurl { - url = "https://downloads.xvid.com/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf"; + url = "https://downloads.xvid.com/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-ruqulS1Ns5UkmDmjvQOEHWhEhD9aT4TCcf+I96oaz/c="; }; patches = [ @@ -69,14 +69,14 @@ stdenv.mkDerivation rec { ln -s $out/bin/*.dll $out/lib ''; - meta = with lib; { + meta = { description = "MPEG-4 video codec for PC"; homepage = "https://www.xvid.com/"; - license = licenses.gpl2; - maintainers = with maintainers; [ + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ codyopel lovek323 ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) From f70bacb428f63378f1f360ed291dd6f718046316 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 16 Sep 2025 19:24:06 +0300 Subject: [PATCH 010/542] liblqr1: fix build with gcc15 - add "-std=gnu17" to `env.NIX_CFLAGS_COMPILE`, most updates upstream were in 2017 or before. Fixes build failure with gcc15: ``` lqr_energy.c:452:1: error: conflicting types for 'lqr_carver_generate_rcache_bright'; have 'gdouble *(LqrCarver *)' {aka 'double *(struct _LqrCarver *)'} 452 | lqr_carver_generate_rcache_bright(LqrCarver *r) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from ../lqr/lqr_energy.h:27, from lqr_energy.c:32: ../lqr/lqr_energy_priv.h:59:10: note: previous declaration of 'lqr_carver_generate_rcache_bright' with type 'gdouble *(void)' {aka 'double *(void)'} 59 | gdouble *lqr_carver_generate_rcache_bright(); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ lqr_energy.c:471:1: error: conflicting types for 'lqr_carver_generate_rcache_luma'; have 'gdouble *(LqrCarver *)' {aka 'double *(struct _LqrCarver *)'} 471 | lqr_carver_generate_rcache_luma(LqrCarver *r) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ... ``` --- pkgs/by-name/li/liblqr1/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/liblqr1/package.nix b/pkgs/by-name/li/liblqr1/package.nix index 8ab47058aef9..74b72c976ccf 100644 --- a/pkgs/by-name/li/liblqr1/package.nix +++ b/pkgs/by-name/li/liblqr1/package.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { sha256 = "10mrl5k3l2hxjhz4w93n50xwywp6y890rw2vsjcgai8627x5f1df"; }; + # Fix build with gcc15 + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glib ]; From 6c435188e7a7feaffd6b750bb69b8ee0842e4398 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Fri, 26 Sep 2025 00:22:51 +0300 Subject: [PATCH 011/542] liblqr1: cleanup - replace `rec` with `finalAttrs` - remove `with lib;` from `meta` - replace `sha256` with `hash` nix hash to-sri --type sha256 "10mrl5k3l2hxjhz4w93n50xwywp6y890rw2vsjcgai8627x5f1df" sha256-rgVX+hEGRfWY1FvwDBLy5nLPOyh2JE4+lB0KOmahuYI= --- pkgs/by-name/li/liblqr1/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/li/liblqr1/package.nix b/pkgs/by-name/li/liblqr1/package.nix index 74b72c976ccf..b6737fb2306f 100644 --- a/pkgs/by-name/li/liblqr1/package.nix +++ b/pkgs/by-name/li/liblqr1/package.nix @@ -6,7 +6,7 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblqr-1"; version = "0.4.2"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "carlobaldassi"; repo = "liblqr"; - rev = "v${version}"; - sha256 = "10mrl5k3l2hxjhz4w93n50xwywp6y890rw2vsjcgai8627x5f1df"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rgVX+hEGRfWY1FvwDBLy5nLPOyh2JE4+lB0KOmahuYI="; }; # Fix build with gcc15 @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glib ]; - meta = with lib; { + meta = { homepage = "http://liblqr.wikidot.com"; description = "Seam-carving C/C++ library called Liquid Rescaling"; - platforms = platforms.all; - license = with licenses; [ + platforms = lib.platforms.all; + license = with lib.licenses; [ gpl3 lgpl3 ]; }; -} +}) From 0787680945b55a7d1ba2b62b9eea207d18ecde9b Mon Sep 17 00:00:00 2001 From: Moinak Bhattacharyya Date: Sat, 27 Sep 2025 21:37:21 -0500 Subject: [PATCH 012/542] python3Packages.pytest-xdist: Disable test_workqueue_ordered_by_input Test fails consistently when building for znver5. So, disable it for now. --- pkgs/development/python-modules/pytest-xdist/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 3fd5f57fc93c..3fffa80f6616 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -62,6 +62,8 @@ buildPythonPackage rec { "test_internal_errors_propagate_to_controller" # https://github.com/pytest-dev/pytest-xdist/issues/985 "test_workqueue_ordered_by_size" + # https://github.com/pytest-dev/pytest-xdist/issues/1248 + "test_workqueue_ordered_by_input" ]; setupHook = ./setup-hook.sh; From 2632d3e217e6b2d79c6541919996c75f696998ee Mon Sep 17 00:00:00 2001 From: ghpzin Date: Wed, 1 Oct 2025 15:11:10 +0300 Subject: [PATCH 013/542] cyrus_sasl: fix build with gcc15 - add patch from fedora that combines merged upstream PR: https://www.github.com/cyrusimap/cyrus-sasl/pull/869 with extra fixes for md5 that was removed upstream on master: https://www.github.com/cyrusimap/cyrus-sasl/pull/789 Fixes build failure with gcc15: ``` md5.c:139:8: error: too many arguments to function 'MD5_memcpy'; expected 0, have 3 139 | MD5_memcpy | ^~~~~~~~~~ 140 | ((POINTER)&context->buffer[index], (POINTER)input, partLen); MD5Transform | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ md5.c:62:13: note: declared here 62 | static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int)); | ^~~~~~~~~~ md5.c:140:69: error: too many arguments to function 'MD5Transform'; expected 0, have 2 140 | ((POINTER)&context->buffer[index], (POINTER)input, partLen); MD5Transform | ^~~~~~~~~~~~ 141 | (context->state, context->buffer); | ~~~~~~~~~~~~~~ md5.c:57:13: note: declared here 57 | static void MD5Transform PROTO_LIST ((UINT4 [4], const unsigned char [64])); | ^~~~~~~~~~~~ ``` --- pkgs/by-name/cy/cyrus_sasl/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cy/cyrus_sasl/package.nix b/pkgs/by-name/cy/cyrus_sasl/package.nix index c6dc04e136f3..bb2ea8c196ac 100644 --- a/pkgs/by-name/cy/cyrus_sasl/package.nix +++ b/pkgs/by-name/cy/cyrus_sasl/package.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation rec { url = "https://github.com/cyrusimap/cyrus-sasl/compare/cb549ef71c5bb646fe583697ebdcaba93267a237...dfaa62392e7caecc6ecf0097b4d73738ec4fc0a8.patch"; hash = "sha256-pc0cZqj1QoxDqgd/j/5q3vWONEPrTm4Pr6MzHlfjRCc="; }) + # Fix build with gcc15 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/cyrus-sasl/raw/388b80c6a8f93667587b4ac2e7992d0aa1c431f9/f/cyrus-sasl-2.1.28-gcc15.patch"; + hash = "sha256-AfSQXFtVh0IHG8Uw9nWMWlkQnyaX3ZMsdZLd7hTru7Q="; + }) ]; outputs = [ From 5a23a56feb82ea3d9de6c30455bb245bcb321087 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Sat, 11 Oct 2025 17:07:03 +0200 Subject: [PATCH 014/542] makeBinaryWrapper: If prefix/suffix already exists, remove the original This is mostly meant for `wrapQtApps`, which is why it's implemented only for `makeBinaryWrapper`. Qt apps are often launched on top of each other, creating a problem: many of the paths in `XDG_DATA_PATHS`, `QT_PLUGIN_PATH` and `NIXPKGS_QT6_QML_IMPORT_PATH` become duplicated, and these envars are already massive by themselves without this problem. Starting KDE Plasma, and most paths are seen twice. Open Konsole, and it becomes three times. If it was opened with CTRL+ALT+T, four times. Why is this a problem? - The more these paths are duplicated, the slower it becomes to copy the envars, and for the programs to parse them. - Some programs are buggy and malfunction if the environment variable block is too big. For instance, the EA App (via Wine) is unable to launch games if there are more than 32768 characters in the block, a number easily surpassable due to this problem. - It's ugly typing `env` and seeing this massive wall of duplicated paths. Because there is no reason for the same path to appear multiple times, this change removes a path if it's already in the list, adding it back to the start or the end. --- .../makeBinaryWrapper/make-binary-wrapper.sh | 93 ++++++++++++++++--- 1 file changed, 78 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh index c860048d10a2..74e72dc859e5 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh +++ b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh @@ -89,7 +89,7 @@ makeDocumentedCWrapper() { # ARGS: same as makeWrapper makeCWrapper() { local argv0 inherit_argv0 n params cmd main flags executable length - local uses_prefix uses_suffix uses_assert uses_assert_success uses_stdio uses_asprintf + local uses_sep_surround_check uses_prefix uses_suffix uses_assert uses_assert_success uses_stdio uses_asprintf local flagsBefore=() flagsAfter=() executable=$(escapeStringLiteral "$1") params=("$@") @@ -122,9 +122,11 @@ makeCWrapper() { --prefix) cmd=$(setEnvPrefix "${params[n + 1]}" "${params[n + 2]}" "${params[n + 3]}") main="$main$cmd"$'\n' + uses_sep_surround_check=1 uses_prefix=1 uses_asprintf=1 uses_stdio=1 + uses_string=1 uses_assert_success=1 uses_assert=1 n=$((n + 3)) @@ -133,9 +135,11 @@ makeCWrapper() { --suffix) cmd=$(setEnvSuffix "${params[n + 1]}" "${params[n + 2]}" "${params[n + 3]}") main="$main$cmd"$'\n' + uses_sep_surround_check=1 uses_suffix=1 uses_asprintf=1 uses_stdio=1 + uses_string=1 uses_assert_success=1 uses_assert=1 n=$((n + 3)) @@ -208,6 +212,7 @@ makeCWrapper() { [ -z "$uses_stdio" ] || printf '%s\n' "#include " [ -z "$uses_string" ] || printf '%s\n' "#include " [ -z "$uses_assert_success" ] || printf '\n%s\n' "#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)" + [ -z "$uses_sep_surround_check" ] || printf '\n%s\n' "$(setSepSurroundCheck)" [ -z "$uses_prefix" ] || printf '\n%s\n' "$(setEnvPrefixFn)" [ -z "$uses_suffix" ] || printf '\n%s\n' "$(setEnvSuffixFn)" [ -z "$resolve_argv0" ] || printf '\n%s\n' "$(resolveArgv0Fn)" @@ -318,18 +323,59 @@ assertValidEnvName() { esac } +setSepSurroundCheck() { + printf '%s' "\ +int is_surrounded_by_sep(char *env, char *ptr, unsigned long len, char *sep) { + unsigned long sep_len = strlen(sep); + + // Check left side (if not at start) + if (env != ptr) { + if (ptr - env < sep_len) + return 0; + if (strncmp(sep, ptr - sep_len, sep_len) != 0) { + return 0; + } + } + // Check right side (if not at end) + char *end_ptr = ptr + len; + if (*end_ptr != '\0') { + if (strncmp(sep, ptr + len, sep_len) != 0) { + return 0; + } + } + + return 1; +} +" +} + setEnvPrefixFn() { printf '%s' "\ void set_env_prefix(char *env, char *sep, char *prefix) { - char *existing = getenv(env); - if (existing) { - char *val; - assert_success(asprintf(&val, \"%s%s%s\", prefix, sep, existing)); - assert_success(setenv(env, val, 1)); - free(val); + char *existing_env = getenv(env); + if (existing_env) { + char *val; + + char *existing_prefix = strstr(existing_env, prefix); + unsigned long prefix_len = strlen(prefix); + // If the prefix already exists, remove the original + if (existing_prefix && is_surrounded_by_sep(existing_env, existing_prefix, prefix_len, sep)) { + if (existing_env == existing_prefix) { + return; + } + unsigned long sep_len = strlen(sep); + int n_before = existing_prefix - existing_env; + assert_success(asprintf(&val, \"%s%s%.*s%s\", prefix, sep, + n_before, existing_env, + existing_prefix + prefix_len + sep_len)); } else { - assert_success(setenv(env, prefix, 1)); + assert_success(asprintf(&val, \"%s%s%s\", prefix, sep, existing_env)); } + assert_success(setenv(env, val, 1)); + free(val); + } else { + assert_success(setenv(env, prefix, 1)); + } } " } @@ -337,15 +383,32 @@ void set_env_prefix(char *env, char *sep, char *prefix) { setEnvSuffixFn() { printf '%s' "\ void set_env_suffix(char *env, char *sep, char *suffix) { - char *existing = getenv(env); - if (existing) { - char *val; - assert_success(asprintf(&val, \"%s%s%s\", existing, sep, suffix)); - assert_success(setenv(env, val, 1)); - free(val); + char *existing_env = getenv(env); + if (existing_env) { + char *val; + + char *existing_suffix = strstr(existing_env, suffix); + unsigned long suffix_len = strlen(suffix); + // If the suffix already exists, remove the original + if (existing_suffix && is_surrounded_by_sep(existing_env, existing_suffix, suffix_len, sep)) { + char *end_ptr = existing_suffix + suffix_len; + if (*end_ptr == '\0') { + return; + } + unsigned long sep_len = strlen(sep); + int n_before = existing_suffix - existing_env; + assert_success(asprintf(&val, \"%.*s%s%s%s\", + n_before, existing_env, + existing_suffix + suffix_len + sep_len, + sep, suffix)); } else { - assert_success(setenv(env, suffix, 1)); + assert_success(asprintf(&val, \"%s%s%s\", existing_env, sep, suffix)); } + assert_success(setenv(env, val, 1)); + free(val); + } else { + assert_success(setenv(env, suffix, 1)); + } } " } From 815c877d4e3c21dcafa33e34b6238ba1bc4c9592 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Oct 2025 21:42:07 +0100 Subject: [PATCH 015/542] nasm: 2.16.03 -> 3.01 Changes: - https://www.nasm.us/docs/3.00/nasmac.html - https://www.nasm.us/docs/3.01/nasmac.html --- pkgs/by-name/na/nasm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nasm/package.nix b/pkgs/by-name/na/nasm/package.nix index 03b359c9c9a7..1c9b11ea7378 100644 --- a/pkgs/by-name/na/nasm/package.nix +++ b/pkgs/by-name/na/nasm/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "nasm"; - version = "2.16.03"; + version = "3.01"; src = fetchurl { url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-FBKhx2C70F2wJrbA0WV6/9ZjHNCmPN229zzG1KphYUg="; + hash = "sha256-tzJMvobnZ7ZfJvRn7YsSrYDhJOPMuJB2hVyY5Dqe3dQ="; }; nativeBuildInputs = [ perl ]; From a7db283d9d99f43bd80599a70fb4298f95f5e14e Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 14 Oct 2025 01:14:39 -0700 Subject: [PATCH 016/542] gpgme: 1.24.3 -> 2.0.1 --- pkgs/development/libraries/gpgme/default.nix | 6 ++-- .../test_t-verify_double-plaintext.patch | 31 ------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 383e6e2184c4..2b3c7d93d853 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.24.3"; + version = "2.0.1"; outputs = [ "out" @@ -33,12 +33,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnupg/gpgme/gpgme-${version}.tar.bz2"; - hash = "sha256-v8F/W9GxeMhkn92RiVbSdwgPM98Aai3ECs3s3OaMUN0="; + hash = "sha256-ghqwaVyELqtRdSqBmAySsEEMfq3QQQP3kdXSpSZ4SWY="; }; patches = [ - # Fix a test after disallowing compressed signatures in gpg (PR #180336) - ./test_t-verify_double-plaintext.patch # Don't use deprecated LFS64 APIs (removed in musl 1.2.4) # https://dev.gnupg.org/D600 ./LFS64.patch diff --git a/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch b/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch deleted file mode 100644 index 8f866af0da91..000000000000 --- a/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/tests/gpg/t-verify.c -+++ b/tests/gpg/t-verify.c -@@ -304,7 +304,7 @@ - err = gpgme_data_new (&text); - fail_if_err (err); - err = gpgme_op_verify (ctx, sig, NULL, text); -- if (gpgme_err_code (err) != GPG_ERR_BAD_DATA) -+ if (gpgme_err_code (err) == GPG_ERR_NO_ERROR) - { - fprintf (stderr, "%s:%i: Double plaintext message not detected\n", - PGM, __LINE__); ---- a/lang/python/tests/t-verify.py -+++ b/lang/python/tests/t-verify.py -@@ -142,7 +142,7 @@ - c.op_verify(sig, None, text) - except Exception as e: - assert type(e) == gpg.errors.GPGMEError -- assert e.getcode() == gpg.errors.BAD_DATA -+ assert e.getcode() != gpg.errors.NO_ERROR - else: - assert False, "Expected an error but got none." - -@@ -178,7 +178,7 @@ - try: - c.verify(double_plaintext_sig) - except gpg.errors.GPGMEError as e: -- assert e.getcode() == gpg.errors.BAD_DATA -+ assert e.getcode() != gpg.errors.NO_ERROR - else: - assert False, "Expected an error but got none." - From 9e6e5635fa756616446d9810d23ffc748b9dbeba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 02:00:51 +0000 Subject: [PATCH 017/542] cacert: 3.115 -> 3.117 --- pkgs/by-name/ca/cacert/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix index 281b77a8a922..8df8d1d51bd9 100644 --- a/pkgs/by-name/ca/cacert/package.nix +++ b/pkgs/by-name/ca/cacert/package.nix @@ -23,7 +23,7 @@ let lib.concatStringsSep "\n\n" extraCertificateStrings ); - srcVersion = "3.115"; + srcVersion = "3.117"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -47,7 +47,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM"; - hash = "sha256-8PeFeaIOtjBZJLBx3ONwZlK5SaLnjKEFoZWvVsu/3tA="; + hash = "sha256-sAs0TiV3TK/WtgHvEjl2KFAgebyWZYmcRcmxjpn2AME="; }; dontBuild = true; From 91b2fd86f34997c8842fa8fa1bf1251100292a34 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 16 Sep 2025 20:21:59 +0300 Subject: [PATCH 018/542] unixODBCDrivers.sqlite: fix build with gcc15 - add patch from fedora fixing incompatible-pointer-types errors. Fixes build failure with gcc15: ``` sqlite3odbc.c:4521:24: error: assignment to 'void (*)(void)' from incompatible pointer type 'void (*)(char **)' [-Wincompatible-pointer-types] 4521 | s->rowfree = freerows; | ^ sqlite3odbc.c:2185:1: note: 'freerows' declared here 2185 | freerows(char **rowp) | ^~~~~~~~ sqlite3odbc.c: In function 'drvtableprivileges': sqlite3odbc.c:6173:24: error: assignment to 'void (*)(void)' from incompatible pointer type 'void (*)(char **)' [-Wincompatible-pointer-types] 6173 | s->rowfree = sqlite3_free_table; | ^ In file included from sqlite3odbc.h:49, from sqlite3odbc.c:25: /nix/store/w3ibvzff0yrpg8abrl8n2fxn0d9fpfpc-sqlite-3.50.2-dev/include/sqlite3.h:3144:17: note: 'sqlite3_free_table' declared here 3144 | SQLITE_API void sqlite3_free_table(char **result); | ^~~~~~~~~~~~~~~~~~ sqlite3odbc.c: In function 'drvprimarykeys': sqlite3odbc.c:6593:16: error: assignment to 'void (*)(void)' from incompatible pointer type 'void (*)(char **)' [-Wincompatible-pointer-types] 6593 | s->rowfree = freerows; | ^ ``` --- pkgs/development/libraries/unixODBCDrivers/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index fbef1b9ce460..9c6b657d0ee2 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,5 +1,6 @@ { config, + fetchpatch, fetchurl, stdenv, unixODBC, @@ -111,6 +112,15 @@ sha256 = "0dgsj28sc7f7aprmdd0n5a1rmcx6pv7170c8dfjl0x1qsjxim6hs"; }; + patches = [ + # Fix build with gcc15 + (fetchpatch { + name = "sqlite-connector-odbc-fix-incompatible-pointer-compilation-error.patch"; + url = "https://src.fedoraproject.org/rpms/sqliteodbc/raw/e3d93f5909c884fd8846b36b71ba67a3ad65da2a/f/sqliteodbc-0.99991-Fix-incompatible-pointer-compilation-error.patch"; + hash = "sha256-IAZDujEkAyU40sKa4GC+upURNt7vplCDAx91Eeny+bU="; + }) + ]; + buildInputs = [ unixODBC sqlite From 36dba6e1cc010b3b47b00e55eefecbb6d9e182d0 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 21 Oct 2025 16:20:17 +0300 Subject: [PATCH 019/542] qt6.wrapQtAppsHook: don't include qtwayland The base windowing integration for Wayland lives in qtbase now, and qtwayland only provides libadwaita decorations, which are only relevant on GNOME-likes without server-side decoration support, and should probably be installed by the appropriate modules. --- doc/languages-frameworks/qt.section.md | 10 +--------- pkgs/by-name/dr/drawpile/package.nix | 7 +------ pkgs/by-name/li/libarchive-qt/package.nix | 2 +- pkgs/by-name/li/linyaps/package.nix | 2 +- pkgs/by-name/qx/qxmpp/package.nix | 2 +- pkgs/development/libraries/qt-6/default.nix | 15 +-------------- .../libraries/qt-6/hooks/qtbase-setup-hook.sh | 5 ++--- 7 files changed, 8 insertions(+), 35 deletions(-) diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index dbd08fb58718..bd1652d9effb 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -25,15 +25,7 @@ stdenv.mkDerivation { The same goes for Qt 5 where libraries and tools are under `libsForQt5`. -Any Qt package should include `wrapQtAppsHook` or `wrapQtAppsNoGuiHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. - -::: {.note} - -`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` on platforms that support it, to allow applications to act as native Wayland clients. It should be used for all graphical applications. - -`wrapQtAppsNoGuiHook` does not propagate `qtwayland` to reduce closure size for purely command-line applications. - -::: +Any Qt package should include `wrapQtAppsHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. ## Packages supporting multiple Qt versions {#qt-versions} diff --git a/pkgs/by-name/dr/drawpile/package.nix b/pkgs/by-name/dr/drawpile/package.nix index 5863b9f75087..a874cd9e26af 100644 --- a/pkgs/by-name/dr/drawpile/package.nix +++ b/pkgs/by-name/dr/drawpile/package.nix @@ -83,12 +83,7 @@ stdenv.mkDerivation rec { extra-cmake-modules rustc rustPlatform.cargoSetupHook - ( - if buildClient || buildServerGui then - qt6Packages.wrapQtAppsHook - else - qt6Packages.wrapQtAppsNoGuiHook - ) + qt6Packages.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/li/libarchive-qt/package.nix b/pkgs/by-name/li/libarchive-qt/package.nix index 0286a374fba3..03b024ecb8f3 100644 --- a/pkgs/by-name/li/libarchive-qt/package.nix +++ b/pkgs/by-name/li/libarchive-qt/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - qt6.wrapQtAppsNoGuiHook + qt6.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix index 0feed2bdd45e..d1d4301520e4 100644 --- a/pkgs/by-name/li/linyaps/package.nix +++ b/pkgs/by-name/li/linyaps/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { cmake copyDesktopItems pkg-config - qt6Packages.wrapQtAppsNoGuiHook + qt6Packages.wrapQtAppsHook ]; postInstall = '' diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index a35ced9b5764..58b66c77ffd7 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - kdePackages.wrapQtAppsNoGuiHook + kdePackages.wrapQtAppsHook ] ++ lib.optionals (withGstreamer || withOmemo) [ pkg-config diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 2236001ad901..69381ff13e23 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -131,20 +131,6 @@ let makeSetupHook { name = "wrap-qt6-apps-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; - depsTargetTargetPropagated = [ - (onlyPluginsAndQml qtbase) - ] - ++ lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [ - (onlyPluginsAndQml qtwayland) - ]; - } ./hooks/wrap-qt-apps-hook.sh - ) { }; - - wrapQtAppsNoGuiHook = callPackage ( - { makeBinaryWrapper, qtbase }: - makeSetupHook { - name = "wrap-qt6-apps-no-gui-hook"; - propagatedBuildInputs = [ makeBinaryWrapper ]; depsTargetTargetPropagated = [ (onlyPluginsAndQml qtbase) ]; @@ -164,6 +150,7 @@ let } // lib.optionalAttrs config.allowAliases { full = throw "qt6.full has been removed. Please use individual packages instead."; # Added 2025-10-21 + wrapQtAppsNoGuiHook = lib.warn "wrapQtAppsNoGuiHook is deprecated, use wrapQtAppsHook instead" self.wrapQtAppsHook; }; baseScope = makeScopeWithSplicing' { diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 44e48db7dad8..c70bf22759de 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -77,11 +77,10 @@ else # Only set up Qt once. fi qtPreHook() { - # Check that wrapQtAppsHook/wrapQtAppsNoGuiHook is used, or it is explicitly disabled. + # Check that wrapQtAppsHook is used, or it is explicitly disabled. if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then echo >&2 "Error: this derivation depends on qtbase, but no wrapping behavior was specified." - echo >&2 " - If this is a graphical application, add wrapQtAppsHook to nativeBuildInputs" - echo >&2 " - If this is a CLI application, add wrapQtAppsNoGuiHook to nativeBuildInputs" + echo >&2 " - If this is an application, add wrapQtAppsHook to nativeBuildInputs" echo >&2 " - If this is a library or you need custom wrapping logic, set dontWrapQtApps = true" exit 1 fi From 5425b309461e1d7b72252fd48b50a01f8f04da37 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Sat, 25 Oct 2025 16:25:16 -0700 Subject: [PATCH 020/542] libbluray: 1.3.4 -> 1.4.0 This updates libbluray from version 1.3.4 to the latest v1.4.0. This change is a bit more consequential than a typical version bump because the underlying project switched from building with autotools to building with meson in this release. Also, the underlying project is now compatible with JDK 21, so the JDK version has been bumped. Unfortunately, stable libbluray is not yet compatible with JDK 25 (changes that should hopefully make this work have been merged to their mainline branch, but as of yet, no release has been made). This change also introduces a new alternate version of libbluray into nixpkgs, `libbluray-full`, which adds in all of the optional dependencies, such as Java and libaacs. Nearly ten years ago, these dependencies were removed from the default version of the package because eelco didn't appreciate that a JDK was being installed on his system, thus inflating the his closure. Although it is outside the scope of this change, adding a "full" version of libbluray to nixpkgs should allow downstream packages to consume it in the future and provide users with full blu-ray support without having to build many of their packages from scratch. --- pkgs/by-name/li/libbluray-full/package.nix | 8 +++++ pkgs/by-name/li/libbluray/package.nix | 34 ++++++++++++++-------- 2 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 pkgs/by-name/li/libbluray-full/package.nix diff --git a/pkgs/by-name/li/libbluray-full/package.nix b/pkgs/by-name/li/libbluray-full/package.nix new file mode 100644 index 000000000000..ee6459ee568b --- /dev/null +++ b/pkgs/by-name/li/libbluray-full/package.nix @@ -0,0 +1,8 @@ +{ + callPackage, +}: +callPackage ../libbluray/package.nix { + withAACS = true; + withBDplus = true; + withJava = true; +} diff --git a/pkgs/by-name/li/libbluray/package.nix b/pkgs/by-name/li/libbluray/package.nix index b65ebdf349e3..34e40ef20c62 100644 --- a/pkgs/by-name/li/libbluray/package.nix +++ b/pkgs/by-name/li/libbluray/package.nix @@ -1,12 +1,14 @@ { lib, + callPackage, stdenv, fetchurl, pkg-config, fontconfig, - autoreconfHook, + meson, + ninja, withJava ? false, - jdk17, + jdk21_headless, # Newer JDK's depend on a release with a fix for https://code.videolan.org/videolan/libbluray/-/issues/46 ant, stripJavaArchivesHook, withAACS ? false, @@ -24,19 +26,20 @@ stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.3.4"; + version = "1.4.0"; src = fetchurl { - url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys="; + url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-d5N7rwfq3aSysxHPOvTFAmnS6jFlBB9YQ9lkdsTJJ3c="; }; nativeBuildInputs = [ + meson + ninja pkg-config - autoreconfHook ] ++ lib.optionals withJava [ - jdk17 + jdk21_headless ant stripJavaArchivesHook ]; @@ -49,15 +52,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional withAACS libaacs; - env.JAVA_HOME = lib.optionalString withJava jdk17.home; # Fails at runtime without this + env.JAVA_HOME = lib.optionalString withJava jdk21_headless.home; # Fails at runtime without this env.NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs" + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus"; - configureFlags = - lib.optional (!withJava) "--disable-bdjava-jar" - ++ lib.optional (!withMetadata) "--without-libxml2" - ++ lib.optional (!withFonts) "--without-freetype"; + mesonFlags = + lib.optional (!withJava) "-Dbdj_jar=disabled" + ++ lib.optional (!withMetadata) "-dlibxml2=disabled" + ++ lib.optional (!withFonts) "-Dfreetype=disabled"; meta = with lib; { homepage = "http://www.videolan.org/developers/libbluray.html"; @@ -66,4 +69,11 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = platforms.unix; }; + + passthru = { + tests = { + # Verify the "full" package when verifying changes to this package + full = callPackage ../libbluray-full/package.nix { }; + }; + }; } From 7d9466e53a0bd4e70f11ac4f4999b67040430d4c Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Sat, 25 Oct 2025 21:14:02 -0700 Subject: [PATCH 021/542] Refactor variant package structure --- pkgs/by-name/li/libbluray-full/package.nix | 8 -------- pkgs/by-name/li/libbluray/package.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 pkgs/by-name/li/libbluray-full/package.nix diff --git a/pkgs/by-name/li/libbluray-full/package.nix b/pkgs/by-name/li/libbluray-full/package.nix deleted file mode 100644 index ee6459ee568b..000000000000 --- a/pkgs/by-name/li/libbluray-full/package.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - callPackage, -}: -callPackage ../libbluray/package.nix { - withAACS = true; - withBDplus = true; - withJava = true; -} diff --git a/pkgs/by-name/li/libbluray/package.nix b/pkgs/by-name/li/libbluray/package.nix index 34e40ef20c62..8a4a77a4f974 100644 --- a/pkgs/by-name/li/libbluray/package.nix +++ b/pkgs/by-name/li/libbluray/package.nix @@ -71,9 +71,16 @@ stdenv.mkDerivation rec { }; passthru = { + variants = { + full = callPackage ./package.nix { + withAACS = true; + withBDplus = true; + withJava = true; + }; + }; tests = { # Verify the "full" package when verifying changes to this package - full = callPackage ../libbluray-full/package.nix { }; + full = passthru.variants.full; }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0667cce2eda9..39587892f86c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7284,6 +7284,8 @@ with pkgs; } ); + libbluray-full = libbluray.variants.full; + mtrace = callPackage ../development/libraries/glibc/mtrace.nix { }; # Provided by libc on Operating Systems that use the Extensible Linker Format. From 49b34078432cdd02e5cbd15166ec70fde7086cda Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 3 Nov 2025 07:10:35 +0100 Subject: [PATCH 022/542] haskell.packages.ghc94.haskell-language-server: fix ref to config --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index e26f612d821e..fe58bea65f88 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -138,7 +138,7 @@ self: super: { path = self.path_0_9_5; haskell-language-server = - lib.throwIf config.allowAliases + lib.throwIf pkgs.config.allowAliases "haskell-language-server has dropped support for ghc 9.4 in version 2.12.0.0, please use a newer ghc version or an older nixpkgs" (markBroken super.haskell-language-server); From 8afb0778bb8f035bb19a61010a030cccb09025e4 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 3 Nov 2025 23:50:04 +0100 Subject: [PATCH 023/542] shadow: Patch minimisation and comments --- .../sh/shadow/fix-install-with-tcb.patch | 30 +++++-------------- pkgs/by-name/sh/shadow/package.nix | 4 +++ 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch b/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch index ff6166b92f1d..33d90fe1e48e 100644 --- a/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch +++ b/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch @@ -1,28 +1,12 @@ diff --git a/src/Makefile.am b/src/Makefile.am -index a1a2e4e..fa17f9d 100644 +index 6981815..bcc4568 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -74,10 +74,6 @@ suidubins += newgidmap newuidmap - endif - endif - --if WITH_TCB --shadowsgidubins = passwd --endif -- - LDADD = $(INTLLIBS) \ - $(top_builddir)/libmisc/libmisc.la \ - $(top_builddir)/lib/libshadow.la \ -@@ -146,12 +142,6 @@ install-am: all-am - set -e; for i in $(suidusbins); do \ - chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \ +@@ -152,7 +152,6 @@ install-am: all-am done --if WITH_TCB -- set -e; for i in $(shadowsgidubins); do \ + if WITH_TCB + set -e; for i in $(shadowsgidubins); do \ - chown root:shadow $(DESTDIR)$(ubindir)/$$i; \ -- chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \ -- done --endif - if ENABLE_SUBIDS - if FCAPS - setcap cap_setuid+ep $(DESTDIR)$(ubindir)/newuidmap + chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \ + done + endif diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 72681d81eae0..dc31417b6a3e 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -68,9 +68,13 @@ stdenv.mkDerivation rec { ++ lib.optional withTcb tcb; patches = [ + # Don't set $PATH to /bin:/usr/bin but inherit the $PATH of the caller. ./keep-path.patch # Obtain XML resources from XML catalog (patch adapted from gtk-doc) ./respect-xml-catalog-files-var.patch + # Avoid a chown during install to fix installation with tcb enabled + # Would have to be done as part of the NixOS modules, + # see https://github.com/NixOS/nixpkgs/issues/109457 ./fix-install-with-tcb.patch ]; From 8077c9f0b4bae51f91c45ad9aafb4b4e4747f442 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 4 Nov 2025 00:52:25 +0100 Subject: [PATCH 024/542] shadow: Run unit tests --- pkgs/by-name/sh/shadow/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index dc31417b6a3e..96acc8a0efe3 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -19,6 +19,7 @@ libbsd, withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb, + cmocka, }: let glibc' = @@ -108,6 +109,11 @@ stdenv.mkDerivation rec { substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc'.bin}/bin/nscd ''; + doCheck = true; + nativeCheckInputs = [ + cmocka + ]; + postInstall = '' # Move the su binary into the su package mkdir -p $su/bin @@ -129,6 +135,7 @@ stdenv.mkDerivation rec { passthru = { shellPath = "/bin/nologin"; + # TODO: Run system tests: https://github.com/shadow-maint/shadow/blob/master/doc/contributions/tests.md#system-tests tests = { inherit (nixosTests) shadow; }; }; } From 650612cf2ddae788572f14e9fa0ffef2aeb3edc3 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Tue, 4 Nov 2025 23:24:20 +0100 Subject: [PATCH 025/542] python3Packages.joblib: 1.5.1 -> 1.5.2 https://github.com/joblib/joblib/issues/1478 seems to be fixed --- pkgs/development/python-modules/joblib/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 4959b53e2283..0914e3ad3020 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "joblib"; - version = "1.5.1"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9PhuNR85/j0NMqnyw9ivHuTOwoWq/LJwA92lIFV2tEQ="; + hash = "sha256-P6pcOQVLLwPKVH2psvUv3mfAYkDDGFPzBq6pfxNke1U="; }; nativeBuildInputs = [ setuptools ]; @@ -53,11 +53,6 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. - ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # deprecation warnings with python3.12 https://github.com/joblib/joblib/issues/1478 - "test_main_thread_renamed_no_warning" - "test_background_thread_parallelism" ]; meta = with lib; { From cec0eeb81d8ca2dc771d8a7bfcfdd97eac261545 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 07:49:09 +0000 Subject: [PATCH 026/542] harfbuzz: 12.1.0 -> 12.2.0 --- pkgs/by-name/ha/harfbuzz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix index 3742ae131312..68b43989ea5e 100644 --- a/pkgs/by-name/ha/harfbuzz/package.nix +++ b/pkgs/by-name/ha/harfbuzz/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "12.1.0"; + version = "12.2.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-5cgbf24LEC37AAz6QkU4uOiWq3ii9Lil7IyuYqtDNp4="; + hash = "sha256-7LYDqkJqiyRmVxhme9pkqEwVBNt0VO5Mrb02Lupk5UU="; }; postPatch = '' From 6786a51737ac4190cb794e9ce43e40523e6a48a7 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Tue, 4 Nov 2025 19:09:55 +0000 Subject: [PATCH 027/542] haskellPackages.proto3-suite: fix build (cherry picked from commit 02b355acd2a813b00ddfb496ab6c872392fbdc81) --- .../haskell-modules/configuration-common.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2037e2a07b9c..d31e2e788679 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2979,9 +2979,19 @@ with haskellLib; # 2024-07-27: building test component requires non-trivial custom build steps # https://github.com/awakesecurity/proto3-suite/blob/bec9d40e2767143deed5b2d451197191f1d8c7d5/nix/overlays/haskell-packages.nix#L311 + # Hackage release trails a good deal behind master proto3-suite = lib.pipe super.proto3-suite [ - dontCheck # Hackage release trails a good deal behind master + dontCheck doJailbreak + (overrideSrc { + version = "0.9.0-unstable-2025-04-10"; + src = pkgs.fetchFromGitHub { + owner = "awakesecurity"; + repo = "proto3-suite"; + rev = "24bb3f9c6c83b4ecc31783fa5a8fa4406e6ef0d8"; + hash = "sha256-009UNd1rEg/wDCCxReQWhPwHaONwlB6l6qoIPR0mVBU="; + }; + }) ]; # Tests require docker From 0ecf9024b78cea449e2a2ada83fc10b919d3eb02 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 4 Nov 2025 10:44:57 +0100 Subject: [PATCH 028/542] haskellPackages.duckdb-ffi: mark as broken I've decided to wait on upstream feedback on https://github.com/Tritlo/duckdb-haskell/issues/2 before trying to get it to build again. (cherry picked from commit 3c9a1a34c8e0229fc542c43497cb4423778b3c56) --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + .../configuration-hackage2nix/transitive-broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 3 files changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 9ce84609b518..1bab28281090 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1508,6 +1508,7 @@ broken-packages: - dtw # failure in job https://hydra.nixos.org/build/233198932 at 2023-09-02 - dual # failure in job https://hydra.nixos.org/build/252724683 at 2024-03-16 - dualizer # failure in job https://hydra.nixos.org/build/233237592 at 2023-09-02 + - duckdb-ffi # failure in job https://hydra.nixos.org/build/311300709, https://github.com/Tritlo/duckdb-haskell/issues/2 - duckling # failure in job https://hydra.nixos.org/build/233247880 at 2023-09-02 - duet # failure in job https://hydra.nixos.org/build/233219004 at 2023-09-02 - dump-core # failure in job https://hydra.nixos.org/build/233244428 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 291a82523ce9..b03d66e0fbe4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -810,6 +810,7 @@ dont-distribute-packages: - dsmc-tools - DSTM - dtd + - duckdb-simple - Dust - Dust-crypto - Dust-tools diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b3b5f4c230c2..85cb7460a388 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -205093,6 +205093,8 @@ self: { ]; description = "Haskell FFI bindings for DuckDB"; license = lib.licensesSpdx."MPL-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { inherit (pkgs) duckdb; }; @@ -205176,6 +205178,7 @@ self: { ]; description = "Haskell FFI bindings for DuckDB"; license = lib.licensesSpdx."MPL-2.0"; + hydraPlatforms = lib.platforms.none; } ) { }; From 5e86707c12ec85099f22dea998a6bf9b46dc2683 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 3 Nov 2025 09:22:01 +0100 Subject: [PATCH 029/542] haskell.packages.ghc96.haskell-language-server: fix build This dependency is only needed for the "plugin-tutorial" executable. This is only built with GHC 9.6 and 9.8, but the expression is created with GHC 9.10. Thus add the missing dependency. It would be better to just disable that tutorial, but I didn't find a quick way of doing that - toggling the related flag did not work. This only fixed the build for GHC 9.6 for me, GHC 9.8 failed with a different error right after. (cherry picked from commit a36931ccf2c4a5d146c5617708ad199276e2547a) --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 1 + pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 987897276982..5c2be32d1d5e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -220,6 +220,7 @@ in haskell-language-server = addBuildDepends [ self.retrie self.floskell + self.markdown-unlit ] super.haskell-language-server; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 58e801c64ba9..01f9d43a269f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -124,6 +124,7 @@ in haskell-language-server = addBuildDepends [ self.retrie self.floskell + self.markdown-unlit ] super.haskell-language-server; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; From eb05db8dfe90d3071ff873d74492a28729add29e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 3 Nov 2025 09:24:10 +0100 Subject: [PATCH 030/542] haskell.packages.ghc98.haskell-language-server: fix build It was complaining about different versions of some regex dependency in the closure, the differing one introduced by hls-plugin-api. GHC 9.6 didn't fail that way, but I figured such a change can't hurt either, for consistency. (cherry picked from commit 7f8ab22df9c6e9ffb088e3e6b2edd387df9a9b10) --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 ++ pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 5c2be32d1d5e..41b81b6ba15f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -222,6 +222,7 @@ in self.floskell self.markdown-unlit ] super.haskell-language-server; + hls-plugin-api = super.hls-plugin-api; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; retrie = doJailbreak (unmarkBroken super.retrie); @@ -232,6 +233,7 @@ in floskell fourmolu haskell-language-server + hls-plugin-api hlint ormolu retrie diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 01f9d43a269f..8b430b143451 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -126,6 +126,7 @@ in self.floskell self.markdown-unlit ] super.haskell-language-server; + hls-plugin-api = super.hls-plugin-api; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; retrie = doJailbreak (unmarkBroken super.retrie); @@ -136,6 +137,7 @@ in floskell fourmolu haskell-language-server + hls-plugin-api hlint ormolu retrie From 5a47da47b2412a3df39864f9b6843b607e3638fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 08:50:36 -0800 Subject: [PATCH 031/542] python3Packages.python-dotenv: 1.1.1 -> 1.2.1 Diff: https://github.com/theskumar/python-dotenv/compare/v1.1.1...v1.2.1 Changelog: https://github.com/theskumar/python-dotenv/blob/v1.2.1/CHANGELOG.md --- .../python-modules/python-dotenv/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 44e978008bdf..88832f7b6f1a 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -4,7 +4,6 @@ click, fetchFromGitHub, ipython, - mock, pytestCheckHook, setuptools, sh, @@ -12,32 +11,35 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "1.1.1"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "theskumar"; repo = "python-dotenv"; tag = "v${version}"; - hash = "sha256-GeN6/pnqhm7TTP+H9bKhJat6EwEl2EPl46mNSJWwFKk="; + hash = "sha256-YOwe/MHIyGdt6JqiwXwYi1cYxyPkGsBdUhjoG2Ks0y0="; }; build-system = [ setuptools ]; - dependencies = [ click ]; + optional-dependencies.cli = [ click ]; nativeCheckInputs = [ ipython - mock pytestCheckHook sh - ]; + ] + ++ lib.flatten (lib.attrValues optional-dependencies); - disabledTests = [ "cli" ]; + preCheck = '' + export PATH="$out/bin:$PATH" + ''; pythonImportsCheck = [ "dotenv" ]; meta = with lib; { + changelog = "https://github.com/theskumar/python-dotenv/blob/${src.tag}/CHANGELOG.md"; description = "Add .env support to your django/flask apps in development and deployments"; mainProgram = "dotenv"; homepage = "https://github.com/theskumar/python-dotenv"; From 89b60dff6b1ea8a2d9301280248dac79de340082 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 6 Nov 2025 20:48:48 +0100 Subject: [PATCH 032/542] postgrest: 14.0 -> 14.1 Release Notes: https://github.com/PostgREST/postgrest/releases/tag/v14.1 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d31e2e788679..79dab6bf1588 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2806,12 +2806,12 @@ with haskellLib; doJailbreak # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { - version = "14.0"; + version = "14.1"; src = pkgs.fetchFromGitHub { owner = "PostgREST"; repo = "postgrest"; rev = "v${version}"; - hash = "sha256-GokYeVDuVdIbowU6xE3l8iaGbH4jnpqQFy/E+sb/Unw="; + hash = "sha256-VGmo0Y8Q86euPlu3AhMmcmy3rintNy6s9efpUaliBWY="; }; }) ]; From 5eaddf6110afa1059374c747762d5ed0632e3f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 19:47:02 -0800 Subject: [PATCH 033/542] brotli: 1.1.0 -> 1.2.0 Diff: https://github.com/google/brotli/compare/v1.1.0...v1.2.0 Changelog: https://github.com/google/brotli/blob/v1.2.0/CHANGELOG.md --- pkgs/by-name/br/brotli/package.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/br/brotli/package.nix b/pkgs/by-name/br/brotli/package.nix index 6cebf122e1bb..ccca97f35f08 100644 --- a/pkgs/by-name/br/brotli/package.nix +++ b/pkgs/by-name/br/brotli/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, python3Packages, staticOnly ? stdenv.hostPlatform.isStatic, @@ -11,26 +10,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "brotli"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v${finalAttrs.version}"; - hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-kl8ZHt71v17QR2bDP+ad/5uixf+GStEPLQ5ooFoC5i8="; }; - patches = [ - # revert runpath change, breaks curl on darwin: - # https://github.com/NixOS/nixpkgs/pull/254532#issuecomment-1722337476 - (fetchpatch { - name = "revert-runpath.patch"; - url = "https://github.com/google/brotli/commit/f842c1bcf9264431cd3b15429a72b7dafbe80509.patch"; - hash = "sha256-W3LY3EjoHP74YsKOOcYQrzo+f0HbooOvEbnOibtN6TM="; - revert = true; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; @@ -60,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/google/brotli"; + changelog = "https://github.com/google/brotli/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "General-purpose lossless compression library with CLI"; longDescription = '' Brotli is a generic-purpose lossless compression algorithm that From 142b4e6c73b1b8112a1ec01bb12bee6abc137a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 19:55:50 -0800 Subject: [PATCH 034/542] python3Packages.brotli: inherit src from brotli --- pkgs/development/python-modules/brotli/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index fb78ead78779..6746fb5707fa 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -10,18 +10,9 @@ buildPythonPackage rec { pname = "brotli"; - version = "1.2.0"; + inherit (brotli) version src; pyproject = true; - src = fetchFromGitHub { - owner = "google"; - repo = "brotli"; - tag = "v${version}"; - hash = "sha256-ePfllKdY12hOPuO9uHuXFZ3Bdib6BLD4ghiaeurJZ28="; - # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data - forceFetchGit = true; - }; - build-system = [ pkgconfig setuptools From 4e23776b2c1c1f25557859674365105731bdac48 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Thu, 6 Nov 2025 23:00:41 -0800 Subject: [PATCH 035/542] tornado: 6.5.1 -> 6.5.2 --- pkgs/development/python-modules/tornado/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 0d0787591b4c..b9e5d416433c 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "tornado"; - version = "6.5.1"; + version = "6.5.2"; pyproject = true; src = fetchFromGitHub { owner = "tornadoweb"; repo = "tornado"; tag = "v${version}"; - hash = "sha256-CtmIjPKxKC0T8PGQW1wIAJm/+XxMzZXVZyZxV56sZME="; + hash = "sha256-jy/HnMY459yZX3HW9V61/ZSSanCJEZakBU/2pocGc/s="; }; build-system = [ setuptools ]; @@ -38,14 +38,6 @@ buildPythonPackage rec { # additional tests that have extra dependencies, run slowly, or produce more output than a simple pass/fail # https://github.com/tornadoweb/tornado/blob/v6.2.0/maint/test/README "maint/test" - - # AttributeError: 'TestIOStreamWebMixin' object has no attribute 'io_loop' - "tornado/test/iostream_test.py" - ]; - - disabledTests = [ - # Exception: did not get expected log message - "test_unix_socket_bad_request" ]; pythonImportsCheck = [ "tornado" ]; From a8dc15d05572c5f5d2229ab13e8d36a63dae09af Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Thu, 6 Nov 2025 23:03:48 -0800 Subject: [PATCH 036/542] tornado: cleanup --- pkgs/development/python-modules/tornado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index b9e5d416433c..ea2ba29af13b 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -59,10 +59,10 @@ buildPythonPackage rec { ; }; - meta = with lib; { + meta = { description = "Web framework and asynchronous networking library"; homepage = "https://www.tornadoweb.org/"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; }; } From 4383842c65815d8013836b634ba6136ef73526c6 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Thu, 6 Nov 2025 22:25:24 -0800 Subject: [PATCH 037/542] aws-lambda-builders: 1.58.0 -> 1.59.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 15c3effda6f2..bb3af219dee8 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.58.0"; + version = "1.59.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; tag = "v${version}"; - hash = "sha256-rscE6eiJ2lbI/U20YRmcUj21PdB9nXpjfyBvu+msC/A="; + hash = "sha256-US8NHNEvYlYJMurXjvlySIdKIgKjAwIws8PmnPF0J6Q="; }; postPatch = '' From 6f88c4e5ec6291ea8346d88d09cfb1fb23da6bf7 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Thu, 6 Nov 2025 22:26:05 -0800 Subject: [PATCH 038/542] ruamel-yaml: 0.18.14 -> 0.18.16 --- pkgs/development/python-modules/ruamel-yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index 4096a930e5bf..b6e8c6dfb66d 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.18.14"; + version = "0.18.16"; pyproject = true; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - hash = "sha256-cie3aq7DZN8Vk2cw7799crMMC3mx1Xi7uOPcstgfUrc="; + hash = "sha256-puWHUS88mYsiJdaKofNREcKfrRSu1WGibnP6tynsXlo="; }; nativeBuildInputs = [ setuptools ]; From 3ea6ede42462222794c7f922a3e9b9ddac1a75d4 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Thu, 6 Nov 2025 22:27:09 -0800 Subject: [PATCH 039/542] aws-sam-cli: 1.143.0 -> 1.146.0 --- pkgs/by-name/aw/aws-sam-cli/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix index 9b4e30277552..45b08ababf82 100644 --- a/pkgs/by-name/aw/aws-sam-cli/package.nix +++ b/pkgs/by-name/aw/aws-sam-cli/package.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.143.0"; + version = "1.146.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-sam-cli"; tag = "v${version}"; - hash = "sha256-QnJQ45ucziHmOkQdAT29szOljBExiIXZ2zvhiKYXBxI="; + hash = "sha256-b0nXhhgQgV0TZ0PGYexKxsb1s7PIe+5dqjOWJiVlWJY="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -82,6 +82,12 @@ python3.pkgs.buildPythonApplication rec { xray ]); + # Remove after upstream bumps click > 8.1.8 + postPatch = '' + substituteInPlace requirements/base.txt --replace-fail \ + 'click==8.1.8' 'click==${python3.pkgs.click.version}' + ''; + postFixup = '' # Disable telemetry: https://github.com/aws/aws-sam-cli/issues/1272 wrapProgram $out/bin/sam \ @@ -125,7 +131,9 @@ python3.pkgs.buildPythonApplication rec { "tests/unit/lib/observability/cw_logs/" "tests/unit/lib/build_module/" # Disable flaky tests - "tests/unit/lib/samconfig/test_samconfig.py" + "tests/unit/cli/test_main.py" + "tests/unit/commands/samconfig/test_samconfig.py" + "tests/unit/local/docker/test_lambda_image.py" ]; disabledTests = [ From 8b161e7479c9c3d2cd1a445160aae765f7d8998a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 4 Nov 2025 00:52:56 +0100 Subject: [PATCH 040/542] shadow: Disable failing unit test --- pkgs/by-name/sh/shadow/disable-xaprintf-test.patch | 14 ++++++++++++++ pkgs/by-name/sh/shadow/package.nix | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/by-name/sh/shadow/disable-xaprintf-test.patch diff --git a/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch b/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch new file mode 100644 index 000000000000..bdf45af1d604 --- /dev/null +++ b/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch @@ -0,0 +1,14 @@ +diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am +index 6e94318..dca18bb 100644 +--- a/tests/unit/Makefile.am ++++ b/tests/unit/Makefile.am +@@ -10,8 +10,7 @@ check_PROGRAMS = \ + test_snprintf \ + test_strncpy \ + test_strtcpy \ +- test_typetraits \ +- test_xaprintf ++ test_typetraits + + if ENABLE_LOGIND + check_PROGRAMS += \ diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 96acc8a0efe3..16d8a74adb7e 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -77,6 +77,9 @@ stdenv.mkDerivation rec { # Would have to be done as part of the NixOS modules, # see https://github.com/NixOS/nixpkgs/issues/109457 ./fix-install-with-tcb.patch + # This unit test fails: https://github.com/shadow-maint/shadow/issues/1382 + # Can be removed after the next release + ./disable-xaprintf-test.patch ]; postPatch = '' From 20dcfcaa82e44595454828028c4d2039531962e6 Mon Sep 17 00:00:00 2001 From: Marcel Date: Sun, 9 Nov 2025 18:19:24 +0100 Subject: [PATCH 041/542] python313Packages.pyroute2: 0.9.4 -> 0.9.5 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index b501bddec5df..14d79a8d2bd0 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "svinota"; repo = "pyroute2"; tag = version; - hash = "sha256-D603ZrLbc/6REx6X0bMvZzeyo0fgTsFL7J+iRTiQLgQ="; + hash = "sha256-KPXDXRQWonuTyy1SsvgO7jXjawiRj1XJ3zte5ZHanRw="; }; build-system = [ setuptools ]; From 2662c1b5384bdabc464acf4b3b6d4039743880bd Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sun, 9 Nov 2025 19:38:10 -0600 Subject: [PATCH 042/542] resholve: 0.10.6 -> 0.10.7 Non-source changes: - drops `bash -n` style syntax checking for writeScript(Bin) to avoid breaking cross builds - add postResholve hook (supersedes unmerged pr #439997) - track testing changes in resholve --- pkgs/development/misc/resholve/resholve-utils.nix | 9 +++------ pkgs/development/misc/resholve/source.nix | 4 ++-- pkgs/development/misc/resholve/test.nix | 11 +++++++++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix index cdcb11219875..995e732631bd 100644 --- a/pkgs/development/misc/resholve/resholve-utils.nix +++ b/pkgs/development/misc/resholve/resholve-utils.nix @@ -200,9 +200,6 @@ rec { ) )) } - '' - + lib.optionalString (partialSolution.interpreter != "none") '' - ${partialSolution.interpreter} -n $out ''; }; writeScriptBin = @@ -220,9 +217,6 @@ rec { } ) )} - '' - + lib.optionalString (partialSolution.interpreter != "none") '' - ${partialSolution.interpreter} -n $out/bin/${name} ''; }; mkDerivation = @@ -232,6 +226,7 @@ rec { version, passthru ? { }, solutions, + postResholve ? "", ... }@attrs: let @@ -286,6 +281,8 @@ rec { # LOGLEVEL="INFO"; preFixup = phraseSolutions solutions unresholved; + postFixup = postResholve; + # don't break the metadata... meta = unresholved.meta; } diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix index d3a10f305231..89277dee7e03 100644 --- a/pkgs/development/misc/resholve/source.nix +++ b/pkgs/development/misc/resholve/source.nix @@ -4,11 +4,11 @@ }: rec { - version = "0.10.6"; + version = "0.10.7"; rSrc = fetchFromGitHub { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-iJEkfW60QO4nFp+ib2+DeDRsZviYFhWRQoBw1VAhzJY="; + hash = "sha256-aUhxaxniGcmFAawUTXa5QrWUSpw5NUoJO5y4INk5mQU="; }; } diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index f97ab53efb12..6aec0ca4bc7a 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -25,6 +25,7 @@ rlwrap, gnutar, bc, + systemd, # override testing esh, getconf, @@ -49,7 +50,6 @@ nix-direnv, pdf2odt, pdfmm, - rancid, s0ix-selftest-tool, unix-privesc-check, wgnord, @@ -77,6 +77,9 @@ let gnutar bc msmtp + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + systemd ]; in rec { @@ -158,6 +161,9 @@ rec { inputs = [ ]; }; }; + postResholve = '' + echo "not a load-bearing test, just prove we exist" + ''; }; # demonstrate that we could use resholve in larger build module3 = stdenv.mkDerivation { @@ -219,6 +225,8 @@ rec { INTERP = "${bash}/bin/bash"; checkPhase = '' + echo removing parse tests matching no${stdenv.buildPlatform.uname.system} + rm tests/parse_*no${stdenv.buildPlatform.uname.system}.sh || true # ok if none exist patchShebangs . mkdir empty_lore touch empty_lore/{execers,wrappers} @@ -338,7 +346,6 @@ rec { // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit arch-install-scripts; inherit dgoss; - inherit rancid; inherit unix-privesc-check; inherit wgnord; inherit wsl-vpnkit; From 5a80601f9795a42d12c6358a3fa10c025df79046 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 11 Nov 2025 10:51:27 +0100 Subject: [PATCH 043/542] haskellPackages: stackage LTS 24.16 -> LTS 24.19 all-cabal-hashes: 2025-10-22T21:20:29Z -> 2025-11-11T08:13:55Z (generated by maintainers/scripts/haskell/update-package-set.sh) haskellPackages.cabal2nix-unstable: 2025-10-31 -> 2025-11-11 This eliminates the need for 2f1f72d5a2ea8d96f5ba200567815cb6d43d79f3. --- pkgs/data/misc/hackage/pin.json | 8 +- .../cabal2nix-unstable/cabal2nix.nix | 6 +- .../distribution-nixpkgs.nix | 6 +- .../cabal2nix-unstable/hackage-db.nix | 6 +- .../cabal2nix-unstable/language-nix.nix | 6 +- .../configuration-hackage2nix/stackage.yaml | 60 +- .../haskell-modules/hackage-packages.nix | 8630 +++++++++++++++-- 7 files changed, 7817 insertions(+), 905 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index c14222511324..5e277a04f768 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "598216fa2815cc50449239d72043b12a04a83709", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/598216fa2815cc50449239d72043b12a04a83709.tar.gz", - "sha256": "030yfbdzzdsxfjin97kl1kzqqnvkvjvjfns3p84xkq59fw8096cr", - "msg": "Update from Hackage at 2025-10-22T21:20:29Z" + "commit": "919b0d78e660eb496f9b2d0adb6dd7cfb1b64535", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/919b0d78e660eb496f9b2d0adb6dd7cfb1b64535.tar.gz", + "sha256": "0vjq2aq1wk2i2k2d54sl1ang3gmzcfnx1fv8jvxg50i246dnydrz", + "msg": "Update from Hackage at 2025-11-11T08:13:55Z" } diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix index 8e72a9cd0691..dc82033beeef 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix @@ -35,10 +35,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "2.20.1-unstable-2025-10-31"; + version = "2.20.1-unstable-2025-11-11"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz"; - sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z"; + url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; + sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix index aec2e430ae4e..00afd0bb28c4 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix @@ -18,10 +18,10 @@ }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.7.1.1-unstable-2025-10-31"; + version = "1.7.1.1-unstable-2025-11-11"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz"; - sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z"; + url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; + sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; }; postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot"; enableSeparateDataOutput = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix index 34cb94b054c7..2ad97d7259df 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix @@ -17,10 +17,10 @@ }: mkDerivation { pname = "hackage-db"; - version = "2.1.3-unstable-2025-10-31"; + version = "2.1.3-unstable-2025-11-11"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz"; - sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z"; + url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; + sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; }; postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix index 4bb491849207..d0e04dc856ab 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix @@ -13,10 +13,10 @@ }: mkDerivation { pname = "language-nix"; - version = "2.3.0-unstable-2025-10-31"; + version = "2.3.0-unstable-2025-11-11"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz"; - sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z"; + url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; + sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; }; postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index ae01db0b82d4..38f65b7ddb40 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 24.16 +# Stackage LTS 24.19 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -53,12 +53,12 @@ default-package-overrides: - alsa-core ==0.5.0.1 - alsa-mixer ==0.3.0.1 - alsa-pcm ==0.6.1.1 - - alsa-seq ==0.6.0.9 + - alsa-seq ==0.6.0.10 - alternative-vector ==0.0.0 - alternators ==1.0.0.0 - ALUT ==2.4.0.3 - amqp ==0.24.0 - - amqp-utils ==0.6.7.2 + - amqp-utils ==0.6.7.3 - annotated-exception ==0.3.0.4 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==1.1.3 @@ -168,7 +168,7 @@ default-package-overrides: - beam-core ==0.10.4.0 - beam-migrate ==0.5.3.2 - beam-postgres ==0.5.4.4 - - beam-sqlite ==0.5.4.1 + - beam-sqlite ==0.5.5.0 - bech32 ==1.1.9 - bech32-th ==1.1.9 - bench ==1.0.13 @@ -225,13 +225,13 @@ default-package-overrides: - bloodhound ==0.23.0.1 - bloomfilter ==2.0.1.2 - bluefin ==0.0.17.1 - - bluefin-internal ==0.1.1.0 + - bluefin-internal ==0.1.2.0 - bm ==0.2.0.0 - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 - BNFC ==2.9.6.1 - BNFC-meta ==0.6.1 - - board-games ==0.4 + - board-games ==0.4.0.1 - bodhi ==0.1.0 - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 @@ -336,7 +336,7 @@ default-package-overrides: - cast ==0.1.0.2 - caster ==0.0.3.0 - cauldron ==0.9.0.1 - - cayley-client ==0.4.19.4 + - cayley-client ==0.4.19.5 - cborg ==0.2.10.0 - cborg-json ==0.2.6.0 - cdar-mBound ==0.1.0.4 @@ -374,8 +374,8 @@ default-package-overrides: - circle-packing ==0.1.0.6 - circular ==0.4.0.3 - citeproc ==0.9.0.1 - - clash-prelude ==1.8.3 - - clash-prelude-hedgehog ==1.8.3 + - clash-prelude ==1.8.4 + - clash-prelude-hedgehog ==1.8.4 - classy-prelude ==1.5.0.3 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 @@ -402,7 +402,7 @@ default-package-overrides: - cointracking-imports ==0.1.0.2 - collect-errors ==0.1.6.0 - colonnade ==1.2.0.2 - - Color ==0.4.0 + - Color ==0.4.1 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 - colour ==2.3.6 @@ -520,7 +520,7 @@ default-package-overrides: - crypton-pem ==0.3.0 - crypton-socks ==0.6.2 - crypton-x509 ==1.7.7 - - crypton-x509-store ==1.6.11 + - crypton-x509-store ==1.6.12 - crypton-x509-system ==1.6.7 - crypton-x509-validation ==1.6.14 - cryptonite ==0.30 @@ -600,7 +600,7 @@ default-package-overrides: - dejafu ==2.4.0.7 - delta-types ==1.0.0.0 - dense-linear-algebra ==0.1.0.0 - - dependent-map ==0.4.0.0 + - dependent-map ==0.4.0.1 - dependent-monoidal-map ==0.1.1.5 - dependent-sum ==0.7.2.0 - dependent-sum-aeson-orphans ==0.3.1.2 @@ -1311,7 +1311,7 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.10.1 - - hpack ==0.38.2 + - hpack ==0.38.3 - hpc-codecov ==0.6.3.0 - hpc-lcov ==1.2.0 - HPDF ==1.7 @@ -1543,7 +1543,7 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.2.2 - jalaali ==1.0.0.0 - - java-adt ==1.0.20231204 + - java-adt ==1.0.20251105 - jira-wiki-markup ==1.5.1 - jmacro ==0.6.18 - jose ==0.11 @@ -1594,7 +1594,7 @@ default-package-overrides: - knob ==0.2.2 - koji ==0.0.2 - koji-tool ==1.3 - - kvitable ==1.1.0.1 + - kvitable ==1.1.1.0 - labels ==0.3.3 - lackey ==2.0.0.11 - lambdabot-core ==5.3.1.2 @@ -1645,7 +1645,7 @@ default-package-overrides: - lens-properties ==4.11.1 - lens-regex ==0.1.3 - lens-regex-pcre ==1.1.2.0 - - lentil ==1.5.8.0 + - lentil ==1.5.9.1 - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5.1 - lexer-applicative ==2.1.0.2 @@ -1820,7 +1820,7 @@ default-package-overrides: - mmsyn7ukr-common ==0.3.1.0 - mnist-idx ==0.1.3.2 - mnist-idx-conduit ==0.4.0.0 - - mockcat ==0.5.3.0 + - mockcat ==0.5.5.0 - mockery ==0.3.5 - mod ==0.2.1.0 - modern-uri ==0.3.6.1 @@ -1916,7 +1916,7 @@ default-package-overrides: - n2o-nitro ==0.11.2 - nagios-check ==0.3.2 - named ==0.3.0.2 - - named-text ==1.2.1.0 + - named-text ==1.2.2.0 - names-th ==0.3.0.1 - nano-erl ==0.1.0.1 - NanoID ==3.4.1.1 @@ -2085,7 +2085,7 @@ default-package-overrides: - parallel ==3.2.2.0 - parallel-io ==0.3.5 - parameterized ==0.5.0.0 - - parameterized-utils ==2.1.10.0 + - parameterized-utils ==2.1.11.0 - paramtree ==0.1.2 - park-bench ==0.1.1.0 - parseargs ==0.2.0.9 @@ -2336,7 +2336,7 @@ default-package-overrides: - Ranged-sets ==0.5.0 - ranges ==0.2.4 - rank1dynamic ==0.4.3 - - rank2classes ==1.5.4 + - rank2classes ==1.5.5 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - rate-limit ==1.4.3 @@ -2378,7 +2378,7 @@ default-package-overrides: - refined ==0.8.2 - refined-containers ==0.1.2.0 - reflection ==2.1.9 - - reflex ==0.9.3.4 + - reflex ==0.9.4.0 - reflex-dom-core ==0.8.1.4 - reflex-fsnotify ==0.3.0.2 - reflex-gadt-api ==0.2.2.3 @@ -2439,7 +2439,7 @@ default-package-overrides: - rio-orphans ==0.1.2.0 - rio-prettyprint ==0.1.8.0 - rng-utils ==0.3.1 - - roc-id ==0.2.0.5 + - roc-id ==0.2.0.6 - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.7 - rocksdb-query ==0.4.3 @@ -2459,7 +2459,7 @@ default-package-overrides: - run-st ==0.1.3.3 - runmemo ==1.0.0.1 - rvar ==0.3.0.2 - - rzk ==0.7.6 + - rzk ==0.7.7 - s-cargot ==0.1.6.0 - s3-signer ==0.5.0.0 - safe ==0.3.21 @@ -2492,7 +2492,7 @@ default-package-overrides: - sandwich-webdriver ==0.3.0.1 - saturn ==1.0.0.9 - say ==0.1.0.1 - - sayable ==1.2.5.0 + - sayable ==1.2.6.0 - sbp ==6.2.2 - sbv ==11.7 - scalpel ==0.6.2.2 @@ -2701,7 +2701,7 @@ default-package-overrides: - stateWriter ==0.4.0 - static-bytes ==0.1.1 - static-text ==0.2.0.7 - - statistics ==0.16.3.0 + - statistics ==0.16.4.0 - statistics-linreg ==0.3 - statsd-rupp ==0.5.0.1 - status-notifier-item ==0.3.1.0 @@ -2733,7 +2733,7 @@ default-package-overrides: - streaming-attoparsec ==1.0.0.1 - streaming-binary ==0.3.0.1 - streaming-bytestring ==0.3.4 - - streaming-commons ==0.2.3.0 + - streaming-commons ==0.2.3.1 - streaming-wai ==0.1.1 - streamly ==0.10.1 - streamly-bytestring ==0.2.3 @@ -2831,7 +2831,7 @@ default-package-overrides: - tasty-ant-xml ==1.1.9 - tasty-autocollect ==0.4.4 - tasty-bench ==0.4.1 - - tasty-checklist ==1.0.6.0 + - tasty-checklist ==1.0.8.0 - tasty-dejafu ==2.1.0.2 - tasty-discover ==5.0.2 - tasty-expected-failure ==0.12.3 @@ -2853,7 +2853,7 @@ default-package-overrides: - tasty-rerun ==1.1.20 - tasty-silver ==3.3.2.1 - tasty-smallcheck ==0.8.2 - - tasty-sugar ==2.2.2.1 + - tasty-sugar ==2.2.3.1 - tasty-tap ==0.1.0 - tasty-th ==0.1.7 - tasty-wai ==0.1.2.0 @@ -3249,7 +3249,7 @@ default-package-overrides: - wl-pprint ==1.2.1 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-text ==1.2.0.2 - - wled-json ==0.1.0.0 + - wled-json ==0.1.0.1 - word-compat ==0.0.6 - word-trie ==0.3.0 - word-wrap ==0.5 @@ -3310,7 +3310,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.4.0 - yesod-bin ==1.6.2.3 - - yesod-core ==1.6.27.1 + - yesod-core ==1.6.28.1 - yesod-eventsource ==1.6.0.1 - yesod-form ==1.7.9 - yesod-form-bootstrap4 ==3.0.1.1 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 85cb7460a388..c7bf6dd5d6b6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5428,8 +5428,8 @@ self: { }: mkDerivation { pname = "CPL"; - version = "0.0.9"; - sha256 = "0pa0iqaflj8h0w3wcwrc27vmg4k7n0x8ck5sjscxvxdbbrwjg6z1"; + version = "0.1.0"; + sha256 = "1qn9cjw11rbkbqhv16y8wqkzkrfarxr1nr3d7byzlvi1sv7fg7x5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5441,7 +5441,7 @@ self: { readline ]; description = "An interpreter of Hagino's Categorical Programming Language (CPL)"; - license = lib.licenses.bsd3; + license = lib.licensesSpdx."BSD-3-Clause"; hydraPlatforms = lib.platforms.none; mainProgram = "cpl"; broken = true; @@ -6589,8 +6589,8 @@ self: { pname = "Chart"; version = "1.9.5"; sha256 = "0nyzdag9p56vknrphdnqjsf19fmw9abs81avdm2vjgh9cnw2y7hc"; - revision = "2"; - editedCabalFile = "1a9z8an5yhsqbawzahmg77g9l6jvavhxbk2v48k4j8fyr7sy544q"; + revision = "3"; + editedCabalFile = "06cz0giahpfl3ardb0xrc474w39y9lb279i5lb4q43rn0hk64mmj"; libraryHaskellDepends = [ array base @@ -7468,59 +7468,6 @@ self: { ) { IL = null; }; Color = callPackage ( - { - mkDerivation, - base, - colour, - criterion, - data-default-class, - deepseq, - hspec, - hspec-discover, - HUnit, - JuicyPixels, - massiv, - massiv-test, - QuickCheck, - random, - vector, - }: - mkDerivation { - pname = "Color"; - version = "0.4.0"; - sha256 = "1pnvfzrqilfbxkifmp5r9m0ys06lmmhdfnskib7cc22lifg85q3x"; - libraryHaskellDepends = [ - base - data-default-class - deepseq - vector - ]; - testHaskellDepends = [ - base - colour - hspec - HUnit - JuicyPixels - massiv - massiv-test - QuickCheck - random - vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base - colour - criterion - deepseq - random - ]; - description = "Color spaces and conversions between them"; - license = lib.licenses.bsd3; - } - ) { }; - - Color_0_4_1 = callPackage ( { mkDerivation, base, @@ -7570,7 +7517,6 @@ self: { ]; description = "Color spaces and conversions between them"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -27251,6 +27197,55 @@ self: { } ) { }; + LR-demo = callPackage ( + { + mkDerivation, + alex, + array, + base, + BNFC, + Cabal, + containers, + happy, + microlens, + microlens-th, + mtl, + process, + string-qq, + transformers, + }: + mkDerivation { + pname = "LR-demo"; + version = "0.0.20251105"; + sha256 = "1ys1pniwcx7lgah6scs6i7cx6mk6glpxdifxkhrvcrfm10lhzfs0"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ + base + Cabal + process + ]; + libraryHaskellDepends = [ + array + base + containers + microlens + microlens-th + mtl + string-qq + transformers + ]; + libraryToolDepends = [ + alex + BNFC + happy + ]; + description = "LALR(1) parsetable generator and interpreter"; + license = lib.licensesSpdx."BSD-3-Clause"; + mainProgram = "lr-demo"; + } + ) { }; + LRU = callPackage ( { mkDerivation, @@ -49580,8 +49575,8 @@ self: { }: mkDerivation { pname = "ac-library-hs"; - version = "1.5.3.0"; - sha256 = "059b54g043b5a8zszavdzw8s8pgiz6zi6qzi7zjdyi2vlxam6v6l"; + version = "1.5.3.1"; + sha256 = "1iifgwy2m6dqk61lp7jd9qvcdk6j6bmmp9y5bscvmyb2n95lvwp5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51443,6 +51438,31 @@ self: { } ) { }; + acid-state-events = callPackage ( + { + mkDerivation, + acid-state, + base, + containers, + stm, + time, + }: + mkDerivation { + pname = "acid-state-events"; + version = "0.1.0.0"; + sha256 = "1zynj87768ak4jn7ibyab7hscawfqh6jjm9i7d1v766skqvzrg40"; + libraryHaskellDepends = [ + acid-state + base + containers + stm + time + ]; + description = "Generic event bus for acid-state applications"; + license = lib.licenses.mit; + } + ) { }; + acid-state-tls = callPackage ( { mkDerivation, @@ -59726,8 +59746,8 @@ self: { }: mkDerivation { pname = "alignment"; - version = "0.1.0.4"; - sha256 = "0579myc2fr0ksbsykyl6bw2v204vmvmkyc4phgm8dnmh921zchpz"; + version = "0.1.0.6"; + sha256 = "1s1x3vlvgqdslqpzsw33s6if35kz2kd2kxkpc0sk5a443kzrhn9r"; libraryHaskellDepends = [ assoc base @@ -60395,49 +60415,6 @@ self: { ) { }; alsa-seq = callPackage ( - { - mkDerivation, - alsa-core, - alsa-lib, - array, - base, - bytestring, - data-accessor, - enumset, - extensible-exceptions, - poll, - transformers, - utility-ht, - }: - mkDerivation { - pname = "alsa-seq"; - version = "0.6.0.9"; - sha256 = "1kb5p95wrkp8rri9557mhmk09ib82mr34z7xy8kkr1fhrf1xnylf"; - revision = "1"; - editedCabalFile = "1xh10102dk7dxfbfzpbnakjv9cf5gq6nrn7x264hf3bwv5c7nrls"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - alsa-core - array - base - bytestring - data-accessor - enumset - extensible-exceptions - poll - transformers - utility-ht - ]; - libraryPkgconfigDepends = [ alsa-lib ]; - description = "Binding to the ALSA Library API (MIDI sequencer)"; - license = lib.licensesSpdx."BSD-3-Clause"; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.thielema ]; - } - ) { inherit (pkgs) alsa-lib; }; - - alsa-seq_0_6_0_10 = callPackage ( { mkDerivation, alsa-core, @@ -60474,7 +60451,6 @@ self: { description = "Binding to the ALSA Library API (MIDI sequencer)"; license = lib.licensesSpdx."BSD-3-Clause"; platforms = lib.platforms.linux; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; } ) { inherit (pkgs) alsa-lib; }; @@ -75432,8 +75408,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.6.7.2"; - sha256 = "0ypkx415bvd7rd5466df3c9rhplgirwr61c7dswkwwnjwnvvz85w"; + version = "0.6.7.3"; + sha256 = "07zyg9nx4icb8665q5c2n2cwnl9013h54kvy7xqy6d8vfjbdhwl7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78616,6 +78592,33 @@ self: { } ) { }; + apecs-brillo = callPackage ( + { + mkDerivation, + apecs, + apecs-physics, + base, + brillo, + containers, + linear, + }: + mkDerivation { + pname = "apecs-brillo"; + version = "0.1.0"; + sha256 = "0a0j74m6p6fnzagh5knlg9fn522ahr0ag4pgnssbl0lz4x2kwh13"; + libraryHaskellDepends = [ + apecs + apecs-physics + base + brillo + containers + linear + ]; + description = "Simple brillo renderer for apecs"; + license = lib.licenses.bsd3; + } + ) { }; + apecs-effectful = callPackage ( { mkDerivation, @@ -84364,6 +84367,85 @@ self: { } ) { }; + arxiv-client = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + directory, + megaparsec, + modern-uri, + req, + text, + time, + xml-conduit, + }: + mkDerivation { + pname = "arxiv-client"; + version = "0.1.0.1"; + sha256 = "1wi8k4qr1c4yjgr4rvqlcj4l5dw37m8hxwbssm772igfa5h739l5"; + libraryHaskellDepends = [ + aeson + base + bytestring + directory + megaparsec + modern-uri + req + text + time + xml-conduit + ]; + testHaskellDepends = [ + base + text + ]; + description = "Tiny client for the arXiv Atom API with a simple query DSL"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + arxiv-client-cli = callPackage ( + { + mkDerivation, + aeson, + arxiv-client, + base, + bytestring, + directory, + filepath, + megaparsec, + optparse-generic, + process, + text, + time, + }: + mkDerivation { + pname = "arxiv-client-cli"; + version = "0.1.0.0"; + sha256 = "0ky3hbra0fh795sj1ri2sm242bh5a6qqszxdibc8v3q28s275171"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson + arxiv-client + base + bytestring + directory + filepath + megaparsec + optparse-generic + process + text + time + ]; + description = "Command line tool to search and download papers from arXiv.org"; + license = lib.licensesSpdx."BSD-3-Clause"; + mainProgram = "arxiv-client-cli"; + } + ) { }; + asana = callPackage ( { mkDerivation, @@ -90158,6 +90240,137 @@ self: { } ) { }; + auto-export = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + directory, + ghc, + ghc-exactprint, + ghc-paths, + mtl, + process, + tasty, + tasty-hunit, + }: + mkDerivation { + pname = "auto-export"; + version = "0.1.0.0"; + sha256 = "11gv67h3kssqwfdgp00fg5gl0944k3524mmh9avihr0wpjmvswa5"; + libraryHaskellDepends = [ + base + bytestring + containers + ghc + ghc-exactprint + ghc-paths + mtl + ]; + testHaskellDepends = [ + base + directory + ghc + process + tasty + tasty-hunit + ]; + description = "Automatically add things to module export list"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + auto-extract = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + directory, + ghc, + ghc-exactprint, + ghc-paths, + process, + syb, + tasty, + tasty-hunit, + transformers, + }: + mkDerivation { + pname = "auto-extract"; + version = "0.1.0.0"; + sha256 = "124sb4wiwv684zhjj3lnmj6nv9yn0a1ps2zj91i6wfjb2h41lsri"; + libraryHaskellDepends = [ + base + bytestring + containers + ghc + ghc-exactprint + ghc-paths + syb + transformers + ]; + testHaskellDepends = [ + base + directory + ghc + process + tasty + tasty-hunit + ]; + description = "Extract code segment to top level function"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + auto-import = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + directory, + ghc, + ghc-boot, + ghc-exactprint, + ghc-paths, + megaparsec, + process, + tasty, + tasty-hunit, + text, + time, + }: + mkDerivation { + pname = "auto-import"; + version = "0.1.0.0"; + sha256 = "0cxvm10wvr6b16dpx3jd0j6n622yfsk4ksgajnqzpair38v19q2r"; + libraryHaskellDepends = [ + base + bytestring + containers + directory + ghc + ghc-boot + ghc-exactprint + ghc-paths + megaparsec + text + time + ]; + testHaskellDepends = [ + base + directory + process + tasty + tasty-hunit + ]; + description = "Automatically add import statements"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + auto-lift-classes = callPackage ( { mkDerivation, @@ -91404,8 +91617,8 @@ self: { }: mkDerivation { pname = "aviation-navigation"; - version = "0.1.0.0"; - sha256 = "17nb2ryrxdy3sv68cnbv7saw5k9wh9nyas74bpsyn0p8grw71sd5"; + version = "0.1.0.2"; + sha256 = "0wx5zf4bzflh8py3jmak1dhsk3yw0789kv3y6fkhvqd23vlfc8ai"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100385,73 +100598,6 @@ self: { ) { }; beam-sqlite = callPackage ( - { - mkDerivation, - aeson, - attoparsec, - base, - beam-core, - beam-migrate, - bytestring, - direct-sqlite, - dlist, - free, - hashable, - monad-control, - mtl, - network-uri, - scientific, - sqlite-simple, - tasty, - tasty-expected-failure, - tasty-hunit, - text, - time, - transformers-base, - }: - mkDerivation { - pname = "beam-sqlite"; - version = "0.5.4.1"; - sha256 = "1f5yjsx7zfbfbxs3xd64rwn2m3vjffrbdn5xadhm1axhghi6srki"; - revision = "2"; - editedCabalFile = "03j11sgmsaz80qvpb1r4j6zqdwya9gyi4rmlbhjl13wn3dzsf420"; - libraryHaskellDepends = [ - aeson - attoparsec - base - beam-core - beam-migrate - bytestring - direct-sqlite - dlist - free - hashable - monad-control - mtl - network-uri - scientific - sqlite-simple - text - time - transformers-base - ]; - testHaskellDepends = [ - base - beam-core - beam-migrate - sqlite-simple - tasty - tasty-expected-failure - tasty-hunit - text - time - ]; - description = "Beam driver for SQLite"; - license = lib.licenses.mit; - } - ) { }; - - beam-sqlite_0_5_5_0 = callPackage ( { mkDerivation, aeson, @@ -100513,7 +100659,6 @@ self: { ]; description = "Beam driver for SQLite"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -108866,8 +109011,8 @@ self: { }: mkDerivation { pname = "bitstream"; - version = "0.3.0.1"; - sha256 = "0hkgjmhw7gc6m3yyva097q0z7f1wixlmm1ja0gpg9qkgzx6piyf0"; + version = "0.3.0.2"; + sha256 = "1fz5dccb1v002jdigfi50j80knqmdwvgi1mjg37198qhfgmfyxyb"; libraryHaskellDepends = [ base base-unicode-symbols @@ -108882,7 +109027,7 @@ self: { vector ]; description = "Fast, packed, strict and lazy bit streams with stream fusion"; - license = lib.licenses.publicDomain; + license = lib.licensesSpdx."CC0-1.0"; hydraPlatforms = lib.platforms.none; broken = true; } @@ -112217,6 +112362,20 @@ self: { } ) { }; + bluefin_0_2_0_0 = callPackage ( + { mkDerivation, bluefin-internal }: + mkDerivation { + pname = "bluefin"; + version = "0.2.0.0"; + sha256 = "0kyzj5lr1w8r39mngsj8bf2bsqs3dxjirsmbkbk2zsldv9g0j210"; + libraryHaskellDepends = [ bluefin-internal ]; + description = "The Bluefin effect system"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + } + ) { }; + bluefin-algae = callPackage ( { mkDerivation, @@ -112231,6 +112390,8 @@ self: { pname = "bluefin-algae"; version = "0.1.0.2"; sha256 = "02g513vqn052qd41zm9brw8lf1ic4135mi8kr3s4w0721vm4nkhh"; + revision = "1"; + editedCabalFile = "00f43pckgra69gyrrpijfbyhqzz8pwqgj10gwn3lkwapxhamcqp5"; libraryHaskellDepends = [ base bluefin @@ -112260,8 +112421,8 @@ self: { }: mkDerivation { pname = "bluefin-contrib"; - version = "0.0.16.0"; - sha256 = "0pk7zqn9b6ka90l3n1xf9b84p4567gp2dv1ks6kcamzr3g4i4ww7"; + version = "0.2.0.0"; + sha256 = "0fqv8gjgxaa1jkfhvbcdwq18r1yhf0l8clr0w77vfizwj0425nqm"; libraryHaskellDepends = [ base bluefin @@ -112283,8 +112444,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.1.1.0"; - sha256 = "1s29a48hijimz919qlg3cmdzcs83jdnvzy77s6v15gsqjrwsvm0q"; + version = "0.1.2.0"; + sha256 = "1zprpah3syp7lr7j1i4fdhmphglfmlx3nxc9kjvmksaymss68bx8"; libraryHaskellDepends = [ async base @@ -112299,6 +112460,35 @@ self: { } ) { }; + bluefin-internal_0_2_0_0 = callPackage ( + { + mkDerivation, + async, + base, + monad-control, + transformers, + transformers-base, + unliftio-core, + }: + mkDerivation { + pname = "bluefin-internal"; + version = "0.2.0.0"; + sha256 = "0mc343qjbdjps66r9mjp0p0ki9lfqrhpfqk3vahwih4msvnrfc8j"; + libraryHaskellDepends = [ + async + base + monad-control + transformers + transformers-base + unliftio-core + ]; + testHaskellDepends = [ base ]; + description = "The Bluefin effect system, internals"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + bluefin-random = callPackage ( { mkDerivation, @@ -112308,8 +112498,8 @@ self: { }: mkDerivation { pname = "bluefin-random"; - version = "0.0.16.1"; - sha256 = "1kh5xgrwxqx4z0psk0wx8n5b7f3qq80jhzvifs5vry1l1irdj24a"; + version = "0.2.0.0"; + sha256 = "1kvhcz84gdpv0x4jmqi75i2l85kfkmsyp8vqpl39hgxwy1d8fmyf"; libraryHaskellDepends = [ base bluefin @@ -112707,105 +112897,6 @@ self: { ) { }; board-games = callPackage ( - { - mkDerivation, - array, - base, - boxes, - cgi, - combinatorial, - containers, - criterion, - doctest-exitcode-stdio, - doctest-lib, - enummapset, - explicit-exception, - haha, - html, - httpd-shed, - network-uri, - non-empty, - parallel, - QuickCheck, - random, - semigroups, - shell-utility, - transformers, - utility-ht, - }: - mkDerivation { - pname = "board-games"; - version = "0.4"; - sha256 = "05lrjgxdg836ik7ry5h9m9diirfc55086winssr9y0g6vbgbifpc"; - revision = "3"; - editedCabalFile = "1wawaq86bfn45hnfb6qv3ng4i8vvps914qhvbgmmx2p5lwmml21g"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array - base - boxes - cgi - combinatorial - containers - enummapset - explicit-exception - haha - html - non-empty - QuickCheck - random - semigroups - transformers - utility-ht - ]; - executableHaskellDepends = [ - array - base - cgi - containers - html - httpd-shed - network-uri - non-empty - random - shell-utility - transformers - utility-ht - ]; - testHaskellDepends = [ - array - base - containers - doctest-exitcode-stdio - doctest-lib - enummapset - non-empty - QuickCheck - random - transformers - utility-ht - ]; - benchmarkHaskellDepends = [ - base - containers - criterion - enummapset - non-empty - parallel - QuickCheck - random - transformers - utility-ht - ]; - description = "Three games for inclusion in a web server"; - license = "GPL"; - mainProgram = "board-games"; - maintainers = [ lib.maintainers.thielema ]; - } - ) { }; - - board-games_0_4_0_1 = callPackage ( { mkDerivation, array, @@ -112897,7 +112988,6 @@ self: { ]; description = "Three games for inclusion in a web server"; license = "GPL"; - hydraPlatforms = lib.platforms.none; mainProgram = "board-games"; maintainers = [ lib.maintainers.thielema ]; } @@ -123883,6 +123973,94 @@ self: { } ) { }; + cabal-debian_5_4_0 = callPackage ( + { + mkDerivation, + base, + Cabal, + containers, + data-default, + debian, + Diff, + directory, + exceptions, + filepath, + hsemail, + HUnit, + lens, + mtl, + network-uri, + optparse-applicative, + parsec, + pretty, + prettyprinter, + process, + pureMD5, + regex-tdfa, + syb, + text, + unix, + unliftio, + utf8-string, + }: + mkDerivation { + pname = "cabal-debian"; + version = "5.4.0"; + sha256 = "03ldl0bkqv11jgbz0bj6v02bh27nahnpq909xywjwn9syp2bmzqj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + Cabal + containers + data-default + debian + Diff + directory + exceptions + filepath + hsemail + HUnit + lens + mtl + network-uri + optparse-applicative + parsec + pretty + prettyprinter + process + pureMD5 + regex-tdfa + syb + text + unix + unliftio + utf8-string + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base + Cabal + containers + debian + Diff + directory + filepath + hsemail + HUnit + lens + pretty + process + text + ]; + description = "Create a Debianization for a Cabal package"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-debian"; + broken = true; + } + ) { }; + cabal-dependency-licenses = callPackage ( { mkDerivation, @@ -129803,8 +129981,8 @@ self: { pname = "capability"; version = "0.5.0.1"; sha256 = "0sksd42ywaq5av7a1h9y66pclsk1fd9qx46q38kgs3av88zhzqci"; - revision = "5"; - editedCabalFile = "1gqrc6gql8jfgblx8v9v352a51lj5mnw41hk66cgq269ywsg8igs"; + revision = "6"; + editedCabalFile = "1yfcp0scpnfmfdl1ypab89k25301nvxf34k6a1qnlvddr3f0yi6d"; libraryHaskellDepends = [ base constraints @@ -130529,10 +130707,8 @@ self: { }: mkDerivation { pname = "cardano-addresses"; - version = "4.0.0"; - sha256 = "13cvazmshy3j9c53g7i8pd4fmh6mgiajhaf42cf2d353pjjxr1w4"; - revision = "1"; - editedCabalFile = "1alyswv1d4q616vikwyv35ycxlz73qa7w602y43iba2g953823xv"; + version = "4.0.1"; + sha256 = "0s9m54v5rfy1h0d75a59v6lqaqi2j827wh29x2xk83i3kks2arv2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131174,8 +131350,8 @@ self: { }: mkDerivation { pname = "casa-abbreviations-and-acronyms"; - version = "0.0.10"; - sha256 = "0x5n9f56xaiddxx3yxfwkhfv2zachhhmzrp7lvz1l98hmrpz9wsy"; + version = "0.0.12"; + sha256 = "1674kxqfdlq9caging8scyrk3a5bzd22w81w95wia2dpfz38mjr6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133411,38 +133587,31 @@ self: { attoparsec, base, binary, - bytestring, exceptions, hspec, http-client, - http-conduit, lens, lens-aeson, mtl, text, - transformers, unordered-containers, vector, }: mkDerivation { pname = "cayley-client"; - version = "0.4.19.4"; - sha256 = "06lhiyk6a77dy1cw7q240yz4yj8x3haqyp1sqdqz5z20pw1a3340"; + version = "0.4.19.5"; + sha256 = "0fksq22p80j7ggj9ls90lyvi237vw28yiz7908vrcn7wf4h9f3fq"; libraryHaskellDepends = [ aeson attoparsec base binary - bytestring exceptions http-client - http-conduit lens lens-aeson mtl text - transformers - unordered-containers vector ]; testHaskellDepends = [ @@ -135393,12 +135562,14 @@ self: { ansi-terminal, array, async, + atomic-primops, base, bitarray, bitwise, bytestring, bytestring-strict-builder, - cmdargs, + clock, + concurrency, containers, deepseq, directory, @@ -135410,21 +135581,19 @@ self: { ghc-prim, mmap, monad-loops, - mono-traversable, mtl, - posix-paths, + optparse-applicative, + os-string, process, - rawfilepath, regex-base, - regex-pcre, - regex-posix, + regex-tdfa, safe, split, stm, stringsearch, + template-haskell, text, transformers, - unagi-chan, unicode-show, unix-compat, unordered-containers, @@ -135434,8 +135603,8 @@ self: { }: mkDerivation { pname = "cgrep"; - version = "8.1.0"; - sha256 = "1apm74iv3z0p5va7fzdcki7w12mph2i30wn8lzi2l8jgnymygjvq"; + version = "9.0.0"; + sha256 = "1mdrs9gvsi1vg1pg0isl8s6y6kc644p1pydilwv88lpsyfsf94qa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135443,12 +135612,14 @@ self: { ansi-terminal array async + atomic-primops base bitarray bitwise bytestring bytestring-strict-builder - cmdargs + clock + concurrency containers deepseq directory @@ -135460,21 +135631,19 @@ self: { ghc-prim mmap monad-loops - mono-traversable mtl - posix-paths + optparse-applicative + os-string process - rawfilepath regex-base - regex-pcre - regex-posix + regex-tdfa safe split stm stringsearch + template-haskell text transformers - unagi-chan unicode-show unix-compat unordered-containers @@ -141707,8 +141876,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "1.8.3"; - sha256 = "1y2mrn4c8zcn7bjdza28k1p8716iqfc42vjggjalbcrn04zi0dsb"; + version = "1.8.4"; + sha256 = "1dgmqy5nm8fn55lmgd05akpkal46cydvbk0w6ian2z3979q4w4gb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141823,8 +141992,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "1.8.3"; - sha256 = "114w3vag29famrdz934v42831hbcxvkd0jxhsm730rwni95ik78c"; + version = "1.8.4"; + sha256 = "1pria81l325zdh8ccpkig5sp9lv4k819sk7pgkjf1s8hjknlsv9x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -141949,8 +142118,8 @@ self: { }: mkDerivation { pname = "clash-lib-hedgehog"; - version = "1.8.3"; - sha256 = "1cihj7m6n46v06np6hbd3z11zr74gy2b3alhfmx1x4hy3ycsr1x9"; + version = "1.8.4"; + sha256 = "1nl085y83vgljdh1pmgckvy5v5g6dafvmkjajc7m72s8ijj7g717"; libraryHaskellDepends = [ base clash-lib @@ -142057,8 +142226,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "1.8.3"; - sha256 = "00fy0vgp2pj7vad50n53pz70hc6x1mvz3a28cl1xqdyi6mk82kfj"; + version = "1.8.4"; + sha256 = "0vc9vcqbh0i8xkm833nwxfmwxi47kzcajrh8nywymal2nsid1gby"; libraryHaskellDepends = [ array arrows @@ -142141,8 +142310,8 @@ self: { }: mkDerivation { pname = "clash-prelude-hedgehog"; - version = "1.8.3"; - sha256 = "10mq2mpn6vnsb253p3hb665q94363vq5irmg8ns10p7kc2jc6l2l"; + version = "1.8.4"; + sha256 = "15jf4vr1p42s5pvs417y917j82m69df4prlgs3jl3l2h43psh3y5"; libraryHaskellDepends = [ base clash-prelude @@ -162585,6 +162754,44 @@ self: { } ) { }; + copilot_4_6 = callPackage ( + { + mkDerivation, + base, + copilot-c99, + copilot-core, + copilot-language, + copilot-libraries, + copilot-prettyprinter, + copilot-theorem, + directory, + filepath, + optparse-applicative, + }: + mkDerivation { + pname = "copilot"; + version = "4.6"; + sha256 = "11m838rfnqg11ldbj5byvql0sf8bpy2piay2fm610rkqqmilqfmf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + copilot-c99 + copilot-core + copilot-language + copilot-libraries + copilot-prettyprinter + copilot-theorem + directory + filepath + optparse-applicative + ]; + description = "A stream DSL for writing embedded C programs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-bluespec = callPackage ( { mkDerivation, @@ -162607,8 +162814,8 @@ self: { }: mkDerivation { pname = "copilot-bluespec"; - version = "4.5.1"; - sha256 = "0lznkmyy8mgp5mlrazp57qqa7xld3f4w4cngy5379s0ipfw1h6bc"; + version = "4.6"; + sha256 = "0g28nxpqdrwabmpq4c68r826mlfcvxknlwzdnjxmdf56akiywjij"; libraryHaskellDepends = [ base copilot-core @@ -162693,6 +162900,60 @@ self: { } ) { }; + copilot-c99_4_6 = callPackage ( + { + mkDerivation, + base, + copilot-core, + directory, + filepath, + HUnit, + language-c99, + language-c99-simple, + mtl, + pretty, + process, + QuickCheck, + random, + test-framework, + test-framework-hunit, + test-framework-quickcheck2, + unix, + }: + mkDerivation { + pname = "copilot-c99"; + version = "4.6"; + sha256 = "11g890ximcm5i6ds3fpx4hqzqps055ng7mmcp8cgi6p9s7shx8hj"; + libraryHaskellDepends = [ + base + copilot-core + directory + filepath + language-c99 + language-c99-simple + mtl + pretty + ]; + testHaskellDepends = [ + base + copilot-core + directory + HUnit + pretty + process + QuickCheck + random + test-framework + test-framework-hunit + test-framework-quickcheck2 + unix + ]; + description = "A compiler for Copilot targeting C99"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-cbmc = callPackage ( { mkDerivation, @@ -162753,6 +163014,35 @@ self: { } ) { }; + copilot-core_4_6 = callPackage ( + { + mkDerivation, + base, + HUnit, + QuickCheck, + test-framework, + test-framework-hunit, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "copilot-core"; + version = "4.6"; + sha256 = "0831qjcvs6d7zc1xw8snn65b2lhvxia44s6j8z196lj8sf82wkpc"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + HUnit + QuickCheck + test-framework + test-framework-hunit + test-framework-quickcheck2 + ]; + description = "An intermediate representation for Copilot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-frp-sketch = callPackage ( { mkDerivation, @@ -162824,6 +163114,41 @@ self: { } ) { }; + copilot-interpreter_4_6 = callPackage ( + { + mkDerivation, + base, + copilot-core, + copilot-prettyprinter, + pretty, + QuickCheck, + test-framework, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "copilot-interpreter"; + version = "4.6"; + sha256 = "1vpjrrv6z7mssqxswyr9aqrc0gf580gfyhfp87xxvrpmay8jchb4"; + libraryHaskellDepends = [ + base + copilot-core + pretty + ]; + testHaskellDepends = [ + base + copilot-core + copilot-prettyprinter + pretty + QuickCheck + test-framework + test-framework-quickcheck2 + ]; + description = "Interpreter for Copilot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-language = callPackage ( { mkDerivation, @@ -162872,6 +163197,55 @@ self: { } ) { }; + copilot-language_4_6 = callPackage ( + { + mkDerivation, + array, + base, + containers, + copilot-core, + copilot-interpreter, + copilot-theorem, + data-reify, + HUnit, + mtl, + pretty, + QuickCheck, + test-framework, + test-framework-hunit, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "copilot-language"; + version = "4.6"; + sha256 = "01llv51lyagq2kgi2kfspi7gb6rix9zxhppy3avww0av08a6a6li"; + libraryHaskellDepends = [ + array + base + containers + copilot-core + copilot-interpreter + copilot-theorem + data-reify + mtl + ]; + testHaskellDepends = [ + base + copilot-core + copilot-interpreter + HUnit + pretty + QuickCheck + test-framework + test-framework-hunit + test-framework-quickcheck2 + ]; + description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-libraries = callPackage ( { mkDerivation, @@ -162911,6 +163285,46 @@ self: { } ) { }; + copilot-libraries_4_6 = callPackage ( + { + mkDerivation, + base, + containers, + copilot-interpreter, + copilot-language, + copilot-theorem, + mtl, + parsec, + QuickCheck, + test-framework, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "copilot-libraries"; + version = "4.6"; + sha256 = "12mflyq9721p2npjsinbab0icdad6v16z72d4ax29xap3j0ccw4p"; + libraryHaskellDepends = [ + base + containers + copilot-language + mtl + parsec + ]; + testHaskellDepends = [ + base + copilot-interpreter + copilot-language + copilot-theorem + QuickCheck + test-framework + test-framework-quickcheck2 + ]; + description = "Libraries for the Copilot language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-prettyprinter = callPackage ( { mkDerivation, @@ -162932,6 +163346,28 @@ self: { } ) { }; + copilot-prettyprinter_4_6 = callPackage ( + { + mkDerivation, + base, + copilot-core, + pretty, + }: + mkDerivation { + pname = "copilot-prettyprinter"; + version = "4.6"; + sha256 = "0ng8zdjspgi62lzi3s42h25gf2j3mqn8rssbxrljpb8dmic479sr"; + libraryHaskellDepends = [ + base + copilot-core + pretty + ]; + description = "A prettyprinter of Copilot Specifications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-sbv = callPackage ( { mkDerivation, @@ -163025,6 +163461,70 @@ self: { } ) { }; + copilot-theorem_4_6 = callPackage ( + { + mkDerivation, + base, + bimap, + bv-sized, + containers, + copilot-core, + copilot-prettyprinter, + data-default, + directory, + HUnit, + libBF, + mtl, + panic, + parameterized-utils, + pretty, + process, + QuickCheck, + random, + test-framework, + test-framework-quickcheck2, + transformers, + what4, + xml, + }: + mkDerivation { + pname = "copilot-theorem"; + version = "4.6"; + sha256 = "0plm8kf69mgq7qr0xv3xvl3ay3b6zdx25my2zdc826wki9iavvr8"; + libraryHaskellDepends = [ + base + bimap + bv-sized + containers + copilot-core + copilot-prettyprinter + data-default + directory + libBF + mtl + panic + parameterized-utils + pretty + process + random + transformers + what4 + xml + ]; + testHaskellDepends = [ + base + copilot-core + HUnit + QuickCheck + test-framework + test-framework-quickcheck2 + ]; + description = "k-induction for Copilot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-verifier = callPackage ( { mkDerivation, @@ -163064,8 +163564,8 @@ self: { }: mkDerivation { pname = "copilot-verifier"; - version = "4.5.1"; - sha256 = "1a98h8pfxj2sz7dgq6a95ih9pgxkxbg7dzliczyd885s5hbfdb4k"; + version = "4.6"; + sha256 = "13czl47yisjknvhrpqw56gpvqm2qk547ci369pkin2yhrkqv91ja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163182,8 +163682,8 @@ self: { }: mkDerivation { pname = "copilot-visualizer"; - version = "4.5.1"; - sha256 = "0bpy73c1gflj3q03kary0pqr083hncwnhvzbyy0293vxk2p6izxf"; + version = "4.6"; + sha256 = "18iv2ihcp24im88wvy1aqx3cpiwawrizjr5v0cq8sd8c3hi6g4zk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -167382,6 +167882,39 @@ self: { } ) { }; + cretheus = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + primitive, + reflection, + text, + time, + vector, + }: + mkDerivation { + pname = "cretheus"; + version = "1.1.0"; + sha256 = "0w85lv8gb987fhpv67shk7p12j80jw8axx9fmz18kkswhg88vs6g"; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + primitive + reflection + text + time + vector + ]; + description = "A clean aeson wrapper"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + crf-chain1 = callPackage ( { mkDerivation, @@ -168466,6 +168999,7 @@ self: { exceptions, fgl, hashable, + hedgehog, hspec, json, lens, @@ -168475,6 +169009,7 @@ self: { prettyprinter, QuickCheck, tasty, + tasty-hedgehog, tasty-hspec, tasty-hunit, tasty-quickcheck, @@ -168489,8 +169024,8 @@ self: { }: mkDerivation { pname = "crucible"; - version = "0.7.2"; - sha256 = "0wz9gsbqdgjsdg68rzi1gsc21bzfb34dx6hd9bdlbzkq4i1km0b3"; + version = "0.8.0.0"; + sha256 = "0vvgxa0ah2hbnj2dh1iyc9i6wwq9qa01mzc8494wv6nj3hvcbn7y"; libraryHaskellDepends = [ async base @@ -168518,6 +169053,7 @@ self: { testHaskellDepends = [ base containers + hedgehog hspec lens mtl @@ -168525,6 +169061,7 @@ self: { parameterized-utils QuickCheck tasty + tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck @@ -168544,6 +169081,7 @@ self: { crucible, crucible-syntax, directory, + extra, filepath, isocline, lens, @@ -168560,8 +169098,8 @@ self: { }: mkDerivation { pname = "crucible-debug"; - version = "0.1.0"; - sha256 = "12xrvsj9asaq07diifi3adjy9524ma4zxsd8a9393fd1zi07693a"; + version = "0.1.2.0"; + sha256 = "0i3bbk28sihyb8nirjcz72mrhz6m08k3iz1jz2rx5jn7nwskxzba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168570,6 +169108,7 @@ self: { crucible crucible-syntax directory + extra filepath isocline lens @@ -168638,10 +169177,8 @@ self: { }: mkDerivation { pname = "crucible-llvm"; - version = "0.7.1"; - sha256 = "0q2ifjvdgbdvpj5092v9s4nhbkwmw8hghnslcx5ljrwfm8vmzxbs"; - revision = "2"; - editedCabalFile = "12k4r85w7864b4nbg03v2w0vhk8sgld55aqqckc5qz7d78q6lzkx"; + version = "0.8.0.0"; + sha256 = "1nj45d75llj2laspiql6wzv54p5lv52x11ya06y0qgqcb0x8k4ai"; libraryHaskellDepends = [ attoparsec base @@ -168713,8 +169250,8 @@ self: { }: mkDerivation { pname = "crucible-symio"; - version = "0.1.1"; - sha256 = "0c96c0iqdx2ahc9sjslck1bfnjkha1kii1p3izhw9b9d34h339d7"; + version = "0.2.0.0"; + sha256 = "1gxqanrp78d0ffg6z5pd3624qz1fmlmlvkn5ljmg2gvw7dskl4ip"; libraryHaskellDepends = [ aeson base @@ -168782,8 +169319,8 @@ self: { }: mkDerivation { pname = "crucible-syntax"; - version = "0.4.1"; - sha256 = "0b60qh1hnz9q8diqnc4f9pvmkbgp1amg8gfk9zjk7mlkq4x9g9bh"; + version = "0.5.0.0"; + sha256 = "08b027d6m8c1wsfn21kjywg1gqw4s4nanzj1q4kqp65n4gmaai5b"; libraryHaskellDepends = [ base bv-sized @@ -168910,8 +169447,10 @@ self: { crucible-debug, crucible-syntax, directory, + file-embed, filepath, generic-lens, + githash, Glob, lens, libBF, @@ -168919,6 +169458,7 @@ self: { parameterized-utils, prettyprinter, raw-strings-qq, + rme-what4, semigroupoids, simple-get-opt, split, @@ -168932,8 +169472,8 @@ self: { }: mkDerivation { pname = "crux"; - version = "0.7.2"; - sha256 = "025nrsa3a1wl2ymw1q4pj77hgjn3nq33qhwnx05xykkqq7fyandh"; + version = "0.8.0.0"; + sha256 = "09j0syp834xb968cjjjvlvqbyya5kavdd9xg726n064kbqj1kb5r"; libraryHaskellDepends = [ aeson ansi-terminal @@ -168950,8 +169490,10 @@ self: { crucible-debug crucible-syntax directory + file-embed filepath generic-lens + githash Glob lens libBF @@ -168959,6 +169501,7 @@ self: { parameterized-utils prettyprinter raw-strings-qq + rme-what4 semigroupoids simple-get-opt split @@ -168988,6 +169531,7 @@ self: { config-schema, containers, crucible, + crucible-debug, crucible-llvm, crucible-symio, crux, @@ -169019,8 +169563,8 @@ self: { }: mkDerivation { pname = "crux-llvm"; - version = "0.10"; - sha256 = "0648w3i2hpgkfqhcx3r7qsdgqak8295ik0g98jqs9s79dn7i8s4g"; + version = "0.11.0.0"; + sha256 = "1jhygc1yxw847v9qzrc7a7nvx1q2kvsn2kps8qkvfhcf6g08kscs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -169032,6 +169576,7 @@ self: { config-schema containers crucible + crucible-debug crucible-llvm crucible-symio crux @@ -170524,6 +171069,7 @@ self: { cryptol = callPackage ( { mkDerivation, + aeson, alex, ansi-terminal, arithmoi, @@ -170566,7 +171112,9 @@ self: { pretty, pretty-show, prettyprinter, + primitive, process, + rme-what4, sbv, simple-smt, stm, @@ -170586,12 +171134,13 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "3.3.0"; - sha256 = "1c1pny7nj34wbph6yg2dmwbrflfrp7flzgjvmp2xdb1s7h4d38rv"; + version = "3.4.0"; + sha256 = "1253c4rkv5i1kyvagyqxn94la0slsp7yvf0v4lkhlz1hzl6mfwsr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ + aeson ansi-terminal arithmoi array @@ -170628,7 +171177,9 @@ self: { pretty pretty-show prettyprinter + primitive process + rme-what4 sbv simple-smt stm @@ -171059,11 +171610,14 @@ self: { pem, tasty, tasty-hunit, + unix, }: mkDerivation { pname = "crypton-x509-store"; - version = "1.6.11"; - sha256 = "07vq7f883cm5krqz2kc0qkh9ks54jknrwdqvfqsk91s12b693a83"; + version = "1.6.12"; + sha256 = "149wx24blr9b0pd1kaw14zl8li825hfdksyi47x1460zvxdsz86p"; + revision = "1"; + editedCabalFile = "1im0mbnshvp2f5279ca003f6vjna59yfiiphs7xggbk7fxs2iwab"; libraryHaskellDepends = [ asn1-encoding asn1-types @@ -171076,6 +171630,7 @@ self: { filepath mtl pem + unix ]; testHaskellDepends = [ base @@ -181340,9 +181895,12 @@ self: { containers, criterion, directory, + filepath, granite, hashable, HUnit, + mmap, + parallel, process, random, random-shuffle, @@ -181356,8 +181914,8 @@ self: { }: mkDerivation { pname = "dataframe"; - version = "0.3.3.4"; - sha256 = "0s2mjndzn5nly4fmrw6ada8px1mvh9ha18hfflidy3ky3ljbmiis"; + version = "0.3.3.6"; + sha256 = "0x32x6lg5kq3l2zpcpbp1nw6k279lp1y4nsfm9ppaz18j9k39nqy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181370,6 +181928,8 @@ self: { directory granite hashable + mmap + parallel process random snappy-hs @@ -181382,6 +181942,9 @@ self: { ]; executableHaskellDepends = [ base + directory + filepath + process random time vector @@ -181402,7 +181965,6 @@ self: { ]; description = "A fast, safe, and intuitive DataFrame library"; license = lib.licensesSpdx."GPL-3.0-or-later"; - mainProgram = "dataframe"; } ) { }; @@ -181430,6 +181992,60 @@ self: { } ) { }; + dataframe-persistent = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + dataframe, + HUnit, + monad-logger, + persistent, + persistent-sqlite, + resourcet, + template-haskell, + temporary, + text, + time, + transformers, + vector, + }: + mkDerivation { + pname = "dataframe-persistent"; + version = "0.1.0.0"; + sha256 = "0drpha9bkhp10ipbbh02mfs5r77awi8nfw9zrxahz2fqrysrs3dx"; + libraryHaskellDepends = [ + base + bytestring + containers + dataframe + persistent + template-haskell + text + time + transformers + vector + ]; + testHaskellDepends = [ + base + dataframe + HUnit + monad-logger + persistent + persistent-sqlite + resourcet + temporary + text + time + transformers + vector + ]; + description = "Persistent database integration for the dataframe library"; + license = lib.licensesSpdx."GPL-3.0-or-later"; + } + ) { }; + datalog = callPackage ( { mkDerivation, @@ -183771,8 +184387,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "2.4.0"; - sha256 = "1dzgcmz24yg3pird2gmxqhdnmwkydh54wym2x6lxq0r0dx3jphwz"; + version = "2.4.1"; + sha256 = "0s79mqv6rq1v7f595mknvm1wkzha5bh1x6l64im11zkgaycv59kl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184884,9 +185500,6 @@ self: { { mkDerivation, base, - Cabal, - cabal-doctest, - doctest, generic-lens, markdown-unlit, rank2classes, @@ -184895,13 +185508,8 @@ self: { }: mkDerivation { pname = "deep-transformations"; - version = "0.3"; - sha256 = "16v97v10xp4y9cpb1q4i56baihipyas5askhbbc6ifgzn4fzl1nn"; - setupHaskellDepends = [ - base - Cabal - cabal-doctest - ]; + version = "0.4.0.1"; + sha256 = "12c4qfjh9fnbikjlhvzy7pyasfx1l0bgqbv06bniyahjkx8zv78w"; libraryHaskellDepends = [ base generic-lens @@ -184911,7 +185519,6 @@ self: { ]; testHaskellDepends = [ base - doctest rank2classes ]; testToolDepends = [ markdown-unlit ]; @@ -186995,32 +187602,6 @@ self: { ) { }; dependent-map = callPackage ( - { - mkDerivation, - base, - constraints-extras, - containers, - dependent-sum, - }: - mkDerivation { - pname = "dependent-map"; - version = "0.4.0.0"; - sha256 = "0b0zhyl3wkl4kkrxvq7vwjz3gn0ndxjjgyw9cky8a6xyv190pkjk"; - revision = "2"; - editedCabalFile = "18jqk1p4paaylqdvglw03v7fhyvlg59csl4kpf067wwpdpyaqs3l"; - libraryHaskellDepends = [ - base - constraints-extras - containers - dependent-sum - ]; - description = "Dependent finite maps (partial dependent products)"; - license = "unknown"; - maintainers = [ lib.maintainers.alexfmpe ]; - } - ) { }; - - dependent-map_0_4_0_1 = callPackage ( { mkDerivation, base, @@ -187040,7 +187621,6 @@ self: { ]; description = "Dependent finite maps (partial dependent products)"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.alexfmpe ]; } ) { }; @@ -188132,6 +188712,19 @@ self: { } ) { }; + deriving-via-fun = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "deriving-via-fun"; + version = "0.1.1.0"; + sha256 = "099wdi3204sq1mdr3i3z26scps2dvp9xxc0f8mp46fsilpl7bdys"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Deriving via first-class functions"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + derivingvia-extras = callPackage ( { mkDerivation, @@ -201462,10 +202055,8 @@ self: { }: mkDerivation { pname = "dom-lt"; - version = "0.2.3"; - sha256 = "1h73159h61f1wv6kans0nqspfq46wiz77isnjg8vd9m127hqn69x"; - revision = "1"; - editedCabalFile = "140hnm6jg74fmhi6vsq2qq8agf3ar7wakwpxfkdf0zg944p41y8x"; + version = "0.2.4"; + sha256 = "0bifkk0v4y75vawc4c3jk1h20pjry9m390svvbjmhh6nj22w8si1"; libraryHaskellDepends = [ array base @@ -218553,6 +219144,40 @@ self: { } ) { }; + ersatz-viz = callPackage ( + { + mkDerivation, + base, + ersatz, + lens, + mtl, + process-extras, + text, + unordered-containers, + }: + mkDerivation { + pname = "ersatz-viz"; + version = "0"; + sha256 = "1ywrjbkr0xc7cng2a6jykxa4b4xlvv64l1wdhj8267g8m1cc576a"; + libraryHaskellDepends = [ + base + ersatz + lens + mtl + process-extras + text + unordered-containers + ]; + testHaskellDepends = [ + base + ersatz + text + ]; + description = "draw circuit (DAG) for Ersatz.Bit"; + license = lib.licensesSpdx."GPL-3.0-only"; + } + ) { }; + ert = callPackage ( { mkDerivation, @@ -221459,8 +222084,8 @@ self: { }: mkDerivation { pname = "eventlog-live"; - version = "0.3.0.0"; - sha256 = "0m0wwjazqb03v9ppilp0kr75zd49kbjnbhdsl4v81gg8p2wn3xgn"; + version = "0.4.0.0"; + sha256 = "0p0247vlm3qphcvdvh6gbb83s9zpp484q3x9691ab497nkpyzj17"; libraryHaskellDepends = [ ansi-terminal base @@ -221497,8 +222122,8 @@ self: { }: mkDerivation { pname = "eventlog-live-influxdb"; - version = "0.2.0.0"; - sha256 = "03biydj51vfs0kh9c4i457ppk3qkr11lp5y7jbyfkg1nfd4cyf76"; + version = "0.2.0.1"; + sha256 = "1bgcrq7vxn7dl4qgn02nifp48maqzh7qz2bcxmm873zka0d3k6km"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221526,11 +222151,14 @@ self: { { mkDerivation, aeson, + ansi-terminal, base, bytestring, data-default, dlist, eventlog-live, + eventlog-socket, + file-embed, ghc-events, grapesy, hashable, @@ -221540,6 +222168,9 @@ self: { optparse-applicative, proto-lens, random, + strict-list, + table-layout, + template-haskell, text, unordered-containers, vector, @@ -221547,19 +222178,20 @@ self: { }: mkDerivation { pname = "eventlog-live-otelcol"; - version = "0.3.0.0"; - sha256 = "1jxh4n14sidygy6z64nsfv8jq1bgi60kf6lka4nfkscyvz0mgi31"; - revision = "1"; - editedCabalFile = "1kgfd7nszj9rpc2k0frwmpj52pkfyb6grnl7ig2p5hpzp2l6lwxl"; + version = "0.5.0.0"; + sha256 = "0qk41r0km6dd3wniihqlv6v30z5gfhak4rbl1ybw3rvgzrp48p5n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson + ansi-terminal base bytestring data-default dlist eventlog-live + eventlog-socket + file-embed ghc-events grapesy hashable @@ -221569,6 +222201,9 @@ self: { optparse-applicative proto-lens random + strict-list + table-layout + template-haskell text unordered-containers vector @@ -224130,8 +224765,8 @@ self: { }: mkDerivation { pname = "exitcode"; - version = "0.1.0.9"; - sha256 = "0g63q2y1ipgnylfjp28yly6lbps7gbnam7lpg1x8hnmlvfz89mj7"; + version = "0.1.0.10"; + sha256 = "0w5n3gfxv7950q6ds37a92jxg7nw8vgqxd0n801qi0ai9q16w3bd"; libraryHaskellDepends = [ base bifunctors @@ -243414,8 +244049,8 @@ self: { }: mkDerivation { pname = "freckle-ecs"; - version = "0.0.0.0"; - sha256 = "10sffzn45w0ifi703lrrz8dz96s04hwbbgdh0wp88hamkd4nvvla"; + version = "0.0.0.1"; + sha256 = "12xlnaljc54dzdrn314z510qh00wm9skc6pq3q5x12ky9ynvjmg7"; libraryHaskellDepends = [ aeson base @@ -243539,8 +244174,8 @@ self: { }: mkDerivation { pname = "freckle-http"; - version = "0.2.0.0"; - sha256 = "0an1bqpsslr8zlpmvvp5hjw5fwpwqjr6w0m4ib7sa1d0218xzdnz"; + version = "0.3.0.0"; + sha256 = "13b32m9da2vm0740bb134y4xj0gk0cz2njadwybnjddkc0il19n8"; libraryHaskellDepends = [ aeson annotated-exception @@ -244883,6 +245518,19 @@ self: { } ) { }; + freer-base-classes = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "freer-base-classes"; + version = "0.1.0.0"; + sha256 = "1z602q30gbal3l2b5zq1zqkp0assb6x71vilm3gk64mhfa1gkd8r"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "class NonDetable.N and Failable.F"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + freer-converse = callPackage ( { mkDerivation, @@ -245838,6 +246486,19 @@ self: { } ) { }; + from = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "from"; + version = "1.0.0.1"; + sha256 = "1fg171hg9fknp0qbb7y51s1rl51l3hsh3hddhx2xdh6sv89cvpc2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Typeclasses for type conversion mappings"; + license = lib.licenses.asl20; + } + ) { }; + from-env = callPackage ( { mkDerivation, @@ -245868,6 +246529,35 @@ self: { } ) { }; + from-string = callPackage ( + { + mkDerivation, + base, + bytestring, + from, + text, + }: + mkDerivation { + pname = "from-string"; + version = "1.0.0.2"; + sha256 = "00pv0swf4bd4nclv48pdl1k17yzkcaq3b3mqncva4rxrj5i6ncsi"; + libraryHaskellDepends = [ + base + bytestring + from + text + ]; + testHaskellDepends = [ + base + bytestring + from + text + ]; + description = "Instances of 'From' for common string types"; + license = lib.licenses.asl20; + } + ) { }; + from-sum = callPackage ( { mkDerivation, @@ -246786,6 +247476,19 @@ self: { } ) { }; + ftcqueue = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "ftcqueue"; + version = "0.1.0.1"; + sha256 = "1l6p8dsmf1lad714zwv3fvjxn7v9mnvkf660h09fv930rarhq556"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "FTC Queue"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + ftdi = callPackage ( { mkDerivation, @@ -248955,8 +249658,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.33"; - sha256 = "0fasqms7ap96b1iyrhmp35c5z4kas7iffbbk2s1scg3wsmghd3p4"; + version = "0.25.34"; + sha256 = "1xf3nwf7wkdsv36nz77apingynx5d3lcdk8dk0s6j5l15h6n0i26"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256859,11 +257562,12 @@ self: { mono-traversable, ptrdiff, simple-affine-space, + webcolor-labels, }: mkDerivation { pname = "geomancy"; - version = "0.2.6.0"; - sha256 = "14imwg21ig2n1g4l6z55wbkrjg9mzswgqdirzbdvp2y0krk6259q"; + version = "0.3.0.0"; + sha256 = "1m05icvkf87jhx1pv8cfdi5fcfi2vfzan7rqk9znsjid5ybx429r"; libraryHaskellDepends = [ base containers @@ -256872,6 +257576,7 @@ self: { mono-traversable ptrdiff simple-affine-space + webcolor-labels ]; testHaskellDepends = [ base @@ -256887,7 +257592,7 @@ self: { linear simple-affine-space ]; - description = "Geometry and matrix manipulation"; + description = "Vectors and matrix manipulation"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; } @@ -257736,8 +258441,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "ghc-compat"; - version = "0.1.0.1"; - sha256 = "0vb55bx45cdcf4sfvpkc4wx8zgi7h6bzchp4s66ndmqr5p0br3ld"; + version = "0.5.0.0"; + sha256 = "0kjn374x52drq4v3l90h82nkilm81fy1bv08gicykg0nc619lmp4"; libraryHaskellDepends = [ base ]; description = "GHC compatibility for MicroHs"; license = lib.licensesSpdx."Apache-2.0"; @@ -265476,11 +266181,11 @@ self: { base, base-compat, containers, - gi-gdk, + gi-gdk3, gi-gdkpixbuf, gi-glib, gi-gobject, - gi-gtk, + gi-gtk3, haskell-gi-base, mtl, text, @@ -265488,17 +266193,17 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.17"; - sha256 = "022g7xlwli8rbasxgafpp2j6ybk5iyk1hlwlg7nph361k3c0l7p6"; + version = "0.3.18"; + sha256 = "08ksv6g8rhbz3vwf1gnb0y702drzbwp0hgsisyqdd5fgqv6pvvis"; libraryHaskellDepends = [ base base-compat containers - gi-gdk + gi-gdk3 gi-gdkpixbuf gi-glib gi-gobject - gi-gtk + gi-gtk3 haskell-gi-base mtl text @@ -266442,6 +267147,7 @@ self: { Cabal, containers, gi-gdkpixbuf, + gi-gio, gi-glib, gi-gobject, haskell-gi, @@ -266453,12 +267159,13 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.28"; - sha256 = "1sph16xhvyyfp81b2njz99crzwqas8njn6h0ma7hbi068jmnj7nq"; + version = "0.7.29"; + sha256 = "0vklaj28qc3hn9mwpzij0wqy7w2mmhcjwrgirz5jzqhqxh8pv1l8"; setupHaskellDepends = [ base Cabal gi-gdkpixbuf + gi-gio gi-glib gi-gobject haskell-gi @@ -266468,6 +267175,7 @@ self: { bytestring containers gi-gdkpixbuf + gi-gio gi-glib gi-gobject haskell-gi @@ -268374,8 +269082,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20250929"; - sha256 = "1ff30f8ifp2a73d64q25mpzirnrm5q0amri9xcz7814wwynv24hj"; + version = "10.20251029"; + sha256 = "0i4ys60rn9df94hm5r1q0y19kv43f1r2j4pj54jkrgdki7i906py"; configureFlags = [ "-fassistant" "-f-benchmark" @@ -273003,8 +273711,8 @@ self: { }: mkDerivation { pname = "glob-imports"; - version = "0.0.2.1"; - sha256 = "1dwns8krs4gq97mg7xkaq41k6lrn9mc2m0ai496qamlgyp2sinln"; + version = "0.0.3.0"; + sha256 = "0xc0l0llfkhgvxg9c5y0w6g36r48jyq8cmij3sqxdwyc6lx7p9b7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280336,8 +281044,8 @@ self: { }: mkDerivation { pname = "gpu-vulkan-middle"; - version = "0.1.0.77"; - sha256 = "1ar3sw72hi2wd8aqrd2421szc7rrk5vdq5byhmgkyzrva9iyqwn3"; + version = "0.1.0.78"; + sha256 = "17q8vwmnilxq04l2xx0i59m6dn0jgh4hscv0047n1fyzv4c64798"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -280973,8 +281681,8 @@ self: { }: mkDerivation { pname = "granite"; - version = "0.3.0.4"; - sha256 = "1h7pxas9zy5brss33402qf23w4wcjkh7gxmjw0l138hf3177sf09"; + version = "0.3.0.5"; + sha256 = "0d2k9lnrqpsjhsqn82pm7pwm7qwnrccga60vkxw75sjgqv9862f3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -287694,6 +288402,8 @@ self: { pname = "h-raylib"; version = "5.5.3.1"; sha256 = "1977pd0aqb9jiply9fyz1f5rw0vh6wpv8v2dyvk0awk8v5lbsaa0"; + revision = "1"; + editedCabalFile = "0zq58lnvkpg1mcx7f1jr12gzaj2qwmsva548k4l1nall7pv93h4m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -314512,6 +315222,64 @@ self: { } ) { }; + haxr_3000_11_6 = callPackage ( + { + mkDerivation, + array, + base, + base-compat, + base64-bytestring, + blaze-builder, + bytestring, + HaXml, + HsOpenSSL, + http-streams, + http-types, + io-streams, + mtl, + mtl-compat, + network, + network-uri, + old-locale, + old-time, + template-haskell, + text, + time, + utf8-string, + }: + mkDerivation { + pname = "haxr"; + version = "3000.11.6"; + sha256 = "0i5nvksznsixnqjrp1bgz68xhjqbzc84zqzjjvs6g1v18fbbk2fy"; + libraryHaskellDepends = [ + array + base + base-compat + base64-bytestring + blaze-builder + bytestring + HaXml + HsOpenSSL + http-streams + http-types + io-streams + mtl + mtl-compat + network + network-uri + old-locale + old-time + template-haskell + text + time + utf8-string + ]; + description = "XML-RPC client and server library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + haxr-th = callPackage ( { mkDerivation, @@ -318567,13 +319335,10 @@ self: { directory, exceptions, filepath, - generic-lens, hedgehog, http-conduit, - hw-prelude, lifted-async, lifted-base, - microlens, mmorph, monad-control, mtl, @@ -318596,8 +319361,8 @@ self: { }: mkDerivation { pname = "hedgehog-extras"; - version = "0.10.0.0"; - sha256 = "10mmvxvr64s7j6zil4ygk1l74iask96r7k2cgv59l1zkfgji44hx"; + version = "0.10.1.0"; + sha256 = "04m51s11485war8ngyhywjnrb60fsn8fikrxz3bqzlib6k4mb7yz"; libraryHaskellDepends = [ aeson aeson-pretty @@ -318610,13 +319375,10 @@ self: { directory exceptions filepath - generic-lens hedgehog http-conduit - hw-prelude lifted-async lifted-base - microlens mmorph monad-control mtl @@ -327330,6 +328092,55 @@ self: { } ) { }; + higher-order-freer-monad = callPackage ( + { + mkDerivation, + base, + freer-base-classes, + ftcqueue, + }: + mkDerivation { + pname = "higher-order-freer-monad"; + version = "0.1.0.0"; + sha256 = "1ccy1as170bc87a88m4aqldrfjz1yrd19bsybbj0kkabha2ka7dy"; + libraryHaskellDepends = [ + base + freer-base-classes + ftcqueue + ]; + testHaskellDepends = [ + base + freer-base-classes + ftcqueue + ]; + description = "This package is used by package yaftee"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + higher-order-open-union = callPackage ( + { + mkDerivation, + base, + freer-base-classes, + }: + mkDerivation { + pname = "higher-order-open-union"; + version = "0.1.0.1"; + sha256 = "1bdd8fli1kxr58q02na15vyk18n3cya10ns4p964pdsw23374d0k"; + libraryHaskellDepends = [ + base + freer-base-classes + ]; + testHaskellDepends = [ + base + freer-base-classes + ]; + description = "This package is used by package yaftee"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + higherorder = callPackage ( { mkDerivation, base }: mkDerivation { @@ -332107,8 +332918,8 @@ self: { }: mkDerivation { pname = "hlex"; - version = "1.0.0"; - sha256 = "1qanm8n368ps64hfr19j43hrkbwlgmfdyf4xldx25lzrgn56qaxk"; + version = "1.0.1"; + sha256 = "06phc2b8y9xwa0kmmxcmjvnhd60wmwhd4izj7020zda65rbk9fal"; libraryHaskellDepends = [ base regex-tdfa @@ -335611,8 +336422,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.17.0"; - sha256 = "131mwn1vcyd2q73cj00vx8silhnacb9nbiba20c6i95kgsblnm0s"; + version = "2.17.1"; + sha256 = "03dgsy25rsy3yxisr71nrc7gbwh3k6ms3sbsbf4gh4i66pjv8gz3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -337073,6 +337884,69 @@ self: { } ) { }; + hoauth2_2_15_0 = callPackage ( + { + mkDerivation, + aeson, + base, + base64, + binary, + binary-instances, + bytestring, + containers, + crypton, + data-default, + exceptions, + hspec, + hspec-discover, + http-conduit, + http-types, + memory, + microlens, + text, + transformers, + uri-bytestring, + uri-bytestring-aeson, + }: + mkDerivation { + pname = "hoauth2"; + version = "2.15.0"; + sha256 = "1l8jp07vp1sx02bkg6799pb4gqbbp0rych8kqccinjawv6w3zbag"; + libraryHaskellDepends = [ + aeson + base + base64 + binary + binary-instances + bytestring + containers + crypton + data-default + exceptions + http-conduit + http-types + memory + microlens + text + transformers + uri-bytestring + uri-bytestring-aeson + ]; + testHaskellDepends = [ + aeson + base + binary + hspec + http-conduit + uri-bytestring + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell OAuth2 authentication client"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hoauth2-demo = callPackage ( { mkDerivation, @@ -337158,8 +338032,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers"; - version = "0.8.0"; - sha256 = "11y4lbp81spa7wky834l7i0fkqq3b529zn7divz5x9ar0jnnpnaj"; + version = "0.9.0"; + sha256 = "0rkmns6kqf0gvzc607vzr9gcws5v0axngbyb4zxkbhf09491d1hs"; libraryHaskellDepends = [ aeson base @@ -337209,8 +338083,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers-tutorial"; - version = "0.8.0"; - sha256 = "1b9sjwirkjwl3w54y9pq4i07xp3spsm7zxknf9xilw4jgg9mmncz"; + version = "0.9.0"; + sha256 = "06vvg3ri0bxhjj4v2b91z6320jlhckd3b976zpc06mc94mwn66bx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -337252,8 +338126,8 @@ self: { }: mkDerivation { pname = "hoauth2-tutorial"; - version = "0.8.0"; - sha256 = "0w7fa1gyslng19sxk3xnvy1bvy0r2gannypvlv9hi86hinwx525j"; + version = "0.9.0"; + sha256 = "1kh3qc9pmpf13w6qxxrfw8ycz9xk5nzk9jy770l2jskmg0j3gym4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -341851,8 +342725,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.38.2"; - sha256 = "1g47rf3pglfkjyk3qfz6wvjp0zh16s4qhayqyyzxg91aqq3fqqd6"; + version = "0.38.3"; + sha256 = "0zzx5zwak1qrlnrc0lj1n5qccvdl8zxvdppxd8f3y562nrl81s1r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -371677,6 +372551,33 @@ self: { } ) { }; + id = callPackage ( + { + mkDerivation, + base, + lens, + mtl, + semigroupoids, + tagged, + transformers, + }: + mkDerivation { + pname = "id"; + version = "0.0.0.1"; + sha256 = "1kdz1mrk5j0vjr9mw9spafl3ir11q4n2ai5q108067i86jmx2qp7"; + libraryHaskellDepends = [ + base + lens + mtl + semigroupoids + tagged + transformers + ]; + description = "Id (f a) data type"; + license = lib.licenses.bsd3; + } + ) { }; + ide-backend = callPackage ( { mkDerivation, @@ -387454,7 +388355,6 @@ self: { criterion, deepseq, directory, - dlist, filepath, happy, lazy-csv, @@ -387475,8 +388375,8 @@ self: { }: mkDerivation { pname = "jacinda"; - version = "3.3.0.4"; - sha256 = "1ma3aa4sx4ybqgkclfjh8yz0ql0av6qflddyfsp90jaky3ryw54h"; + version = "3.3.0.5"; + sha256 = "0msadmd9d7syjzr2lnxfa2gsplwdc17kgdxrh61h6i0k9crlgbdp"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -387487,7 +388387,6 @@ self: { containers deepseq directory - dlist filepath lazy-csv microlens @@ -388245,8 +389144,8 @@ self: { }: mkDerivation { pname = "java-adt"; - version = "1.0.20231204"; - sha256 = "055yrn1pvv35sl79djm4c7yb4354dmwisj5whcpynn20caq9nsy5"; + version = "1.0.20251105"; + sha256 = "1bkyjh2598i8c019gris124gswizybk5lynqmc1mbjb8lyqap3wa"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -399000,8 +399899,8 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.10.0"; - sha256 = "1rq6fry1lwaqki4jr28nhvh27xfg3b3528dda4iahgvd8hq5zvpf"; + version = "0.1.11.0"; + sha256 = "1qwhmkanmqp0xrkn4mx8cgs1znyapjqhfysvpm5z6cccsysd7mwj"; libraryHaskellDepends = [ base binary @@ -399094,8 +399993,8 @@ self: { }: mkDerivation { pname = "keid-geometry"; - version = "0.1.1.3"; - sha256 = "1alzwzp70g6mlsisa0w5fw42wiq49j64nny75np458jkl1axif2x"; + version = "0.1.2.0"; + sha256 = "14zs82lajn228i8m6csklv7plkp50qyyd6cqgm3i14517mc88s9h"; libraryHaskellDepends = [ base geomancy @@ -399138,8 +400037,8 @@ self: { }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.9.0"; - sha256 = "1iz6ciyi5qn4garrpr3xvl2bwvcvrjl8diyzw3cnd49p6zgs0kh3"; + version = "0.1.10.0"; + sha256 = "1kicl1c06yryq5wani4nnk7vl7q9idwhs15v2lx0xaw2yszz6v4x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -399186,8 +400085,8 @@ self: { }: mkDerivation { pname = "keid-resource-gltf"; - version = "0.1.0.2"; - sha256 = "1z11nsjzzgrlbkmv6r2j7x6fwn22hw7x029yxjam20nnf4lqmzg6"; + version = "0.1.1.0"; + sha256 = "06f8scgk61jybqqiqpg8x1hbb2adlbxryr4lapypgdrqn9518nhb"; libraryHaskellDepends = [ base bytestring @@ -399259,6 +400158,8 @@ self: { pname = "keid-ui-dearimgui"; version = "0.1.3.2"; sha256 = "0wahzr2sjnggafymfyqr1h16rlhs8f01rbz8fg00arqxbgqsvlph"; + revision = "1"; + editedCabalFile = "1gq6rrj7i0jfpm9jv32d8934apym8awr7bjc79ah2cf8pw00n4r9"; libraryHaskellDepends = [ base binary @@ -399684,7 +400585,7 @@ self: { } ) { }; - keter_2_2_1 = callPackage ( + keter_2_3_0 = callPackage ( { mkDerivation, aeson, @@ -399692,6 +400593,7 @@ self: { async, attoparsec, base, + binary, blaze-builder, bytestring, case-insensitive, @@ -399708,6 +400610,7 @@ self: { http-types, HUnit, indexed-traversable, + keter-rate-limiting-plugin, lens, lifted-base, monad-logger, @@ -399743,8 +400646,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "2.2.1"; - sha256 = "05mh9a5lvjyjzpfcgrbysn6yzzr20aplcrqk7ifknggy5lh4204l"; + version = "2.3.0"; + sha256 = "1aih6gp74xh1zw6yq8qr8k24w41j7jzzfnv2j67r099ihg60yi28"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -399753,6 +400656,7 @@ self: { async attoparsec base + binary blaze-builder bytestring case-insensitive @@ -399768,6 +400672,7 @@ self: { http-reverse-proxy http-types indexed-traversable + keter-rate-limiting-plugin lifted-base monad-logger mtl @@ -399802,6 +400707,7 @@ self: { filepath ]; testHaskellDepends = [ + aeson base bytestring conduit @@ -399809,14 +400715,17 @@ self: { http-conduit http-types HUnit + keter-rate-limiting-plugin lens monad-logger mtl stm tasty tasty-hunit + tls transformers unix + unordered-containers wai warp wreq @@ -402828,8 +403737,8 @@ self: { pname = "ktx-codec"; version = "0.0.2.1"; sha256 = "0cigkpvgx12py0i942sci359xsj87pa0bhgmmamhigynimbfspzr"; - revision = "1"; - editedCabalFile = "1rmwxa5ssn5y9k0d0cj1hxn6qdhpd2qab2dsbdzbhyrc68hf12a4"; + revision = "4"; + editedCabalFile = "0pqsxvgrjs48aqkbm8vq13ad5ab4kjpiw416p2sj134imxlylr62"; libraryHaskellDepends = [ base binary @@ -403532,8 +404441,8 @@ self: { }: mkDerivation { pname = "kvitable"; - version = "1.1.0.1"; - sha256 = "1zb2s4fkcsa097x1ch02j6z5k1ya733f74rrs85hcrr8vm1hdgc0"; + version = "1.1.1.0"; + sha256 = "03mk2hkv5c2rc5xpc23g66akahz719d9ialq2zfg81az32d84x79"; libraryHaskellDepends = [ base containers @@ -406292,8 +407201,8 @@ self: { }: mkDerivation { pname = "language-Modula2"; - version = "0.1.4.2"; - sha256 = "1mxf02hhhnf9n3yqxy6vzzgnvxwswqrfbx8kmwfk8mhbvwnn3ngf"; + version = "0.1.5"; + sha256 = "1m1iag8km2wlpg00423aggfv514r0kq0svrjhadag02krm2ncxd3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -408456,8 +409365,8 @@ self: { }: mkDerivation { pname = "language-oberon"; - version = "0.3.3.2"; - sha256 = "1gid56amx307lxffdn00xs3v9jjj5jgww7nl9xm9j6k98igqzhvd"; + version = "0.3.4"; + sha256 = "1v3p99lkvx3w8fmkd7cc81jz14vxqbp77jznm25wjbka4sidnzb2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -414846,87 +415755,6 @@ self: { ) { }; lentil = callPackage ( - { - mkDerivation, - base, - bytestring, - csv, - deepseq, - directory, - dlist, - filemanip, - filepath, - hspec, - hspec-discover, - megaparsec, - mtl, - natural-sort, - optparse-applicative, - prettyprinter, - prettyprinter-ansi-terminal, - regex-tdfa, - semigroups, - terminal-progress-bar, - text, - }: - mkDerivation { - pname = "lentil"; - version = "1.5.8.0"; - sha256 = "08g15kzynync0kl9f247sifzqpkjyvigc5r31w2n3vivi3pdcafn"; - revision = "2"; - editedCabalFile = "0qcibmqkw96658fx3dcfy90k8w4a7xdvllb8h0hk14v0lwvi4cmm"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base - bytestring - csv - deepseq - directory - dlist - filemanip - filepath - megaparsec - mtl - natural-sort - optparse-applicative - prettyprinter - prettyprinter-ansi-terminal - regex-tdfa - semigroups - terminal-progress-bar - text - ]; - testHaskellDepends = [ - base - bytestring - csv - deepseq - directory - dlist - filemanip - filepath - hspec - megaparsec - mtl - natural-sort - optparse-applicative - prettyprinter - prettyprinter-ansi-terminal - regex-tdfa - semigroups - terminal-progress-bar - text - ]; - testToolDepends = [ hspec-discover ]; - description = "frugal issue tracker"; - license = lib.licensesSpdx."GPL-3.0-only"; - mainProgram = "lentil"; - maintainers = [ lib.maintainers.rvl ]; - } - ) { }; - - lentil_1_5_9_1 = callPackage ( { mkDerivation, base, @@ -415000,7 +415828,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "frugal issue tracker"; license = lib.licensesSpdx."GPL-3.0-only"; - hydraPlatforms = lib.platforms.none; mainProgram = "lentil"; maintainers = [ lib.maintainers.rvl ]; } @@ -425910,8 +426737,8 @@ self: { }: mkDerivation { pname = "llvm-pretty"; - version = "0.13.0.0"; - sha256 = "02r2n4yyjxjppk8b2zsk63iznv3gaw3bpb8cz0h8vb88h0836ycx"; + version = "0.13.1.0"; + sha256 = "0i2j1n6xfii2vm5s4jvh3cqa2x03bmz640n4jjlf6aywldmwx3hy"; libraryHaskellDepends = [ base containers @@ -425942,7 +426769,6 @@ self: { mkDerivation, array, base, - binary, bytestring, containers, directory, @@ -425954,7 +426780,6 @@ self: { HUnit, lens, llvm-pretty, - monadLib, mtl, optparse-applicative, pretty, @@ -425978,14 +426803,13 @@ self: { }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.5.0.0"; - sha256 = "02aj89dhrh9fswfqnsvxh68xkwlmf52pzbm90kq0mcr0b5a3qvff"; + version = "0.5.1.0"; + sha256 = "1x0h735xkj5cxjx35040dv5ny5gnmnhs5z57w4hlpaj6sppsy7bg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base - binary bytestring containers fgl @@ -425996,15 +426820,11 @@ self: { utf8-string ]; executableHaskellDepends = [ - array base - binary bytestring - containers fgl fgl-visualize llvm-pretty - monadLib pretty pretty-show ]; @@ -431576,6 +432396,35 @@ self: { } ) { inherit (pkgs) lua5_4; }; + lua_2_3_4 = callPackage ( + { + mkDerivation, + base, + lua5_4, + tasty, + tasty-hunit, + }: + mkDerivation { + pname = "lua"; + version = "2.3.4"; + sha256 = "1zjjpknl37fp5dj0aj59csg5vby87x1s638nw7ip57j52vr7gv2l"; + configureFlags = [ + "-fsystem-lua" + "-f-use-pkgconfig" + ]; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ lua5_4 ]; + testHaskellDepends = [ + base + tasty + tasty-hunit + ]; + description = "Lua, an embeddable scripting language"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { inherit (pkgs) lua5_4; }; + lua-arbitrary = callPackage ( { mkDerivation, @@ -451232,6 +452081,65 @@ self: { } ) { }; + mlkem = callPackage ( + { + mkDerivation, + aeson, + base, + basement, + bytestring, + criterion, + cryptonite, + deepseq, + directory, + memory, + process, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + zlib, + }: + mkDerivation { + pname = "mlkem"; + version = "0.1.0.0"; + sha256 = "0gvphqi5afipffr8xkl7km786lshqzrmkabf0dvii8bcmafiaf63"; + libraryHaskellDepends = [ + base + basement + cryptonite + deepseq + memory + ]; + testHaskellDepends = [ + aeson + base + basement + bytestring + cryptonite + deepseq + directory + memory + process + tasty + tasty-hunit + tasty-quickcheck + text + zlib + ]; + benchmarkHaskellDepends = [ + base + basement + criterion + cryptonite + deepseq + memory + ]; + description = "Module-Lattice-based Key-Encapsulation Mechanism"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + mltool = callPackage ( { mkDerivation, @@ -452418,8 +453326,8 @@ self: { }: mkDerivation { pname = "mockcat"; - version = "0.5.3.0"; - sha256 = "0vizr1ah8dhxq04chbzz8n48f5m6l86gyi27yi9z74w72g12f7f7"; + version = "0.5.5.0"; + sha256 = "1ldwvz15s1nfb9jpx8kjmn1p5350k4nm1ay6lc539wpmxn6s1n34"; libraryHaskellDepends = [ base mtl @@ -452445,23 +453353,26 @@ self: { } ) { }; - mockcat_0_5_4_0 = callPackage ( + mockcat_0_6_0_0 = callPackage ( { mkDerivation, async, base, + hashable, hspec, mtl, + QuickCheck, template-haskell, text, transformers, unliftio, unliftio-core, + unordered-containers, }: mkDerivation { pname = "mockcat"; - version = "0.5.4.0"; - sha256 = "0nzrvavgrw04vz7hq0b55xq8163n8ml9wifscm0y577fq11ab827"; + version = "0.6.0.0"; + sha256 = "1bh8mwxc2l3l647anwkyw0wry3cscgf6dk00xz2mwjshsr7gl8p4"; libraryHaskellDepends = [ base mtl @@ -452474,13 +453385,16 @@ self: { testHaskellDepends = [ async base + hashable hspec mtl + QuickCheck template-haskell text transformers unliftio unliftio-core + unordered-containers ]; description = "Mock library for test in Haskell"; license = lib.licenses.mit; @@ -454537,8 +455451,8 @@ self: { }: mkDerivation { pname = "monad-effect"; - version = "0.2.0.0"; - sha256 = "0p2karn70ha1bf325in4mwhyb09vb7scrbsji7sy1lbrizq6d428"; + version = "0.2.1.0"; + sha256 = "0yrkn1vdz069r8cvxkfpdmrw6gpb4rlxipry9zx3si42qkznn2ay"; libraryHaskellDepends = [ async base @@ -454581,6 +455495,47 @@ self: { } ) { }; + monad-effect-logging = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + clock, + fast-logger, + lens, + monad-effect, + monad-logger, + primitive, + stm, + template-haskell, + text, + time, + }: + mkDerivation { + pname = "monad-effect-logging"; + version = "0.1.0.0"; + sha256 = "1xaaa76icrm39c6xw7y8gamajsa2q480f6djml32jgy6zq7q876a"; + libraryHaskellDepends = [ + aeson + base + bytestring + clock + fast-logger + lens + monad-effect + monad-logger + primitive + stm + template-haskell + text + time + ]; + description = "A flexible logging system utilizing the `monad-effect` effect system"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + monad-exception = callPackage ( { mkDerivation, @@ -458258,6 +459213,25 @@ self: { } ) { }; + monoidal-plugins = callPackage ( + { + mkDerivation, + base, + ghc, + }: + mkDerivation { + pname = "monoidal-plugins"; + version = "0.1.0.0"; + sha256 = "17wmsk7disaddijw3k8drs5bkglfqhhpzx83w7ls4lyksw7z3lw5"; + libraryHaskellDepends = [ + base + ghc + ]; + description = "A monoidal interface for aggregating GHC plugins"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + monoidmap = callPackage ( { mkDerivation, @@ -470522,8 +471496,8 @@ self: { }: mkDerivation { pname = "named-text"; - version = "1.2.1.0"; - sha256 = "079nlyhvwdbihlbxdskk8ny4kia7jz7fnw29y2jp576b4470zrgl"; + version = "1.2.2.0"; + sha256 = "1xlwfandp1xs71f7vmgkazrami9pqqsffndi8v7160b58grc1y6y"; libraryHaskellDepends = [ aeson base @@ -471585,8 +472559,8 @@ self: { }: mkDerivation { pname = "natural"; - version = "0.3.0.6"; - sha256 = "0bnqniczz0hzdlxn3l97k51jm8ivm06plj3khzcksf9al7269hzv"; + version = "0.3.0.7"; + sha256 = "0g39s1pimcfp4agxfa823x0crbnwlx825zpzf675bdjnczdn18jy"; libraryHaskellDepends = [ base lens @@ -473219,8 +474193,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.6.2"; - sha256 = "0hz0rvwdl597vyah1smy0957dpx2w60h4mzv7c0kn2jmcaqab9gq"; + version = "0.8.6.3"; + sha256 = "05v12mdgvn3zd6cpimcdglgmi2cj85pyxlakhzx6z8a77klcyd3h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -477025,6 +477999,58 @@ self: { } ) { }; + network-uri-template = callPackage ( + { + mkDerivation, + base, + conduit, + containers, + hspec, + markdown-unlit, + megaparsec, + network-uri, + optparse-applicative, + prettyprinter, + prettyprinter-ansi-terminal, + text, + }: + mkDerivation { + pname = "network-uri-template"; + version = "0.1.1.1"; + sha256 = "0giq6cgdyk4f2bwggiab771pajcpp3vzp6mqfd65qzs2b4cwkjg7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + megaparsec + network-uri + prettyprinter + text + ]; + executableHaskellDepends = [ + base + containers + optparse-applicative + prettyprinter + prettyprinter-ansi-terminal + text + ]; + testHaskellDepends = [ + base + conduit + containers + hspec + megaparsec + text + ]; + testToolDepends = [ markdown-unlit ]; + description = "TODO"; + license = lib.licenses.agpl3Only; + mainProgram = "network-uri-template"; + } + ) { }; + network-voicetext = callPackage ( { mkDerivation, @@ -479234,6 +480260,33 @@ self: { } ) { }; + nix-cache-server = callPackage ( + { + mkDerivation, + base, + bytestring, + nix, + nix-serve-ng, + relude, + wai, + }: + mkDerivation { + pname = "nix-cache-server"; + version = "0.1.0.0"; + sha256 = "02l2ws47nzwaxkh119kfz64cl3f0bhn5k95n5jxgj9yk4djd910c"; + libraryHaskellDepends = [ + base + bytestring + nix + nix-serve-ng + relude + wai + ]; + description = "Nix binary cache server using nix-serve-ng"; + license = lib.licenses.mit; + } + ) { }; + nix-delegate = callPackage ( { mkDerivation, @@ -480770,6 +481823,39 @@ self: { } ) { }; + no-recursion_0_2_0_0 = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + doctest, + ghc, + }: + mkDerivation { + pname = "no-recursion"; + version = "0.2.0.0"; + sha256 = "1bgglxzgxbqlxbx2li0kr8nxp22rk5r2rvnk90ym35xi58iz8r3p"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + ]; + libraryHaskellDepends = [ + base + ghc + ]; + testHaskellDepends = [ + base + doctest + ]; + description = "A GHC plugin to remove support for recursion"; + license = lib.licensesSpdx."AGPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sellout ]; + } + ) { }; + no-role-annots = callPackage ( { mkDerivation, @@ -483822,6 +484908,29 @@ self: { } ) { }; + nthese = callPackage ( + { + mkDerivation, + base, + semialign, + sop-core, + these, + }: + mkDerivation { + pname = "nthese"; + version = "0.1.0.0"; + sha256 = "1iab7w8nj0zs7s5a2cpvyrw4jfp1kbh0824m90mb3w82qa8rsgys"; + libraryHaskellDepends = [ + base + semialign + sop-core + these + ]; + description = "A heterogeneous, n-ary generalisation of These"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + ntp-control = callPackage ( { mkDerivation, @@ -491352,8 +492461,8 @@ self: { }: mkDerivation { pname = "openai"; - version = "2.1.0"; - sha256 = "07v6qwp32i6dmxavlcx1kg2jp4lcmp8ah4bf0q55ldbd4b1mc88q"; + version = "2.2.1"; + sha256 = "02y0hyamyar36xmlcyzlw2plxhmsjc5z3hm9ci1znzq72yp5k0p8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -494669,7 +495778,7 @@ self: { } ) { }; - opt-env-conf_0_11_0_0 = callPackage ( + opt-env-conf_0_11_1_0 = callPackage ( { mkDerivation, aeson, @@ -494693,8 +495802,8 @@ self: { }: mkDerivation { pname = "opt-env-conf"; - version = "0.11.0.0"; - sha256 = "0krkdybvd3lkjmb6f3x5nmkqh4n025wz5qwmxr34y95ynr36393j"; + version = "0.11.1.0"; + sha256 = "14ywdbmvi2zw7pixpmgcazmhg320zwiri8y9bajvhgmhfa82g3zg"; libraryHaskellDepends = [ aeson autodocodec @@ -505031,7 +506140,6 @@ self: { constraints, containers, deepseq, - ghc-prim, hashable, hashtables, hedgehog, @@ -505051,15 +506159,14 @@ self: { }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.10.0"; - sha256 = "1gr4q79sjp1b6456b249i9ysvd0pcl3acnimvsq6b6knj2zvkshk"; + version = "2.1.11.0"; + sha256 = "1fmwyh1ikc8q40fzfdvmkng65dxifacwk25l3x7akbw7qqcv08lb"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq - ghc-prim hashable hashtables indexed-traversable @@ -505073,7 +506180,6 @@ self: { ]; testHaskellDepends = [ base - ghc-prim hashable hashtables hedgehog @@ -510629,7 +511735,7 @@ self: { hspec, hspec-discover, optparse-applicative, - poppler-cpp, + poppler, range, text, }: @@ -510644,7 +511750,7 @@ self: { bytestring text ]; - libraryPkgconfigDepends = [ poppler-cpp ]; + libraryPkgconfigDepends = [ poppler ]; executableHaskellDepends = [ aeson ansi-wl-pprint @@ -510664,7 +511770,7 @@ self: { mainProgram = "pdftotext.hs"; maintainers = [ lib.maintainers.mpscholten ]; } - ) { poppler-cpp = null; }; + ) { inherit (pkgs) poppler; }; pdynload = callPackage ( { @@ -516403,7 +517509,6 @@ self: { hspec-discover, megaparsec, optparse-applicative, - prettyprinter, process, random, regex-pcre-builtin, @@ -516419,8 +517524,8 @@ self: { }: mkDerivation { pname = "phino"; - version = "0.0.0.45"; - sha256 = "1m2rq48mkwfy8r29y67mlx4dr65yv9yxfw5j82sawgn4jwhzvc0n"; + version = "0.0.0.48"; + sha256 = "06815l05m9x99nvq2sdzigxy7s0ll1dbh0r8argj9rcffdvz10hy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -516435,7 +517540,6 @@ self: { filepath megaparsec optparse-applicative - prettyprinter random regex-pcre-builtin scientific @@ -516458,7 +517562,6 @@ self: { hspec-core megaparsec optparse-applicative - prettyprinter process silently text @@ -532096,6 +533199,75 @@ self: { } ) { }; + postgresql-binary_0_15 = callPackage ( + { + mkDerivation, + aeson, + base, + binary-parser, + bytestring, + bytestring-strict-builder, + containers, + criterion, + iproute, + mtl, + postgresql-libpq, + QuickCheck, + quickcheck-instances, + rerebase, + scientific, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + time, + transformers, + unordered-containers, + uuid, + vector, + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.15"; + sha256 = "1h33igb63d6x572g6ah4kzk5yllf40y91mdkf73gdi8ci4znivc5"; + libraryHaskellDepends = [ + aeson + base + binary-parser + bytestring + bytestring-strict-builder + containers + iproute + mtl + scientific + text + time + transformers + unordered-containers + uuid + vector + ]; + testHaskellDepends = [ + aeson + iproute + postgresql-libpq + QuickCheck + quickcheck-instances + rerebase + tasty + tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + criterion + rerebase + ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + postgresql-common = callPackage ( { mkDerivation, @@ -543335,7 +544507,7 @@ self: { } ) { }; - prompt-hs_1_1_0_1 = callPackage ( + prompt-hs_1_1_0_2 = callPackage ( { mkDerivation, base, @@ -543345,8 +544517,8 @@ self: { }: mkDerivation { pname = "prompt-hs"; - version = "1.1.0.1"; - sha256 = "1x6h8cahb6rwdmk2w155gq2mqk4gl11qrsi96h1l0i0a6nzma9wh"; + version = "1.1.0.2"; + sha256 = "1wfq9glvfn3mgd2l1c6binv5vwlzy3rbv7h861m99qm47j2qljll"; libraryHaskellDepends = [ base microlens @@ -543794,8 +544966,8 @@ self: { pname = "proquint"; version = "0.1.0.0"; sha256 = "04hhvrrclyav0nhk6zqp9s58vxad8ndi6yw851qprd6h7wr57wg5"; - revision = "2"; - editedCabalFile = "1bhc2cz76fi3rrn36nrgzi531f3p18k3n7q5mp1xyjz3vv0b2h2d"; + revision = "3"; + editedCabalFile = "06gfq4g2ryncqrnhqc3dfwangav0m1hrxdr11z5k1433mzpzb28m"; libraryHaskellDepends = [ array base @@ -544749,8 +545921,8 @@ self: { }: mkDerivation { pname = "proto3-wire"; - version = "1.4.4"; - sha256 = "15r1irfld81j1mm3yr6lnbb74qlkskp2qcwxhicrdrj0w5nvb8vd"; + version = "1.4.5"; + sha256 = "0khwcn2wkbvgr643my5rwc2v959ypy831n3icp9jnhgmx8fj6lxm"; libraryHaskellDepends = [ base bytestring @@ -544774,6 +545946,7 @@ self: { base bytestring cereal + containers doctest QuickCheck tasty @@ -547447,39 +548620,60 @@ self: { pure-noise = callPackage ( { mkDerivation, + aeson, + aeson-pretty, base, + bytestring, deepseq, - mwc-random, + directory, + filepath, + JuicyPixels, + massiv, primitive, + random, tasty, tasty-bench, tasty-discover, + tasty-golden, tasty-hunit, tasty-quickcheck, + text, + typed-process, vector, }: mkDerivation { pname = "pure-noise"; - version = "0.2.0.0"; - sha256 = "05wp0nlvang8jfyzxi9b080d4dppn5fmj28dhwh5v65lrnh5fzzf"; + version = "0.2.1.1"; + sha256 = "03vwa4yg1shlv7h092a53nxfnp4qa0yi0c17jrv3nz3jdzac1qpr"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ + aeson + aeson-pretty base + bytestring + directory + filepath + JuicyPixels + massiv primitive tasty tasty-discover + tasty-golden tasty-hunit tasty-quickcheck + text + typed-process ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base deepseq - mwc-random + massiv primitive + random tasty tasty-bench vector @@ -552971,8 +554165,8 @@ self: { }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.8.1"; - sha256 = "10x2yzr4pykgb8krassql1dl81vp78yx06ykswwy6cld46hq1d5h"; + version = "0.8.2"; + sha256 = "0lbpijrychl5z1garzs52nv7rnl34ll0sgqcb5znccafgnah04gd"; libraryHaskellDepends = [ base constraints @@ -557589,8 +558783,6 @@ self: { { mkDerivation, base, - Cabal, - cabal-doctest, data-functor-logistic, distributive, doctest, @@ -557602,13 +558794,8 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.5.4"; - sha256 = "03ibbfz0n88sv5nragvbnlm5rn3ljfycxk6pgz8wriylfs1l60bd"; - setupHaskellDepends = [ - base - Cabal - cabal-doctest - ]; + version = "1.5.5"; + sha256 = "0xbngg520d1r1lp3zsjgdvajz4i6x12ia9zyka8vivypiwcg7ll8"; libraryHaskellDepends = [ base data-functor-logistic @@ -557616,15 +558803,19 @@ self: { template-haskell transformers ]; + libraryToolDepends = [ markdown-unlit ]; testHaskellDepends = [ base data-functor-logistic distributive - doctest tasty tasty-hunit ]; - testToolDepends = [ markdown-unlit ]; + testToolDepends = [ + doctest + markdown-unlit + ]; + doHaddock = false; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = lib.licenses.bsd3; } @@ -564367,145 +565558,6 @@ self: { ) { }; reflex = callPackage ( - { - mkDerivation, - base, - bifunctors, - commutative-semigroups, - comonad, - constraints, - constraints-extras, - containers, - criterion, - data-default, - deepseq, - dependent-map, - dependent-sum, - exception-transformers, - exceptions, - haskell-src-exts, - haskell-src-meta, - hspec, - lens, - loch-th, - MemoTrie, - mmorph, - monad-control, - monoidal-containers, - mtl, - patch, - prim-uniq, - primitive, - process, - profunctors, - random, - ref-tf, - reflection, - semialign, - semigroupoids, - split, - stm, - syb, - template-haskell, - text, - these, - these-lens, - time, - transformers, - unbounded-delays, - witherable, - }: - mkDerivation { - pname = "reflex"; - version = "0.9.3.4"; - sha256 = "1qh2xbg4q2gif25hinz72j8ka2w976lccklknwgijxaayh92if4a"; - libraryHaskellDepends = [ - base - bifunctors - commutative-semigroups - comonad - constraints - constraints-extras - containers - data-default - dependent-map - dependent-sum - exception-transformers - exceptions - haskell-src-exts - haskell-src-meta - lens - MemoTrie - mmorph - monad-control - monoidal-containers - mtl - patch - prim-uniq - primitive - profunctors - random - ref-tf - reflection - semialign - semigroupoids - stm - syb - template-haskell - these - time - transformers - unbounded-delays - witherable - ]; - testHaskellDepends = [ - base - bifunctors - commutative-semigroups - constraints - constraints-extras - containers - deepseq - dependent-map - dependent-sum - hspec - lens - monoidal-containers - mtl - patch - ref-tf - semialign - split - text - these - these-lens - transformers - witherable - ]; - benchmarkHaskellDepends = [ - base - containers - criterion - deepseq - dependent-map - dependent-sum - loch-th - mtl - primitive - process - ref-tf - split - stm - time - transformers - ]; - description = "Higher-order Functional Reactive Programming"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.alexfmpe ]; - } - ) { }; - - reflex_0_9_4_0 = callPackage ( { mkDerivation, base, @@ -564639,7 +565691,6 @@ self: { ]; description = "Higher-order Functional Reactive Programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.alexfmpe ]; } ) { }; @@ -573008,8 +574059,8 @@ self: { }: mkDerivation { pname = "resource-registry"; - version = "0.1.1.0"; - sha256 = "0zwhnidckc9541sasvxlvysl7qjka1g9cq80h4lzv46kqwagmv9p"; + version = "0.2.0.0"; + sha256 = "1akvv9ydkg55q7vhnm6va2mb2cmyh29f38bkw0m3cv0wxhf3hm1d"; libraryHaskellDepends = [ base bimap @@ -577134,6 +578185,93 @@ self: { } ) { }; + rio_0_1_24_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + deepseq, + directory, + exceptions, + filepath, + hashable, + hspec, + hspec-discover, + microlens, + microlens-mtl, + mtl, + primitive, + process, + QuickCheck, + text, + time, + typed-process, + unix, + unliftio, + unliftio-core, + unordered-containers, + vector, + }: + mkDerivation { + pname = "rio"; + version = "0.1.24.0"; + sha256 = "1gyrcyqxvffw44r1dwxdnchccdf66xr1k81lq7lb97n1rh70kqy9"; + libraryHaskellDepends = [ + base + bytestring + containers + deepseq + directory + exceptions + filepath + hashable + microlens + microlens-mtl + mtl + primitive + process + text + time + typed-process + unix + unliftio + unliftio-core + unordered-containers + vector + ]; + testHaskellDepends = [ + base + bytestring + containers + deepseq + directory + exceptions + filepath + hashable + hspec + microlens + microlens-mtl + mtl + primitive + process + QuickCheck + text + time + typed-process + unix + unliftio + unliftio-core + unordered-containers + vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A standard library for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + rio-app = callPackage ( { mkDerivation, @@ -578107,8 +579245,8 @@ self: { }: mkDerivation { pname = "rme"; - version = "0.1"; - sha256 = "1d4mrmyq9124l13skx3na5xwhqh90hj1bhydars0jyd9axllyx89"; + version = "0.1.1"; + sha256 = "0c7q0jwhlwsvy6prgwczabd039pza2zlvxddfiswcma4l1npszly"; libraryHaskellDepends = [ base containers @@ -578132,10 +579270,8 @@ self: { }: mkDerivation { pname = "rme-what4"; - version = "0.1"; - sha256 = "1ngcydw0ns0yxm393lwrw05jl0rmhhsh2jpr05nv9l0v71sbg087"; - revision = "1"; - editedCabalFile = "19l4p4c88m9hpxr6wpmfrk0rsk52wkfj0msj36bipjp1cdyxf7rz"; + version = "0.1.1"; + sha256 = "0px6id65hjk8cqphvs6lr05212w9d7i2hryv26v5ia40vh9nxhyf"; libraryHaskellDepends = [ base bv-sized @@ -578707,8 +579843,8 @@ self: { }: mkDerivation { pname = "roc-id"; - version = "0.2.0.5"; - sha256 = "1a70y8l45lyglq6rrxrp20jfpwg87gkga4wdxdf15nzh0p1a417f"; + version = "0.2.0.6"; + sha256 = "19wqi1p8d59y7961i5kvwy849f4napdz464xv5ar6b73ysi9vbnj"; libraryHaskellDepends = [ base MonadRandom @@ -581421,6 +582557,63 @@ self: { } ) { }; + rpmbuild-order_0_4_13 = callPackage ( + { + mkDerivation, + base, + case-insensitive, + directory, + extra, + fgl, + filepath, + graphviz, + hspec, + regex-tdfa, + safe, + simple-cmd, + simple-cmd-args, + unix, + }: + mkDerivation { + pname = "rpmbuild-order"; + version = "0.4.13"; + sha256 = "0fvq1jxr7dc9r9yg0qxli9313gkb3ppf4cjb5hg16m7lzrn4nrld"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + case-insensitive + directory + extra + fgl + filepath + graphviz + regex-tdfa + safe + simple-cmd + ]; + executableHaskellDepends = [ + base + extra + fgl + simple-cmd-args + ]; + testHaskellDepends = [ + base + directory + extra + hspec + simple-cmd + unix + ]; + description = "Sort RPM packages in dependency order"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "rpmbuild-order"; + broken = true; + } + ) { }; + rpmostree-update = callPackage ( { mkDerivation, @@ -583066,8 +584259,8 @@ self: { }: mkDerivation { pname = "rzk"; - version = "0.7.6"; - sha256 = "0gr1ay9fg6iilc12jfi4ixmw5mgrhv36x1k12f96zk83ppwam765"; + version = "0.7.7"; + sha256 = "05hq5n9sm8vmp75f8a66apm0yaq26y5ip7sj25mpdcad6zmn2q3q"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -587453,8 +588646,8 @@ self: { }: mkDerivation { pname = "sayable"; - version = "1.2.5.0"; - sha256 = "05jf2423l85vwc98fxib9ahlq9w4zhan4912jmfk86gvhsd35hls"; + version = "1.2.6.0"; + sha256 = "10avl2p6bhh490cjngfvrbqydcagskfjy0xgd13msscmw50ghiqj"; libraryHaskellDepends = [ base bytestring @@ -587554,7 +588747,7 @@ self: { } ) { }; - sbp_6_3_0 = callPackage ( + sbp_6_3_1 = callPackage ( { mkDerivation, aeson, @@ -587583,8 +588776,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.3.0"; - sha256 = "0s8v31ivnsxm0wnxzbx4s1c0z5hfndkpq91fnfg0zq6bmlwc504w"; + version = "6.3.1"; + sha256 = "15cbyml31b0a2ky9lnkbg9whn0622wmqm3yvk3v8jy986cbnvzs3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -587770,7 +588963,7 @@ self: { } ) { inherit (pkgs) z3; }; - sbv_12_2 = callPackage ( + sbv_13_1 = callPackage ( { mkDerivation, array, @@ -587783,6 +588976,7 @@ self: { deepseq, directory, filepath, + Glob, haskell-src-exts, haskell-src-meta, libBF, @@ -587798,7 +588992,9 @@ self: { tasty-hunit, tasty-quickcheck, template-haskell, + temporary, text, + th-expand-syns, time, transformers, tree-view, @@ -587807,8 +589003,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "12.2"; - sha256 = "1ws5mnd2xv4k50pwwghm3yldir4a0p6r8pi6n7zsk7wcp7mxz5m3"; + version = "13.1"; + sha256 = "0f8ylqalxm4nlcdhw77ild18a9hamkvz9m1jz64vhx8xgln4n8ag"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -587832,6 +589028,7 @@ self: { syb template-haskell text + th-expand-syns time transformers tree-view @@ -587844,6 +589041,7 @@ self: { deepseq directory filepath + Glob mtl process QuickCheck @@ -587852,6 +589050,7 @@ self: { tasty-golden tasty-hunit tasty-quickcheck + temporary ]; testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ @@ -608068,7 +609267,7 @@ self: { } ) { }; - shakespeare_2_1_7_1 = callPackage ( + shakespeare_2_2_0 = callPackage ( { mkDerivation, aeson, @@ -608097,8 +609296,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.1.7.1"; - sha256 = "06fix8z3kjgl50k5srbixi100jx5rf050xbh9f564n4s5q2irbys"; + version = "2.2.0"; + sha256 = "07mka875c212iclbq6qh94c0axhdh1wwnsijld43ri4yfn6iqpjk"; libraryHaskellDepends = [ aeson base @@ -613697,6 +614896,8 @@ self: { pname = "simple-sql-parser"; version = "0.8.0"; sha256 = "01mymjr3gbdpkd660vz2v024b8jvzbzwqznmdxf3j2xpbmy36svw"; + revision = "1"; + editedCabalFile = "0lp9kab0yj7fqdsyavgq31r15dfq55a19ahljxhryzb2v1ggxpny"; libraryHaskellDepends = [ base containers @@ -624435,8 +625636,8 @@ self: { pname = "soap"; version = "0.2.3.6"; sha256 = "0xmiabnx814rwdwrcipv0kja6ljgwqr4x58sa8s07nrs3ph8xz6d"; - revision = "3"; - editedCabalFile = "1p34yyxln56n75m7hha75p1qm73vjyxbm54lwq566ayqf7dikp2y"; + revision = "5"; + editedCabalFile = "11hm35pbvk6hxznkrk2q45qk1x28lsgcgynl067nr13rjp6skd2l"; libraryHaskellDepends = [ base bytestring @@ -624488,8 +625689,8 @@ self: { pname = "soap-openssl"; version = "0.1.0.2"; sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210"; - revision = "3"; - editedCabalFile = "1nz8h4p94pn2kv65jbdybn9nf5djm9kycbpigk5gbh0ar52zgl4k"; + revision = "5"; + editedCabalFile = "03a8a0hyms2byh1djisjs7jb41rpjhlz29mc47ci27bhz0v3cmx8"; libraryHaskellDepends = [ base configurator @@ -624511,36 +625712,34 @@ self: { mkDerivation, base, configurator, - connection, + crypton-connection, + crypton-x509, + crypton-x509-store, + crypton-x509-validation, data-default, http-client, http-client-tls, soap, text, tls, - x509, - x509-store, - x509-validation, }: mkDerivation { pname = "soap-tls"; - version = "0.1.1.4"; - sha256 = "051shlb128lsacd2cjm4kpyqkmzdcwcj7ppl7l4n1k5j9g6k72yf"; - revision = "2"; - editedCabalFile = "06a65jphfn1nxcnm4r6gf12afxhd7cs6ax8kq22w4pai98jk3jwn"; + version = "0.2.0.0"; + sha256 = "0bi5pwv49bx0hpsamr6nk9nxzx6b1cyq9rd8g9hbmz44v3n9kyqr"; libraryHaskellDepends = [ base configurator - connection + crypton-connection + crypton-x509 + crypton-x509-store + crypton-x509-validation data-default http-client http-client-tls soap text tls - x509 - x509-store - x509-validation ]; description = "TLS-enabled SOAP transport (using tls package)"; license = lib.licenses.mit; @@ -625369,6 +626568,67 @@ self: { } ) { }; + solana-staking-csvs_0_2_0_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + cassava, + cmdargs, + cointracking-imports, + containers, + exceptions, + hedgehog, + http-client, + http-types, + mtl, + req, + scientific, + tasty, + tasty-hedgehog, + tasty-hunit, + text, + time, + }: + mkDerivation { + pname = "solana-staking-csvs"; + version = "0.2.0.0"; + sha256 = "14bw7rakigs3a3qi40jl2hf22a6d5id41zhcj5sk5yj59ba8a47m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + cassava + cmdargs + cointracking-imports + containers + exceptions + http-client + http-types + mtl + req + scientific + text + time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base + hedgehog + tasty + tasty-hedgehog + tasty-hunit + ]; + description = "Generate CSV Exports of your Solana Staking Rewards"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "solana-staking-csvs"; + } + ) { }; + solar = callPackage ( { mkDerivation, @@ -631375,8 +632635,8 @@ self: { }: mkDerivation { pname = "squeal-postgresql-qq"; - version = "0.1.4.0"; - sha256 = "11mzdng0828r5l00zxk7w9s24f3h666n5sin79rzhdraisqfv35j"; + version = "0.1.5.0"; + sha256 = "05isiwqwcl22w0gzwsjxdfbnkhiyxqjqkz95qp67m5nhbnfa061s"; libraryHaskellDepends = [ aeson base @@ -636427,10 +637687,8 @@ self: { }: mkDerivation { pname = "statistics"; - version = "0.16.3.0"; - sha256 = "1rx1dckaj54hzx03zqf4rz43hp80rxxgi8dp31rwy9qjckk4dv03"; - revision = "1"; - editedCabalFile = "1996zyq4n7c5zh36h3nhzx5xyd7z6fa3mqsldrgii56g7ixq1rkz"; + version = "0.16.4.0"; + sha256 = "0srx02a591kyim3khd99k8mjni03668b2774wjv7ifxyc8kw9jw2"; libraryHaskellDepends = [ aeson async @@ -639554,6 +640812,5551 @@ self: { } ) { }; + stratosphere_1_0_1 = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + base, + bytestring, + containers, + mono-traversable, + sydtest, + sydtest-discover, + text, + }: + mkDerivation { + pname = "stratosphere"; + version = "1.0.1"; + sha256 = "19wq9bw655gm38nqzdnvcb18fynvymk0z9by3w0vh28sql8vw7yn"; + libraryHaskellDepends = [ + aeson + aeson-pretty + base + bytestring + containers + mono-traversable + text + ]; + testHaskellDepends = [ + aeson + aeson-pretty + base + bytestring + containers + mono-traversable + sydtest + sydtest-discover + text + ]; + description = "EDSL for AWS CloudFormation"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + stratosphere-accessanalyzer = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-accessanalyzer"; + version = "1.0.1"; + sha256 = "1rlhd7b4dlb8dz8b30i5405f9yig16d1wgi1kzm2cbdj0vmazcci"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AccessAnalyzer"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-acmpca = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-acmpca"; + version = "1.0.1"; + sha256 = "18l77b4bpcscfrpch7w8vffrnfl10jcp83cnv5g9glnqazdrvlx4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ACMPCA"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-aiops = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-aiops"; + version = "1.0.1"; + sha256 = "03fpmrmqvgqjaq2rrsnn1620h170fm0277bcwrxkkmi75ggfhydj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AIOps"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-amazonmq = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-amazonmq"; + version = "1.0.1"; + sha256 = "1b86qfd382m356jbvb3fq93blrc94ic42q0fzkrzv6f3495xxaxs"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AmazonMQ"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-amplify = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-amplify"; + version = "1.0.1"; + sha256 = "1cn5zq8mwbxz02zh3iidmvh0jjy5c3dpym625hj7rx1bv8vmzhgm"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Amplify"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-amplifyuibuilder = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-amplifyuibuilder"; + version = "1.0.1"; + sha256 = "1w2r2yfij7rikc7d6jkli05kzvcs60bl9sm1cwqrna65b7qbw0d6"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AmplifyUIBuilder"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-apigateway = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-apigateway"; + version = "1.0.1"; + sha256 = "1vfgwqpdcgwhl3br8xahbhqkclbdy5bwrd02bkr1z7vqrlqn9bpr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ApiGateway"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-apigatewayv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-apigatewayv2"; + version = "1.0.1"; + sha256 = "0bl6piby50h9r2siivv42hdva1zf079w437g69b2jg56168xq66h"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ApiGatewayV2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-appconfig = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appconfig"; + version = "1.0.1"; + sha256 = "1vdi9hg4s0zmrr7vzq4qvadb6a11i0pglib9icy8d4f67vq67gh4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppConfig"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-appflow = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appflow"; + version = "1.0.1"; + sha256 = "1dg9w1j9kk1p4wajd78vjrrx84qhsrinxxfagagvxgnr0q0d4mv7"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppFlow"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-appintegrations = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appintegrations"; + version = "1.0.1"; + sha256 = "0kkrj1in8vd3r8q8ypr854ahgfi46a18iz5fj78sadj5miii9c98"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppIntegrations"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-applicationautoscaling = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-applicationautoscaling"; + version = "1.0.1"; + sha256 = "1ly1fzjqngndcgxamkdijpw1nd554mlw413s8w6c4gia3j271i0s"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ApplicationAutoScaling"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-applicationinsights = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-applicationinsights"; + version = "1.0.1"; + sha256 = "1lp4qrfchvypk6gqgzxzfhd8jzl1n9n14d9dd43r106537iy1kxv"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ApplicationInsights"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-applicationsignals = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-applicationsignals"; + version = "1.0.1"; + sha256 = "04l9v2n8yyakyp4mck2i2m5107px7hhfhii3ncwa0bn40fs7s5hj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ApplicationSignals"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-appmesh = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appmesh"; + version = "1.0.1"; + sha256 = "1psiavnfcgf8qd9v6zmf8l6br5956jc1qh439yrnbqnvwka5v1bw"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppMesh"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-apprunner = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-apprunner"; + version = "1.0.1"; + sha256 = "14wxj20yvpgp0ndhnhark8ch4cldxi2sm1ffdms1f1rfa5q0jkwn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppRunner"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-appstream = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appstream"; + version = "1.0.1"; + sha256 = "1yx47rc7ckpawbnfzdx4nwarmd605ggj9ri8fxxldgvydlhbh74p"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppStream"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-appsync = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appsync"; + version = "1.0.1"; + sha256 = "1ca590kkdxsq6jkxpsfh7ag7rsaif7cfrl3b8gfxly0nwxifcglz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppSync"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-apptest = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-apptest"; + version = "1.0.1"; + sha256 = "1dg3901p0vr2f75ifj85gwcmmhfpzib9dcb21prxkps1vyrfnqyp"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppTest"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-aps = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-aps"; + version = "1.0.1"; + sha256 = "02v7lfmncan6h911pa1wipzk196b04gwf9ryb5ylsmnpw64f0iax"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS APS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-arcregionswitch = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-arcregionswitch"; + version = "1.0.1"; + sha256 = "1m0xwnm1qy0ah1dy9inhappij8zravricp9afr1010n6xyd0p39c"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ARCRegionSwitch"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-arczonalshift = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-arczonalshift"; + version = "1.0.1"; + sha256 = "02hx2gyb0nvgb30bwsvcflb3329cvpfpzdkdnb1l5jsdz902izhi"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ARCZonalShift"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ask = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ask"; + version = "1.0.1"; + sha256 = "16pbjly42494zhj3v4g1plhpkgax7mfgjay06d5agmsi48xy02d8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ASK"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-athena = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-athena"; + version = "1.0.1"; + sha256 = "0jy2gaaqbryn5nvp3lqwaqii75im1ybh39dcd45446gcfgxf93ks"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Athena"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-auditmanager = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-auditmanager"; + version = "1.0.1"; + sha256 = "1w9dhaz2k0aidx396dv84yszfhy7acb5sd394q2h5abjkqh6m4b1"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AuditManager"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-autoscaling = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-autoscaling"; + version = "1.0.1"; + sha256 = "1g0qmj15d0dfsvag5v8gb673hhmwfwjljyhh7il6q0isvaanf1b5"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AutoScaling"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-autoscalingplans = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-autoscalingplans"; + version = "1.0.1"; + sha256 = "0wj3yva75d5n32n30wkkzdb40fc1lmghknzc8dpwx09q8w7zgd4p"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AutoScalingPlans"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-b2bi = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-b2bi"; + version = "1.0.1"; + sha256 = "08jjpww93jfakhzi8jjzxphs323pvfwnsps3q6lrclw8jc5qwkwl"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS B2BI"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-backup = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-backup"; + version = "1.0.1"; + sha256 = "1d7s8qmv8ggvrkghs07h9di3s3gd05kll8bxi8gj98qdd2qzw417"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Backup"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-backupgateway = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-backupgateway"; + version = "1.0.1"; + sha256 = "1s5bl2nz35p35687mn278wai240jspmns2p42mzpfnbcqbrd68xn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS BackupGateway"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-batch = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-batch"; + version = "1.0.1"; + sha256 = "19inxlshf5z8g530w6d0d6h8s7rcv92zjdk9xja37ddl9ba27xw4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Batch"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-bcmdataexports = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-bcmdataexports"; + version = "1.0.1"; + sha256 = "1xrxy74gsi3bqx29476ldh3z23dbjqm6gag5wagd4smf2ksdlzpg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS BCMDataExports"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-bedrock = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-bedrock"; + version = "1.0.1"; + sha256 = "1prlarhqs86324zraizlf14hfcldv3yq22ab9nw4c4dj74dma9k9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Bedrock"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-bedrockagentcore = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-bedrockagentcore"; + version = "1.0.1"; + sha256 = "0kk0dpd63pg0s54k6s4dm0yrd08rvsylkr3gnywi8brvip5lp4pz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS BedrockAgentCore"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-billing = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-billing"; + version = "1.0.1"; + sha256 = "0ljim7k8p3kjkb7pqsiync0wa5qm2v7hyk9s6sm9m021kh1l5591"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Billing"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-billingconductor = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-billingconductor"; + version = "1.0.1"; + sha256 = "12cwqmc5z7vl75qn4gcmwq8fyh30dhi7bl8lh8jjmdrw58jhphny"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS BillingConductor"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-budgets = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-budgets"; + version = "1.0.1"; + sha256 = "03qk8vk3w11vvcbmcwzwk0vsx86lp50i320zcgdgbc3qszw2ddbm"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Budgets"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-cassandra = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cassandra"; + version = "1.0.1"; + sha256 = "0r9n6rr77dfw2sjkhn4ir2v7qjxmf7hr7l2f6n1gs2nfmhqxglla"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Cassandra"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ce = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ce"; + version = "1.0.1"; + sha256 = "12w1pwdbhxlga7cvhpa3z2lzc5zsfc3l9a6a6gs1h9f9s51nsx2d"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CE"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-certificatemanager = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-certificatemanager"; + version = "1.0.1"; + sha256 = "0s5df7yd8f1zgyx39ypn2x1lf5hhf5b6jjg9w9zyqm4n94j5zzn4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CertificateManager"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-chatbot = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-chatbot"; + version = "1.0.1"; + sha256 = "0kdxz4l6pklmdf38irm70mcw8rhz824l9fbc4jbmnqsrj10jdnir"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Chatbot"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-cleanrooms = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cleanrooms"; + version = "1.0.1"; + sha256 = "0dxqdblx0g1hicfk7fzyc3z0jn6q8178vg57swrd27dw94kbaah7"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CleanRooms"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-cleanroomsml = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cleanroomsml"; + version = "1.0.1"; + sha256 = "1yrci7r02kacgx6fi0pbkjchykk0a4mj7m6is9wnx5vpxknslvlv"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CleanRoomsML"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-cloud9 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cloud9"; + version = "1.0.1"; + sha256 = "1bfgnf4sifzva6nfk58l9d16ma2chvhxcnihg32w4yikjpayiq3h"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Cloud9"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-cloudformation = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cloudformation"; + version = "1.0.1"; + sha256 = "0pq0qfxqzf56k4adfaf5nqfgk346102ipkvlqv8axpdwhkqlfkrh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CloudFormation"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-cloudfront = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cloudfront"; + version = "1.0.1"; + sha256 = "0bx639jmcips2s0rq44wxywqdk3id4ch1hy7n7phj31j23a3c2xm"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CloudFront"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-cloudtrail = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cloudtrail"; + version = "1.0.1"; + sha256 = "0dgfxvzzv5vyphkdj9y1cnwykymby2r41140nrr9rn0sc163s25h"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CloudTrail"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-cloudwatch = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cloudwatch"; + version = "1.0.1"; + sha256 = "1bfpbn9nlvw6m3x248wwlkx7cf1spq8px1jfs8frnb72lvmyhq1m"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CloudWatch"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codeartifact = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codeartifact"; + version = "1.0.1"; + sha256 = "1dw39ijfapva0ia7b452i73qi0xy6lm0r8wmp96spj7qaq34zlac"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeArtifact"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codebuild = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codebuild"; + version = "1.0.1"; + sha256 = "069g8j16pw1az8ayxr9fgb9rxhv9w0b2jc57nar1ihvp0zgknxjr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeBuild"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codecommit = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codecommit"; + version = "1.0.1"; + sha256 = "0n9mnmdabv15qvhp3vg64c3gcmgpgnf8d9galmifvjvrbmwz3inm"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeCommit"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codeconnections = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codeconnections"; + version = "1.0.1"; + sha256 = "0m3m8kxkjsm1bjg8ldqnb2r4gr2vwf2p9mbwh2qggsz230bi7lp3"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeConnections"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codedeploy = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codedeploy"; + version = "1.0.1"; + sha256 = "0xrvhprwdmz76vzihfrw7gb3c9cjxvy6fwsdc8hk85xpar4dqbqr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeDeploy"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codeguruprofiler = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codeguruprofiler"; + version = "1.0.1"; + sha256 = "0fbfgwvvbjpfv70k8z1gzjx3b4qsyqd3bvavgjcd92dsahj6i1rl"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeGuruProfiler"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codegurureviewer = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codegurureviewer"; + version = "1.0.1"; + sha256 = "0px11byzfzn1h8dmfi09svh0908dn7mywlkjajjbwszg6rgrafvw"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeGuruReviewer"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codepipeline = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codepipeline"; + version = "1.0.1"; + sha256 = "10ppzdvirbn3a7xs4q83n4y2lzmsmzrmj3diwgjgbxbfl8brhxq6"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodePipeline"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codestar = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codestar"; + version = "1.0.1"; + sha256 = "0j46gsn126s1qgznr0p770sb80pp4cnmhr7ffdrcnjh0ddqvgl2a"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeStar"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codestarconnections = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codestarconnections"; + version = "1.0.1"; + sha256 = "1f4sda0kgbw0pd1xmwq0v06iv81sx1l3a6rz4b5xxwrkavfbrapz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeStarConnections"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-codestarnotifications = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codestarnotifications"; + version = "1.0.1"; + sha256 = "0b2jrzdgdnqyx3aab4c0lphg36yyhkqh7crr9qynb91qmlz2n7hy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeStarNotifications"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-cognito = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cognito"; + version = "1.0.1"; + sha256 = "0rbcz3zdcjzlgy4zyl76gcb05w20hk00mcgkkgf3f45p45f3ls6d"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Cognito"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-comprehend = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-comprehend"; + version = "1.0.1"; + sha256 = "0vjh4nag2cn47qjzb0hq2a39qm9h5w7zz7ghidf4aylhf44hj7ml"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Comprehend"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-config = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-config"; + version = "1.0.1"; + sha256 = "1dlmzy3sybfc41wijr9p7m466lhy0b8lfvsjcwm1cwx0z46br0hg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Config"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-connect = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-connect"; + version = "1.0.1"; + sha256 = "1spszhn88yy50fiqnvxg7fhp4p2b2wh935sw38vcznfcda05k9nb"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Connect"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-connectcampaigns = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-connectcampaigns"; + version = "1.0.1"; + sha256 = "1xza42n9k53wj5cgz33y3a7kkb2d9dnsjkzpsrmqjnqx7dg0yzd4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ConnectCampaigns"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-connectcampaignsv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-connectcampaignsv2"; + version = "1.0.1"; + sha256 = "168r0m35rxgz4mas739dasm6cvqk6bhdc889y0z39037x2a8ir5b"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ConnectCampaignsV2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-controltower = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-controltower"; + version = "1.0.1"; + sha256 = "0ma0iwc2164xjkv2fvirhbi77vpkmpq1pz8s021ya32ivysyii5z"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ControlTower"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-cur = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cur"; + version = "1.0.1"; + sha256 = "005a4brbj0xys8rzyyy7jbgplmg5ans2ih5g5gk287x4c2rgdjgg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CUR"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-customerprofiles = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-customerprofiles"; + version = "1.0.1"; + sha256 = "08swdvi7hj0yl9h7m7c2ijrx9jlii7zb4pxajb8gsia0037vyqza"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CustomerProfiles"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-databrew = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-databrew"; + version = "1.0.1"; + sha256 = "0g81slnivc8nfddrf1f0sg5dcw7117g6vzy7z9bq158sv8fchxkr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DataBrew"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-datapipeline = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-datapipeline"; + version = "1.0.1"; + sha256 = "0xia4800k3zhr030fkq8bpbv9nyri9wszy291zawbs1z1d13adjz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DataPipeline"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-datasync = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-datasync"; + version = "1.0.1"; + sha256 = "0vs0h15xb3mz22kik6vdgn2v1mgh720gxcxl2ndzxqs7r0ky9ghy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DataSync"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-datazone = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-datazone"; + version = "1.0.1"; + sha256 = "09nbmlxzf8n7f3dnhzlrykvdcpdiwny3zjq0w1qpsna92x6ds3rg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DataZone"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-dax = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-dax"; + version = "1.0.1"; + sha256 = "00k201yz1xmfyi85d52csbzdyl1gqg6nb9ddpy365iaasj8kmwy9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DAX"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-deadline = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-deadline"; + version = "1.0.1"; + sha256 = "14v08l4yh6fk94j9m019n9vbpg72bqfk1s6lcfazjb7mhcncxb1p"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Deadline"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-detective = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-detective"; + version = "1.0.1"; + sha256 = "1x8x5hqd8jzc1lwcjl5gcy23xhr4cj5a5s6kan0wfkhzng470ai6"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Detective"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-devopsguru = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-devopsguru"; + version = "1.0.1"; + sha256 = "13vkgc9403r9x8zyzi80lbaxa44kk0s8mdxq12z56qmkaq3nrrxr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DevOpsGuru"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-directoryservice = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-directoryservice"; + version = "1.0.1"; + sha256 = "0gxgp558zhlmn7aky58w9mjbb78kv6vxm46dsh4md5y6s2szachx"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DirectoryService"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-dlm = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-dlm"; + version = "1.0.1"; + sha256 = "1hbzbzhw22f3lk34pfwkgvnszixgdl6d5vlb0ds2sdxp969j3kja"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DLM"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-dms = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-dms"; + version = "1.0.1"; + sha256 = "1pqlgy8f4s5h800ldsazyfdfbmylvpd63aq1nbw4sxcvbdng21k8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DMS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-docdb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-docdb"; + version = "1.0.1"; + sha256 = "0s68wn3x2j7vvkjjxsyx10lz81xca5ldlgdn0gwrfws3xq6h0hgr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DocDB"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-docdbelastic = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-docdbelastic"; + version = "1.0.1"; + sha256 = "0hnhgg1r6vzlw8n1jh4q4c6pibr41mdmshz51ap8hla97q9bqlpn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DocDBElastic"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-dsql = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-dsql"; + version = "1.0.1"; + sha256 = "15riws2nfyh6y41wv45rsw69w62dig5fmxy56waahxwa0nxl0s4j"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DSQL"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-dynamodb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-dynamodb"; + version = "1.0.1"; + sha256 = "09ds9i57zng4rsv8bs11m8i454am6bs5rf2dp5wrlgqx3qvy6rdb"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DynamoDB"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ec2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ec2"; + version = "1.0.1"; + sha256 = "0h7jxqrag38y5gzms69gip9mdnv8hq1gkd197gvsr3in72f3mrxc"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EC2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ecr = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ecr"; + version = "1.0.1"; + sha256 = "0kk24xy6fdlxv0i10ic6plvgd6v0iygwd4dnn6ac62qbap250rkn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ECR"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ecs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ecs"; + version = "1.0.1"; + sha256 = "00j25gbg4k2fc7l4sy6sqy5qf8ylxihvwzw72mbspgplsjw5bhmp"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ECS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-efs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-efs"; + version = "1.0.1"; + sha256 = "02zn6lqci68fl671fbi66wqcvyn6342fswzl8rvfm6hawbyshx26"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EFS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-eks = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-eks"; + version = "1.0.1"; + sha256 = "0gxxv7al64yjz1r0fcyppdrrihvb0n76qmh3ivq0bslzlx3f3jfi"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EKS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-elasticache = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-elasticache"; + version = "1.0.1"; + sha256 = "07w1cd4z7k4iqald5vjpnd05dqifj63148abpdmsc1wkvk2lvpza"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ElastiCache"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-elasticbeanstalk = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-elasticbeanstalk"; + version = "1.0.1"; + sha256 = "1ri1vx71n3gfsy8wl2abbvf9x4avjn2hjfpyiw0631pfs2fz5bpn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ElasticBeanstalk"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-elasticloadbalancing = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-elasticloadbalancing"; + version = "1.0.1"; + sha256 = "1ddzrlqamyyb1hpbnm3x3k69jp24v4z0bq0gmygsvn4bnxp6jh03"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ElasticLoadBalancing"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-elasticloadbalancingv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-elasticloadbalancingv2"; + version = "1.0.1"; + sha256 = "187nyvlyvffxyx2cmxaknbsjy2g54c4r3ih4qm3z2is0465arpdl"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ElasticLoadBalancingV2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-elasticsearch = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-elasticsearch"; + version = "1.0.1"; + sha256 = "02p2rl26ip70nr9x9kzykhva52d9698j8bpqr3qvblkb6hfagrbs"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Elasticsearch"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-emr = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-emr"; + version = "1.0.1"; + sha256 = "0kmgab1gkpslrnjs6nl0ainrn79hgjp3ar3x4sv0k6q7xfl9bbyz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EMR"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-emrcontainers = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-emrcontainers"; + version = "1.0.1"; + sha256 = "050kndgsfyzm1dg145hxsprfaypglg89gj1223rqwasb09fagq87"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EMRContainers"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-emrserverless = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-emrserverless"; + version = "1.0.1"; + sha256 = "08c099qxbmfr2zxirs48cxinzfz4cadnxcq72p6k9y71q51fn0r0"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EMRServerless"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-entityresolution = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-entityresolution"; + version = "1.0.1"; + sha256 = "1yy85b2n19w1ss2fnm6dv75b70vrs7ypycxgqd6k3lqgx4jdcigk"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EntityResolution"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-events = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-events"; + version = "1.0.1"; + sha256 = "027qhj5xxmx4224r3ilz63y2zay1671dq4ciss10hw4bydm9adva"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Events"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-eventschemas = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-eventschemas"; + version = "1.0.1"; + sha256 = "1mkl41x5vqx9bz1hbiwpnk6kb06im3krpb5sn149z3x3w1xibk35"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EventSchemas"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-evidently = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-evidently"; + version = "1.0.1"; + sha256 = "1hmiy17rm7kf1cmmiszqfcmhgnns1n1zzj1rgx0m14cxffsmnlq4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Evidently"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-evs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-evs"; + version = "1.0.1"; + sha256 = "0gvsw4zsslaasmxmx3slmc0dkx95wi3lf8wlp05hg81iwmk0yz15"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EVS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-finspace = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-finspace"; + version = "1.0.1"; + sha256 = "1i2nyy8fy50lm6prjy3ak0h4xr922bhss20q0g5vqs1yns0pxdm0"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS FinSpace"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-fis = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-fis"; + version = "1.0.1"; + sha256 = "033bxdkzlasc2bl2mib1q0v6y9fgm85cdp8shxbgb4p5v03fhhjk"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS FIS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-fms = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-fms"; + version = "1.0.1"; + sha256 = "0gzg8ajan9rcxy5wgsd3pfrq6n3wg0zhm6885mkpmnagmbkn3ckp"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS FMS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-forecast = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-forecast"; + version = "1.0.1"; + sha256 = "0c0sa5miipr9gfqhmx166g1x6da6f8d1y4db1q9wg8gzvyvl7jby"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Forecast"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-frauddetector = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-frauddetector"; + version = "1.0.1"; + sha256 = "1qncd8f4wpidc26dppj86gnxvkq656vx8w2hwx0fk0lh4nx5ybd5"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS FraudDetector"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-fsx = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-fsx"; + version = "1.0.1"; + sha256 = "0ax68braikl1sky6fcbmrm1vpa3cbcip7r2dj69vzqr4vk6x6cc2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS FSx"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-gamelift = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-gamelift"; + version = "1.0.1"; + sha256 = "0czkndska3rjy433kw5a4z9b0n5jf89pznjn65z22j7073lym3am"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS GameLift"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-globalaccelerator = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-globalaccelerator"; + version = "1.0.1"; + sha256 = "1lyj4ybpqb8kfi5cajz5sy74w5wwg25sn9q6vvv78k1n6sj2919w"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS GlobalAccelerator"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-glue = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-glue"; + version = "1.0.1"; + sha256 = "1hi30xh86dhm4zy0p5x2l2105yw8w76fd8l56k5y3vdc10r36b26"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Glue"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-grafana = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-grafana"; + version = "1.0.1"; + sha256 = "0rn0g59l7ndfgwvy1g4csshh8vqpwp9kqi42bgvh1dw5zs32q20w"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Grafana"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-greengrass = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-greengrass"; + version = "1.0.1"; + sha256 = "06mf70kcb0yv3qlhfj7arsnk4zi950hvnlhs6drsmy0sx9hiw3hc"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Greengrass"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-greengrassv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-greengrassv2"; + version = "1.0.1"; + sha256 = "1vrxk75r6gppkz8z4cjnbz0jjz3xjiddzvlklg9ic26pqik6k4rl"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS GreengrassV2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-groundstation = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-groundstation"; + version = "1.0.1"; + sha256 = "0bi8275d1h9ws7bv2yj5r3lbfgp9mzsm7ccjv2qczm9z4xcvd890"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS GroundStation"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-guardduty = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-guardduty"; + version = "1.0.1"; + sha256 = "0n38prmn4xgngv0k7l1w2y4g3q3g1rs0na68p7a5jpa4sn82h3c1"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS GuardDuty"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-healthimaging = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-healthimaging"; + version = "1.0.1"; + sha256 = "13hm7awrmc60w6iv8zmsysds0npwnxxrl1cbfrbzkzl3148wfj86"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS HealthImaging"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-healthlake = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-healthlake"; + version = "1.0.1"; + sha256 = "0309a909k84mqvz98lxhlf7anpspi8hpp9jd3xi64s74b2jb7si8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS HealthLake"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iam = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iam"; + version = "1.0.1"; + sha256 = "0ch1fj3kh40nbiv6hbadjamsg3jpq3r6rlgrcfr53q33z1436hyj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IAM"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-identitystore = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-identitystore"; + version = "1.0.1"; + sha256 = "0017p30y13s61nqx0hzvhz890w07p6nm6sz78wacx9lfyagj65rb"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IdentityStore"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-imagebuilder = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-imagebuilder"; + version = "1.0.1"; + sha256 = "0l6am2xdzkk33crr2h4zicjlx401cc7qxyjkvs1qr3kfqfdfn1yn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ImageBuilder"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-inspector = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-inspector"; + version = "1.0.1"; + sha256 = "191nwvxaffacs32nnpv8r9qzsrjbbmnl8bfrs9d7knr0sscjyyp3"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Inspector"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-inspectorv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-inspectorv2"; + version = "1.0.1"; + sha256 = "07lmmjhzxz7ks4vgqibfx0r8dgnbznfi64a7hyr6pr8xh12cc81h"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS InspectorV2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-internetmonitor = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-internetmonitor"; + version = "1.0.1"; + sha256 = "1n8kg4qfwhn3q8cwl7fj44xcz91bpn9q1f8vhz2jn7igkls368ln"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS InternetMonitor"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-invoicing = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-invoicing"; + version = "1.0.1"; + sha256 = "0ara1wlprs1sz63xqc4xm7nqlxsrcswy7x0vf2if7d25c995bmhh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Invoicing"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iot = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iot"; + version = "1.0.1"; + sha256 = "1wlbh5krnyq9w5sfhi2zll3wzccg3j75i80qqipgsai46x30yqgg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoT"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iotanalytics = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotanalytics"; + version = "1.0.1"; + sha256 = "04n8r379s8pyfnjcc5shvpj9vnb1x1s3ig5ivmcswqmlq3lh3pj2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTAnalytics"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iotcoredeviceadvisor = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotcoredeviceadvisor"; + version = "1.0.1"; + sha256 = "0w4jhdlbnqlaq6h022zhswl1fd99y769cva3hkf9iwc424w3nbq0"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTCoreDeviceAdvisor"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iotevents = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotevents"; + version = "1.0.1"; + sha256 = "0sl6wq7kjjpg6617j5q8jicpn74sql2vnb640l4zkj9pmv380cq2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTEvents"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iotfleethub = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotfleethub"; + version = "1.0.1"; + sha256 = "011zyrx9xyfy77y3046jksnkrdwxr07qpqhcsns1iq0xs3f6h5wq"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTFleetHub"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iotfleetwise = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotfleetwise"; + version = "1.0.1"; + sha256 = "1m5gcfyvq23vg4ki888kfmbn2g7d6c996nmcccvl4wvqfmr4szjy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTFleetWise"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iotsitewise = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotsitewise"; + version = "1.0.1"; + sha256 = "17913p8jbhbs4ajj05qxmyi49dddp6nm2sqjfm4h80w2wp69q9ba"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTSiteWise"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iotthingsgraph = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotthingsgraph"; + version = "1.0.1"; + sha256 = "1im8lfz47si0k2p52nl13cfdh6rmm6fjfq7779cl7c2s3789ncqa"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTThingsGraph"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iottwinmaker = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iottwinmaker"; + version = "1.0.1"; + sha256 = "0n08yqrfv9znyjj5yfjr5qwgl7i6dggwxsblbrhb7xsz9nb3fg5b"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTTwinMaker"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-iotwireless = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotwireless"; + version = "1.0.1"; + sha256 = "1f5c0ga0b12m65m9qjlphdgjjind8b4qz2slg11glgl9hv058dvz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTWireless"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ivs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ivs"; + version = "1.0.1"; + sha256 = "0x4riciyk5g1zkxpz2wqkwf2zyijq3ivq0wzgyvp4nqnyls6fi86"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IVS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ivschat = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ivschat"; + version = "1.0.1"; + sha256 = "1np2bxjvvdg4h10r6nifs9ssbg324hlzahbd87cywa33i8v62ix2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IVSChat"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-kafkaconnect = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kafkaconnect"; + version = "1.0.1"; + sha256 = "1zkxsjs61gd9pj8k4y57kdaaajwkql6392w2088yiah5jh06515a"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KafkaConnect"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-kendra = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kendra"; + version = "1.0.1"; + sha256 = "1ncxn8rrwdfh2rf6i4m3fyc9g04xj475q6rg11yn6ykk2pvm54f0"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Kendra"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-kendraranking = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kendraranking"; + version = "1.0.1"; + sha256 = "188qcm9h3g61jjmhyj3zwr52lnn2afmaws7k3kk6w7qkabjqj9s4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KendraRanking"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-kinesis = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kinesis"; + version = "1.0.1"; + sha256 = "19xfrkmvajvmdb280j1rg6rdnlihk5qhl9z2d9bidami2vm87cp7"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Kinesis"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-kinesisanalytics = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kinesisanalytics"; + version = "1.0.1"; + sha256 = "1xgcdsgja13w6p02kqd5r6d9575jzlhjqbkjaf07hr3m3vpbvbvw"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KinesisAnalytics"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-kinesisanalyticsv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kinesisanalyticsv2"; + version = "1.0.1"; + sha256 = "1fn6ymlaaz428zjrssws59rd1294hmw36f505nwz0vs4qiqqh1l4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KinesisAnalyticsV2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-kinesisfirehose = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kinesisfirehose"; + version = "1.0.1"; + sha256 = "0bw3r5wdd85v7bl99pnfppgvfwn0jc2shqs1a0gfwa0hjkgl7hq9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KinesisFirehose"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-kinesisvideo = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kinesisvideo"; + version = "1.0.1"; + sha256 = "1gxg361gffjz40h8yppi0jrip16l0kvmngdb54mcr99jyy8cjzlp"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KinesisVideo"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-kms = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kms"; + version = "1.0.1"; + sha256 = "1shwiq8l20zdx90r1gp2fidid5a0ahxsr30clm1x670h1rhnwlyr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KMS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-lakeformation = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lakeformation"; + version = "1.0.1"; + sha256 = "1fsmgmnn5rd0nzdxm99k036xwx4148cglv084lsryv2y2zbda4xz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LakeFormation"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-lambda = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lambda"; + version = "1.0.1"; + sha256 = "1j2ppxi4iqh41ax17p91wbbqjayxb9nqbgr4qkm6g4bvswixslzs"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Lambda"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-launchwizard = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-launchwizard"; + version = "1.0.1"; + sha256 = "141fwmp0pggkf2l532jw2s9ybz1vgidvs33rqsiwqxf0ypr2mzxg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LaunchWizard"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-lex = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lex"; + version = "1.0.1"; + sha256 = "17zdg2hw8cin4yisamcb0qmp2k72rmfyw0mimv7x47h9r6jnivsn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Lex"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-licensemanager = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-licensemanager"; + version = "1.0.1"; + sha256 = "0rglv2a0ywhqv9x0hii5j4pf0iwq9r06f6y03lpznzpp1n26f744"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LicenseManager"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-lightsail = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lightsail"; + version = "1.0.1"; + sha256 = "1anfs7knc0xw0fflhhpncismvhks3xr92wvjry2xg34dxzan4hjg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Lightsail"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-location = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-location"; + version = "1.0.1"; + sha256 = "18gy5rwnm4dj9yrilpc3dg1ps1ygrbfg38pmfnc94cks0afgakc2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Location"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-logs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-logs"; + version = "1.0.1"; + sha256 = "024xsqpajksvq9qrwj4zxnf7dcyi6x48gxm9i6h1dvksvk205vi2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Logs"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-lookoutequipment = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lookoutequipment"; + version = "1.0.1"; + sha256 = "03wlb0c8p0qc16d7cvpp2l74i6m5s4q0nfy7fa05j6kj9i6nyhdn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LookoutEquipment"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-lookoutmetrics = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lookoutmetrics"; + version = "1.0.1"; + sha256 = "0xyzfz09y3d3zycky9q2r65whqsvbwg8ryqq1y6vcimn0jlr2jl7"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LookoutMetrics"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-lookoutvision = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lookoutvision"; + version = "1.0.1"; + sha256 = "1x6cj7bk8ada0s29rdsjd6nk4wnphl8iwqzfxd2ir2jbqm3mr92s"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LookoutVision"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-m2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-m2"; + version = "1.0.1"; + sha256 = "1pjin6nrn4paxn9321ipydf9j076kcmy299q3fmhg33v0mx40jbj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS M2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-macie = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-macie"; + version = "1.0.1"; + sha256 = "1c3b5ha855jrwiv61zsdg9cydri4vh6d4gf5bjay02n2miafbmaj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Macie"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-managedblockchain = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-managedblockchain"; + version = "1.0.1"; + sha256 = "04qrng9bbz7ws0wdbfzhzwqk9ynlvwbsxdgmnn433xyywlbzfx8p"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ManagedBlockchain"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-mediaconnect = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediaconnect"; + version = "1.0.1"; + sha256 = "03v8n5zwsnp6ri77zg2srm6986v00bnk2c4aw33crrrmblizmmbh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaConnect"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-mediaconvert = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediaconvert"; + version = "1.0.1"; + sha256 = "0k577mwi0p5i52h8kcpprlpm5ahx0gigcmqlws6cgr4l5shvd5dk"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaConvert"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-medialive = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-medialive"; + version = "1.0.1"; + sha256 = "0ijrbj99kqzhw9k1lynm0h0xmrljdrrqjd3hw1196rmcbgi522n8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaLive"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-mediapackage = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediapackage"; + version = "1.0.1"; + sha256 = "1qw7327isccyxsw2b7w0vlpg7q96hrivfjxdk4b9i1hp4fv7w1x6"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaPackage"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-mediapackagev2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediapackagev2"; + version = "1.0.1"; + sha256 = "1kxfsy83kph82cq1makalx92crnnxfnlmm5brffs10w8mdb34wmq"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaPackageV2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-mediastore = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediastore"; + version = "1.0.1"; + sha256 = "1xck1q9md54mjj4v420lbcfxxfpbj7y97xs3992j9x35k6xqm2c9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaStore"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-mediatailor = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediatailor"; + version = "1.0.1"; + sha256 = "0i3q10gyw5qwh6a8z2q4q2rmrja4ka9lyz4zvdqz74z4sxmz20nw"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaTailor"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-memorydb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-memorydb"; + version = "1.0.1"; + sha256 = "00pzsfwpcqswjssbnl206xgbn0rk99kbfs4nzq9vniq7zhbjs87z"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MemoryDB"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-mpa = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mpa"; + version = "1.0.1"; + sha256 = "00s9y2f11xjqq5kg2imvhrz912s44li4y1xdylyvnmyz171a6dkh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MPA"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-msk = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-msk"; + version = "1.0.1"; + sha256 = "1fzpzdv5swmzi91hjxkd27092h4672nwri6rsyy4n0paipr2wdch"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MSK"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-mwaa = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mwaa"; + version = "1.0.1"; + sha256 = "0yvzybs58ms7c054vb71mzp8ixca0b40j190b1633391ixhabpcx"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MWAA"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-neptune = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-neptune"; + version = "1.0.1"; + sha256 = "1k02pr7j8qpcsw25sn1zi27bpc4r5wr42yvn358vvds4dgk1rwzy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Neptune"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-neptunegraph = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-neptunegraph"; + version = "1.0.1"; + sha256 = "1f2p98kr3jzz9izbs3a86271fwlgj2lhcs7f43472p0v08m21n17"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS NeptuneGraph"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-networkfirewall = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-networkfirewall"; + version = "1.0.1"; + sha256 = "1i2flhhlrqy8w9p1zr884nm4lgp1z3dhzd0h7b52k4298whwgbj2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS NetworkFirewall"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-networkmanager = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-networkmanager"; + version = "1.0.1"; + sha256 = "0b5qbaankk4931w2k5dajqi9hdjb527pj0c88nw0lmfihazqjkyi"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS NetworkManager"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-notifications = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-notifications"; + version = "1.0.1"; + sha256 = "1g1mzggmxnks8jf9fv7gf80b1gmdkqzbqbk1hlsw7mp8zqrdayyj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Notifications"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-notificationscontacts = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-notificationscontacts"; + version = "1.0.1"; + sha256 = "05qhf2sh01f13id2pvpff932x9b5nm2v7i68wi7gmn20cmbppmh2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS NotificationsContacts"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-oam = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-oam"; + version = "1.0.1"; + sha256 = "0xmk4c9zfbc815i343dj5g9xr7mk7bks5lmrackigg8ngivsndmf"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Oam"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-observabilityadmin = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-observabilityadmin"; + version = "1.0.1"; + sha256 = "1phlamcn06w8yln3k815aq35jc9x3zdd0n60bqa8vjszrmzm0bq1"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ObservabilityAdmin"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-odb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-odb"; + version = "1.0.1"; + sha256 = "1i7y471ssbkg3v5sk7xdlrlbh8iq4sljl3sz3chjq4vqjrk38n0w"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ODB"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-omics = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-omics"; + version = "1.0.1"; + sha256 = "0lx8c3xrgy975yfhapwwi9l2hyi9qi6023q2al6aqvhxifrizm16"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Omics"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-opensearchserverless = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-opensearchserverless"; + version = "1.0.1"; + sha256 = "1mpx12jxhim05abkrngxc9l03askip569qcd9bcyapxs2qszcc8c"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS OpenSearchServerless"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-opensearchservice = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-opensearchservice"; + version = "1.0.1"; + sha256 = "1f2ilw8qz26wwmmlrlaz8hb2wb9vp9rhcy07gcklmccnqgw41g6x"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS OpenSearchService"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-opsworks = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-opsworks"; + version = "1.0.1"; + sha256 = "1pq9bmc1bz0b0j4mk0ipg5l3bvszi3xl3xqrwybqih1ih8fpndbf"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS OpsWorks"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-organizations = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-organizations"; + version = "1.0.1"; + sha256 = "1q6irnpz3kpgs20q800d6a14ch2900vn4580qmsrrg1skzmg2jfz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Organizations"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-osis = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-osis"; + version = "1.0.1"; + sha256 = "0q8xpg1wda7cjlk7ymzrzrv4pradfqns6yzfw06fvs8l8ixynf0k"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS OSIS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-panorama = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-panorama"; + version = "1.0.1"; + sha256 = "0zz660cv36ia67isjcppypx745py6qh4a24vmfmijzrnickqgd31"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Panorama"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-paymentcryptography = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-paymentcryptography"; + version = "1.0.1"; + sha256 = "1vankd3w5aj7p4pnrpjdgfahhsi0mpc8ajpm467hqvij70jkcycx"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS PaymentCryptography"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-pcaconnectorad = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pcaconnectorad"; + version = "1.0.1"; + sha256 = "1bwix9mdir2f99w0r09b1ww521gysdwfwsq0h1qc5zfcphkxihar"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS PCAConnectorAD"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-pcaconnectorscep = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pcaconnectorscep"; + version = "1.0.1"; + sha256 = "13ymi8c5avmxw56bx62x5vhvzffxrng14g43blmr84c4mczkc0mw"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS PCAConnectorSCEP"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-pcs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pcs"; + version = "1.0.1"; + sha256 = "1g39qbvgac6wk4k8ckj3awc1svkxpqvz3jjbsnm93b341fvinvcn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS PCS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-personalize = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-personalize"; + version = "1.0.1"; + sha256 = "0whvrazir0z2j9llpgnn4ag2zg2nrm98qymwx2swy8zrvw0c53f9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Personalize"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-pinpoint = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pinpoint"; + version = "1.0.1"; + sha256 = "14jqbc25kxb0zq92vgvjb8qb9n8y14jj9hq6k46cp3hqlr3alf63"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Pinpoint"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-pinpointemail = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pinpointemail"; + version = "1.0.1"; + sha256 = "0a40ib85rz9dqbp3md1d5rrrx5gcdz1zz6zlm2cgx0n5vzfa96zy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS PinpointEmail"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-pipes = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pipes"; + version = "1.0.1"; + sha256 = "172bb3sbwx1343lv89giw07z0sxijhp2vjiyjqprss7qp37414dj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Pipes"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-proton = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-proton"; + version = "1.0.1"; + sha256 = "1dz94bzswdhxvj6rifm4i5rgddckhfmgrx0bcy92fwsjqxr997z8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Proton"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-qbusiness = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-qbusiness"; + version = "1.0.1"; + sha256 = "10yfcmg9zfqklvzi3yjnahhqf78hmzbhlh46kmr62jmcshybq5km"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS QBusiness"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-qldb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-qldb"; + version = "1.0.1"; + sha256 = "1fwyri6gwzy2g9bnaqjynj0k2bdxn3qpdv7if5nbcs05y6raa9rx"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS QLDB"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-quicksight = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-quicksight"; + version = "1.0.1"; + sha256 = "0ldpqyi79kp3kdbjcq235bchs93slfyrmc584779mvg6zxs65bvj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS QuickSight"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ram = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ram"; + version = "1.0.1"; + sha256 = "04gw372qbxx6fy7w22b66r751g7w1dkifl4bzq7cg0nhk5ckxkia"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS RAM"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-rbin = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-rbin"; + version = "1.0.1"; + sha256 = "18pdhxzv7ci419jbk2yzkxmlzxj4f4p6kwrsjfinf7axxzljs9fi"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Rbin"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-rds = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-rds"; + version = "1.0.1"; + sha256 = "0jgclx3b6ayy7974421nl4xi5kwhx6ifndy97r3ip4rnlqlwqzc2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS RDS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-redshift = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-redshift"; + version = "1.0.1"; + sha256 = "15xsz2hsdkkifxspaikpwkzara3d951i93373np19yg5ljh1czzy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Redshift"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-redshiftserverless = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-redshiftserverless"; + version = "1.0.1"; + sha256 = "0hvpff9p0dag07kvd260gld9gbm1sn2sym5ll1plf928sdacixmj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS RedshiftServerless"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-refactorspaces = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-refactorspaces"; + version = "1.0.1"; + sha256 = "140hrqd6h3h5hzg466av9hw09llhhz83llmzs9ahv2cj3xg48053"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS RefactorSpaces"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-rekognition = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-rekognition"; + version = "1.0.1"; + sha256 = "11rsi57w7fpy3mqy6qn7vbpsj7fgw18gn92ngbix9x0g8fzq42wq"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Rekognition"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-resiliencehub = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-resiliencehub"; + version = "1.0.1"; + sha256 = "0kw9xq37ksz6g5whwxyrac5s99piphf4vn0mrin5z62a3m6kpjkc"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ResilienceHub"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-resourceexplorer2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-resourceexplorer2"; + version = "1.0.1"; + sha256 = "1slbi6lq35h9zzqqr38h0y5a8kl0il7j3g1pcjbvarsnk0ga6zj5"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ResourceExplorer2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-resourcegroups = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-resourcegroups"; + version = "1.0.1"; + sha256 = "1qrya2z3rclhpzk8cjjqy499n98wv8ki9siqc314x9y8cv7alg39"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ResourceGroups"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-robomaker = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-robomaker"; + version = "1.0.1"; + sha256 = "0wrvhjq70d3ag5jnacja6dmbz7xqag7r8mcf05xw5wk2nqpkm5mn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS RoboMaker"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-rolesanywhere = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-rolesanywhere"; + version = "1.0.1"; + sha256 = "1ig8p7p8v7wz1iila0srz790z5dc3kyf5mz8chxsrhqlm9fjmrng"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS RolesAnywhere"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-route53 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-route53"; + version = "1.0.1"; + sha256 = "04cbn75vsa5w58m2ly1j14clnxa57mivyqa8ka4hnzg5dhyz0c0m"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Route53"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-route53profiles = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-route53profiles"; + version = "1.0.1"; + sha256 = "1lvvby8jnns1wk1nb759g7fwi1qb65qm9kiw0c208fsyvd03k7bf"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Route53Profiles"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-route53recoverycontrol = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-route53recoverycontrol"; + version = "1.0.1"; + sha256 = "0jpnq7spgsisjnm9g37rnxjpzpc8yjprk601jl0jprs23jdxlahb"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Route53RecoveryControl"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-route53recoveryreadiness = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-route53recoveryreadiness"; + version = "1.0.1"; + sha256 = "11w24kbfnw0nbxlgvh5k11ywn95ln62yh9xxgfnlq4ivpnf79p05"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Route53RecoveryReadiness"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-route53resolver = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-route53resolver"; + version = "1.0.1"; + sha256 = "124krxyk1n93ppnchbfqjjdgd98ns2bdzq97yr3vh026hv8sysjb"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Route53Resolver"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-rtbfabric = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-rtbfabric"; + version = "1.0.1"; + sha256 = "0f0kirrhnjl9h4n8z2fd1f3bwpj7pmwgqr3byjjvf3v0217nlysv"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS RTBFabric"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-rum = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-rum"; + version = "1.0.1"; + sha256 = "0gs13jad9clylr4f61y96vn8dzvm0z9y68s3ayzq7d2in83wxg58"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS RUM"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-s3 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-s3"; + version = "1.0.1"; + sha256 = "0ka9iyk8hz489ps0w3cy224awz9yz7zi95xxwkdd4d5skrybwr63"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS S3"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-s3express = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-s3express"; + version = "1.0.1"; + sha256 = "0cz18v2qqbbmlbn19kdg65qmcylmv0nas0qzmr3qigr8q5a6gmhx"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS S3Express"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-s3objectlambda = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-s3objectlambda"; + version = "1.0.1"; + sha256 = "0vq5ryxq6nsbi6hjq93rw9fpkv7gpfs13gzz266xdri2mq9bdzsa"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS S3ObjectLambda"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-s3outposts = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-s3outposts"; + version = "1.0.1"; + sha256 = "1zdj01bgipzx92rk4zjgd2nxdn0amhk3xpycrsks7vh7lpiyn4d1"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS S3Outposts"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-s3tables = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-s3tables"; + version = "1.0.1"; + sha256 = "123i8dh3zm7asqb9kkdw39pw8ryv678dyx47zz7qk413k8f9049f"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS S3Tables"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-sagemaker = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-sagemaker"; + version = "1.0.1"; + sha256 = "0r2q9crsvhbwvgcyq9lh068i2a1xd448k578pj50qhczcpf5l6a0"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SageMaker"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-scheduler = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-scheduler"; + version = "1.0.1"; + sha256 = "1s5mncqps960f0r9088w8q7118xzz3s7bclxc0qqh421q4nh1lka"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Scheduler"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-sdb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-sdb"; + version = "1.0.1"; + sha256 = "0mlqa3wamqy3indgcbdgimray3gm1pimj8vgi871c2g93wmfbwvh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SDB"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-secretsmanager = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-secretsmanager"; + version = "1.0.1"; + sha256 = "0v10al3bp2p0977igk80y5vp55vhiajsggfz715a0sxcmsr5b26j"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SecretsManager"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-securityhub = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-securityhub"; + version = "1.0.1"; + sha256 = "0zlnjw7w7hqwh92nf282w2cbwka67hjsh20z6p0wil86ryp1jgz1"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SecurityHub"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-securitylake = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-securitylake"; + version = "1.0.1"; + sha256 = "0bx2v6dllhq05ldpgw4w9krvqqwhzrnkdggji0hid7p8s0n4pakh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SecurityLake"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-servicecatalog = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-servicecatalog"; + version = "1.0.1"; + sha256 = "0wbdxr206mw3kd4n6dmfisii2yihi8vfmk32wiy4vx7ya2wiz0r8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ServiceCatalog"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-servicecatalogappregistry = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-servicecatalogappregistry"; + version = "1.0.1"; + sha256 = "00n9q198vhvq1cg7l9kvhalk4fgmf4694pc57q6aw9mpa1k0449l"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ServiceCatalogAppRegistry"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-servicediscovery = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-servicediscovery"; + version = "1.0.1"; + sha256 = "119ky6jf7j7782dgxhpg5j37pk953pblrmr48i9gwcxj1rwwnjfq"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ServiceDiscovery"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ses = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ses"; + version = "1.0.1"; + sha256 = "1x9rzff4r36187ikki2d7nldji55ch960fa1n4lyvnylz80m4yqf"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SES"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-shield = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-shield"; + version = "1.0.1"; + sha256 = "0wy1l2x6b2pm55f0w2dgbvxw98y0fn5lcv94j1zak5sfzqqk2dj9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Shield"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-signer = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-signer"; + version = "1.0.1"; + sha256 = "0i26xyf400iljzxibdi9glay5c8qbslrw890hm5mr9bz9wf85k3s"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Signer"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-simspaceweaver = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-simspaceweaver"; + version = "1.0.1"; + sha256 = "1vm7w4bipylgg3w7z2dcwkb5iz2zzl2qd7s1sld53crjxzqg52aa"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SimSpaceWeaver"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-smsvoice = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-smsvoice"; + version = "1.0.1"; + sha256 = "1vhl13gxlacjrr1di6zfq5445vm2zybg8q29wqwhwb54jx7ral4h"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SMSVOICE"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-sns = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-sns"; + version = "1.0.1"; + sha256 = "0h4j08pcby4a831g33m5d8x3swwz4rzxnli9dm02f9q0vdfbv712"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SNS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-sqs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-sqs"; + version = "1.0.1"; + sha256 = "0nnvijyz095jz5492j9d2s1x1g07l1ch89zbzwqwab9ryw0irc10"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SQS"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ssm = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ssm"; + version = "1.0.1"; + sha256 = "1d8gpm3wx837vfy73ab2g1nqzsvw67m16b3zzcm6r2zn9nvxpfgh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SSM"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ssmcontacts = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ssmcontacts"; + version = "1.0.1"; + sha256 = "1zfgkzqyg3lalay9q7fzf2vmgbknzhp5m3j7pwx0vzvvqd9wkssy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SSMContacts"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ssmguiconnect = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ssmguiconnect"; + version = "1.0.1"; + sha256 = "14nxasm9kj8rwbzjq6jclpi9fawyi7zr7ygvsgpmvr852f7wr94g"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SSMGuiConnect"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ssmincidents = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ssmincidents"; + version = "1.0.1"; + sha256 = "05sxv76viz9zd6n4mcp1ky4lnmgv7pk55g4ggg081vp8wkq6z2kc"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SSMIncidents"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-ssmquicksetup = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ssmquicksetup"; + version = "1.0.1"; + sha256 = "0cazdklrv91qj32cpfd8f46f2hxvjvqz5xm2c17ssyafrsbfz7fs"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SSMQuickSetup"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-sso = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-sso"; + version = "1.0.1"; + sha256 = "0wvyamibj2cjp1nvib9fn66gbalhzmrplzgzr6kyw2b9fq40lrb8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SSO"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-stepfunctions = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-stepfunctions"; + version = "1.0.1"; + sha256 = "1lvfw2pn42dq8dvynhw3j6sis6hzihxk4irz86d414y245rgdx3p"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS StepFunctions"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-supportapp = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-supportapp"; + version = "1.0.1"; + sha256 = "0skrw2d93vp450ll39hydyq6da3xmv6znqc3k4nldc3idlnkd0xa"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SupportApp"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-synthetics = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-synthetics"; + version = "1.0.1"; + sha256 = "1dxs2incr63j3lfb3zp1x2gh8rj03r10pvvm3wihk0qy04535m57"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Synthetics"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-systemsmanagersap = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-systemsmanagersap"; + version = "1.0.1"; + sha256 = "1lshjnhyv0ffhq4di5ppz90b2iwys67l81ga44aqg0z11kdl80x9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS SystemsManagerSAP"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-timestream = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-timestream"; + version = "1.0.1"; + sha256 = "0jg18x0mz4jx545v2a8jqrvb28zi8jjc8lqdx7gl8iq39h3qll8h"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Timestream"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-transfer = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-transfer"; + version = "1.0.1"; + sha256 = "1b14n2pq3hhw7p2i1wih0h36xs836f03ibhjxgpqfn4v29sinz5p"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Transfer"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-verifiedpermissions = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-verifiedpermissions"; + version = "1.0.1"; + sha256 = "04n0hf1xhgvygwf830cxzc97lx3bc1py5imlsymhgv7fkrczxh1m"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS VerifiedPermissions"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-voiceid = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-voiceid"; + version = "1.0.1"; + sha256 = "13da5yn81ky8qcwjh50v181jg8pvkmcqc60195wg81qhhvxxi62c"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS VoiceID"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-vpclattice = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-vpclattice"; + version = "1.0.1"; + sha256 = "0ml8ckq2v6qi7h38dy71g65binhrknhhl6y3rnyw54mq9qj0m8j3"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS VpcLattice"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-waf = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-waf"; + version = "1.0.1"; + sha256 = "1dal2gawyn93lab6nphsp6zhsny6f7fswdgvgrhvn0d79aj9bxkb"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS WAF"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-wafregional = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-wafregional"; + version = "1.0.1"; + sha256 = "029ai636953if1zf709lcgbjjj3x1i26iq3hs1dx3cv5qhsvs3is"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS WAFRegional"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-wafv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-wafv2"; + version = "1.0.1"; + sha256 = "143zbch2z3ir7s84sg1isdb5bfdvhixk2x3y3plsn0d0w42dy91n"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS WAFv2"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-wisdom = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-wisdom"; + version = "1.0.1"; + sha256 = "05zhhqfnpz504ybf6js8jsmilki8n4n70gwy10k12cclx8ik2y7j"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Wisdom"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-workspaces = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-workspaces"; + version = "1.0.1"; + sha256 = "0mc7rfrlq70qzi87zjrd7vsxw18hfc3ldp7bxwvb3qqsdi47rl3l"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS WorkSpaces"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-workspacesinstances = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-workspacesinstances"; + version = "1.0.1"; + sha256 = "107852wb7imr4azbnrld54izvlgm3fqk63dclfcckniiv0pzq8ag"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS WorkspacesInstances"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-workspacesthinclient = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-workspacesthinclient"; + version = "1.0.1"; + sha256 = "12cfnglkcrcqf6rhbcyy7gr1h4lcrbma7xrn9ca75988wdhkm7d8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS WorkSpacesThinClient"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-workspacesweb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-workspacesweb"; + version = "1.0.1"; + sha256 = "19kzmgcb9zvjdns7lqyz66j676cb9981mpp7czxa1z2pvb5kf4d9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS WorkSpacesWeb"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere-xray = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-xray"; + version = "1.0.1"; + sha256 = "1i280xqpl6dsvavv0j21r94lyamfw50772g3adnbj98h78zpi8ys"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS XRay"; + license = lib.licenses.mit; + } + ) { }; + stratum-tool = callPackage ( { mkDerivation, @@ -640329,8 +647132,8 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.2.3.0"; - sha256 = "0mqyxdikd76q0ls5lz0bfdwzqhyvf8hwxl5x1c5lgfas3zwllf16"; + version = "0.2.3.1"; + sha256 = "0vnwlhzd616w1mx0fpaf0gahprd37qh91r7hv405hyc0c066rl9k"; libraryHaskellDepends = [ array async @@ -644484,8 +651287,8 @@ self: { }: mkDerivation { pname = "strong-path"; - version = "1.1.4.0"; - sha256 = "1gd24hfz01k78k67d28v9ypvrnbh5a41rk6dk26rmc5h5sxnrgf8"; + version = "1.2.0.0"; + sha256 = "14p82fgmi5bgf0yf6c27g1f4yp4alrb3446palpxkv58k5gzli14"; libraryHaskellDepends = [ base exceptions @@ -659715,8 +666518,8 @@ self: { }: mkDerivation { pname = "tasty-checklist"; - version = "1.0.6.0"; - sha256 = "1b5qikkbz4hxpj9w1vcfz1pigxs9576b84bp2p15bcrxpq80a0vq"; + version = "1.0.8.0"; + sha256 = "19mn4xfc8cvfcwgmfqh1pxsjv5wrsdxwxwsb9l8zflq3awvaq2g2"; libraryHaskellDepends = [ base containers @@ -659850,7 +666653,7 @@ self: { } ) { }; - tasty-discover_5_1_0 = callPackage ( + tasty-discover_5_2_0 = callPackage ( { mkDerivation, ansi-terminal, @@ -659876,13 +666679,12 @@ self: { }: mkDerivation { pname = "tasty-discover"; - version = "5.1.0"; - sha256 = "0y6py4l63idqvvr063cnkqcl3wbsglk3bpizmlgbwmq4gq9aprif"; - revision = "1"; - editedCabalFile = "1bac8ll0im08w7n5hj43fkjpilcax9bz0kbq0nr690lh49ws2353"; + version = "5.2.0"; + sha256 = "1wnblzl6c094qacspldyfad6mcl3iy0xnqmbzail0gzz8517wix3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ + ansi-terminal base containers directory @@ -661296,8 +668098,8 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "2.2.2.1"; - sha256 = "009n17zzaxyw0gfy6jr3869bjd8qwadwwf2ya788kasa00qh8if2"; + version = "2.2.3.1"; + sha256 = "1zh2h6n75rsqr6xxdkvsbzb25gmg9zr2f3db3wg8s57zaz9sd2dj"; libraryHaskellDepends = [ base containers @@ -663656,6 +670458,8 @@ self: { pname = "template-haskell-lift"; version = "0.1.0.0"; sha256 = "09zilw0nbjmn1k688l058183rwa3br0fvh3x8jxqygjh3011w8ps"; + revision = "1"; + editedCabalFile = "072g7a9b2sp0vc3g48xqbrxfis1rizqakz0b8064hs0cbgj3xkgn"; libraryHaskellDepends = [ base template-haskell @@ -663702,6 +670506,8 @@ self: { pname = "template-haskell-quasiquoter"; version = "0.1.0.0"; sha256 = "06zm27d72faad2ln7xn7d3kmvy04hq663a1q75cp7yyyca7fgjhf"; + revision = "1"; + editedCabalFile = "1bjaz33byxl0x8rj4jvw7dqbjhmysmnx9cgjs29s5c8g5i1pq0ki"; libraryHaskellDepends = [ base template-haskell @@ -667539,8 +674345,8 @@ self: { }: mkDerivation { pname = "testcontainers-postgresql"; - version = "0.0.4"; - sha256 = "09pa6w7kksxn0dpg99m2f3lhplm1316g782i8gfjxwig84r7z0av"; + version = "0.2"; + sha256 = "0pb653vv5mv69h6i6dgrvhzsppr4cnz1v7p9v04jw3f2njlm4wqr"; libraryHaskellDepends = [ base testcontainers @@ -683454,6 +690260,38 @@ self: { } ) { }; + tracy-profiler = callPackage ( + { + mkDerivation, + base, + bytestring, + random, + text, + unliftio-core, + webcolor-labels, + }: + mkDerivation { + pname = "tracy-profiler"; + version = "0.1.2.1"; + sha256 = "1zd1gi7p22qg8l4d6nn0x2xmqvq7w0a0zfz4cr589qbrwda9fy52"; + libraryHaskellDepends = [ + base + bytestring + text + unliftio-core + webcolor-labels + ]; + testHaskellDepends = [ + base + random + text + unliftio-core + ]; + description = "Haskell bindings for Tracy frame profiler"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + trade-journal = callPackage ( @@ -694183,6 +701021,26 @@ self: { } ) { }; + typst-symbols_0_1_9_1 = callPackage ( + { + mkDerivation, + base, + text, + }: + mkDerivation { + pname = "typst-symbols"; + version = "0.1.9.1"; + sha256 = "0pqjdmyclljsybipcmyas4pifggndf47bvahnpcaflnw9db73j63"; + libraryHaskellDepends = [ + base + text + ]; + description = "Symbol and emoji lookup for typst language"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + tyro = callPackage ( { mkDerivation, @@ -703592,8 +710450,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.17.0"; - sha256 = "1jzb0v8gjy15b97a66gmjaxxf3mcxwigaavl5cnzga5z9kz8pyw1"; + version = "0.0.18.1"; + sha256 = "0gnbyj3r7faqvkaxfmbxxkcznl53jxrzbby3k1zpyigr3h61k4sp"; libraryHaskellDepends = [ base proto-lens @@ -703610,6 +710468,7 @@ self: { mkDerivation, aeson, base, + base16-bytestring, bytestring, case-insensitive, hspec, @@ -703631,8 +710490,8 @@ self: { }: mkDerivation { pname = "utxorpc-client"; - version = "0.0.2.0"; - sha256 = "1i9gzr4dlhy3j0x2mx9idgc16r0yz7qw72z6gc10s4vlbbrc1mnb"; + version = "0.0.4.1"; + sha256 = "06z8frfn26zz0mrzwh59bmwr2yi20k9vgygmi1qiv0zv3k5vhqrl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -703649,6 +710508,7 @@ self: { executableHaskellDepends = [ aeson base + base16-bytestring bytestring case-insensitive http2 @@ -703710,8 +710570,8 @@ self: { }: mkDerivation { pname = "utxorpc-server"; - version = "0.0.3.0"; - sha256 = "0a56c871ypq0rfjl8lc5xxzx0vqggx74anxkbymvrad7h0bhsjyz"; + version = "0.0.4.1"; + sha256 = "1h1fwgf2igs5ldckrq821viryhn8xqyyaj9blglf3j5ml7rm3z92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -703762,7 +710622,7 @@ self: { description = "An SDK for UTxO RPC services"; license = lib.licensesSpdx."Apache-2.0"; hydraPlatforms = lib.platforms.none; - mainProgram = "server-example"; + mainProgram = "example"; } ) { }; @@ -718707,6 +725567,61 @@ self: { } ) { }; + waypoint = callPackage ( + { + mkDerivation, + base, + bytestring, + case-insensitive, + containers, + free, + hedgehog, + http-types, + profunctors, + tasty, + tasty-hedgehog, + tasty-hunit, + text, + time, + transformers, + uuid-types, + witherable, + }: + mkDerivation { + pname = "waypoint"; + version = "0.1"; + sha256 = "123rvxsn4viigf22ag5s4qs3yal0m3jw9q4bd4pjw53xdwz7dp4m"; + libraryHaskellDepends = [ + base + bytestring + containers + free + http-types + profunctors + text + time + transformers + uuid-types + witherable + ]; + testHaskellDepends = [ + base + bytestring + case-insensitive + containers + hedgehog + tasty + tasty-hedgehog + tasty-hunit + text + time + uuid-types + ]; + description = "Bidirectional URL path, URL query string and HTTP headers codecs"; + license = lib.licensesSpdx."Apache-2.0"; + } + ) { }; + wcwidth = callPackage ( { mkDerivation, @@ -721753,6 +728668,8 @@ self: { pname = "webgear-core"; version = "1.5.0"; sha256 = "1f5dy707rcb25n0w5ld210vczaa3az2y6xvg5jn7gwsxs23a8b3k"; + revision = "1"; + editedCabalFile = "0yrwdb3cnfqkhfasi7c5hhsaw44xvvsm0nmrkjyhz3fy2h9xpn4d"; libraryHaskellDepends = [ arrows base @@ -721953,6 +728870,8 @@ self: { pname = "webgear-server"; version = "1.5.0"; sha256 = "1srr5kblk1b59jyrkidh9js4yax8dvjyici283z25yk2lnqijc2y"; + revision = "1"; + editedCabalFile = "0wx2qlwkk6yxnpfxy9261fwn7xkykcll7636ls6kxvc5ybwyn5h6"; libraryHaskellDepends = [ aeson arrows @@ -723819,7 +730738,7 @@ self: { } ) { }; - what4_1_7 = callPackage ( + what4_1_7_1_0 = callPackage ( { mkDerivation, async, @@ -723840,7 +730759,6 @@ self: { exceptions, filepath, fingertree, - ghc-prim, hashable, hashtables, hedgehog, @@ -723876,17 +730794,14 @@ self: { transformers, unliftio, unordered-containers, - utf8-string, vector, versions, zenc, }: mkDerivation { pname = "what4"; - version = "1.7"; - sha256 = "1iba76c7zagxxgqvfxrsk92vayyhv1vjd6dd5wj242vps29jhb3v"; - revision = "1"; - editedCabalFile = "0d2xhwmgk20pqjh9xgdfyzwi9brckz71bdk8lr56q36nzmrkj0dl"; + version = "1.7.1.0"; + sha256 = "0hd4f38ydk337m5cwx0gfja1qv05j30w529iakv97jgbrdsnfcsj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -723908,7 +730823,6 @@ self: { exceptions filepath fingertree - ghc-prim hashable hashtables io-streams @@ -723926,7 +730840,6 @@ self: { scientific stm template-haskell - temporary text th-lift th-lift-instances @@ -723934,7 +730847,6 @@ self: { transformers unliftio unordered-containers - utf8-string vector versions zenc @@ -726403,8 +733315,8 @@ self: { }: mkDerivation { pname = "wled-json"; - version = "0.1.0.0"; - sha256 = "0xh243hacxi04bsaj6xmbdyixvz3n4x8jgiym9pn5fym547n6abk"; + version = "0.1.0.1"; + sha256 = "1riaw104i6y0jzfahz90a764a8rn15rldlkf94h9kpy747r0bxvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -735010,10 +741922,8 @@ self: { }: mkDerivation { pname = "xnobar"; - version = "0.0.0.2"; - sha256 = "1cs9kp2h07dx39rzykmylv5fvmdyynwmyj7mlxy6n95bawz4z1f4"; - revision = "1"; - editedCabalFile = "1b34ifw8rnb19gjgksljxcxb54y0qskjwwka5ly8bq84ll756v6n"; + version = "1.0.0.0"; + sha256 = "0rf3308wiy2ilssshrv9y5w55rrhw0nxjgdq39scc78562dw7z2l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -741224,6 +748134,7 @@ self: { streaming-commons, template-haskell, text, + th-abstraction, time, transformers, unix-compat, @@ -741238,8 +748149,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.27.1"; - sha256 = "0v5pq8ks93b4rrxwl088izl8hrfalkbf3ssgxgqgjsl4x1r5n0kz"; + version = "1.6.28.1"; + sha256 = "072cj4kpv785y96d1y769fadgihw2pn0hz3bqhahin60lqq5bkwi"; libraryHaskellDepends = [ aeson attoparsec-aeson @@ -741304,6 +748215,7 @@ self: { streaming-commons template-haskell text + th-abstraction transformers unliftio wai From 4d5a2f46e33fbaea062b47b8e8e73a001f581b29 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Nov 2025 13:51:31 +0100 Subject: [PATCH 044/542] haskellPackages.pdftotext: move jailbreak into overrideCabal (cherry picked from commit 18e4ed738312e03f66e5b9b0b458beeed0e5a9a1) --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 79dab6bf1588..4fb08c1ce696 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2932,6 +2932,7 @@ with haskellLib; zinza = dontCheck super.zinza; pdftotext = overrideCabal (drv: { + jailbreak = true; postPatch = '' # Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6 substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources @@ -2943,7 +2944,7 @@ with haskellLib; substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause '' + (drv.postPatch or ""); - }) (doJailbreak (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext))); + }) (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)); # QuickCheck <2.15 # https://github.com/google/proto-lens/issues/403 From df4f4e2b06ea80971234b7ae81c3a7f65b92b17a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 11 Nov 2025 11:29:50 +0100 Subject: [PATCH 045/542] haskellPackages.pdftotext: remove redundant poppler input Automatically provided since 5a80601f9795a42d12c6358a3fa10c025df79046. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4fb08c1ce696..af78708b231b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2944,7 +2944,7 @@ with haskellLib; substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause '' + (drv.postPatch or ""); - }) (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)); + }) super.pdftotext; # QuickCheck <2.15 # https://github.com/google/proto-lens/issues/403 From dbaf901b804beab5c734c479bc0f423ad67ab71d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 12:58:05 +0000 Subject: [PATCH 046/542] pahole: 1.30 -> 1.31 --- pkgs/by-name/pa/pahole/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix index b76ae90ed7a5..8533e4fc788f 100644 --- a/pkgs/by-name/pa/pahole/package.nix +++ b/pkgs/by-name/pa/pahole/package.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.30"; + version = "1.31"; src = fetchzip { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz"; - hash = "sha256-JF4KnI05uOlPuunJuetX/fX3ZRT6TDXdjCNG9/ufkgI="; + hash = "sha256-Afy0SysuDbTOa8H3m4hexy12Rmuv2NZL2wHfO4JtKL0="; }; nativeBuildInputs = [ From 385a5e291736a41841967bd3b0662e8c2c997794 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 13 Nov 2025 23:59:30 -0800 Subject: [PATCH 047/542] gcc15: fix build on aarch64-darwin This fixes the GCC 15.2.0 build on aarch64-darwin by addressing two issues in the libgcc build process: 1. Update libgcc-darwin-detection.patch: - Catch arm64-apple-darwin (which lacks a version number) - Add t-darwin-libgccs1 to enable libgcc_s.1.dylib compatibility build 2. Added libgcc-darwin-fix-reexport.patch: - Remove reexport of darwin-unwind.ver symbols in libgcc_s.1.dylib - These symbols (___register_frame_info, etc.) don't exist in libgcc on modern macOS as they come from libSystem The original build failed with: Undefined symbols for architecture arm64: "___deregister_frame_info", referenced from: -reexported_symbols_list command line option ... This occurred because darwin-unwind.ver lists unwinder symbols that are excluded from libgcc (via libgcc-libsystem.ver) on macOS 11+ where they are provided by the system's libSystem. --- .../gcc/patches/15/libgcc-darwin-detection.patch | 5 +++-- .../gcc/patches/15/libgcc-darwin-fix-reexport.patch | 11 +++++++++++ pkgs/development/compilers/gcc/patches/default.nix | 13 +++++++------ 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/compilers/gcc/patches/15/libgcc-darwin-fix-reexport.patch diff --git a/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch index 810d8e6f69a1..41e1c4c89869 100644 --- a/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch +++ b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch @@ -1,11 +1,12 @@ --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -239,7 +239,7 @@ case ${host} in +@@ -239,8 +239,8 @@ case ${host} in x86_64-*-darwin2[0-2]*) tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file" ;; - *-*-darwin2*) +- tmake_file="t-darwin-min-11 $tmake_file" + *-*-darwin2* | *-*-darwin) - tmake_file="t-darwin-min-11 $tmake_file" ++ tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file" ;; *-*-darwin1[89]*) diff --git a/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-fix-reexport.patch b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-fix-reexport.patch new file mode 100644 index 000000000000..dbb790e1eec3 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-fix-reexport.patch @@ -0,0 +1,11 @@ +--- a/libgcc/config/t-slibgcc-darwin ++++ b/libgcc/config/t-slibgcc-darwin +@@ -139,8 +139,7 @@ libgcc_s.1.dylib: all-multi libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT) + $(CC) -arch $${arch} -nodefaultlibs -dynamiclib -nodefaultrpaths \ + -o libgcc_s.1$(SHLIB_EXT)_T_$${mlib} \ + -Wl,-reexport_library,libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} \ + -lSystem \ +- -Wl,-reexported_symbols_list,$(srcdir)/config/darwin-unwind.ver \ + -install_name $(SHLIB_RPATH)/libgcc_s.1.dylib \ + -compatibility_version 1 -current_version 1.1 ; \ + done diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 93a1d4eb5cf3..0f7db57689e1 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -160,13 +160,14 @@ optionals noSysDirs ( ## Darwin -# Fixes detection of Darwin on x86_64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. +# Fixes detection of Darwin on x86_64-darwin and aarch64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. +++ optional (is14 && stdenv.hostPlatform.isDarwin) ../patches/14/libgcc-darwin-detection.patch +++ optional (atLeast15 && stdenv.hostPlatform.isDarwin) ../patches/15/libgcc-darwin-detection.patch + +# Fix libgcc_s.1.dylib build on Darwin 11+ by not reexporting unwind symbols that don't exist ++ optional ( - is14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 -) ../patches/14/libgcc-darwin-detection.patch -++ optional ( - atLeast15 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 -) ../patches/15/libgcc-darwin-detection.patch + atLeast15 && stdenv.hostPlatform.isDarwin +) ../patches/15/libgcc-darwin-fix-reexport.patch # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin ++ optional (stdenv.hostPlatform.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch From c16c376c22bcdd9ad2c91995a73abfb1c8b8637a Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 14 Nov 2025 18:16:00 +0000 Subject: [PATCH 048/542] gjs: enable strictDeps --- pkgs/by-name/gj/gjs/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index 0f17692a1d58..61f6e3cfcf71 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -95,8 +95,9 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ xvfb-run - ] - ++ testDeps; + ]; + + checkInputs = testDeps; propagatedBuildInputs = [ glib @@ -111,6 +112,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !stdenv.hostPlatform.isDarwin; + strictDeps = true; + postPatch = '' patchShebangs build/choose-tests-locale.sh substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console From fae492cc905cbc5c3eb1bed7e06f6b4a13cae51d Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 14 Nov 2025 18:24:40 +0000 Subject: [PATCH 049/542] gjs: fix build for `doCheck = false` --- pkgs/by-name/gj/gjs/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index 61f6e3cfcf71..af43ccde710a 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -105,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dinstalled_test_prefix=${placeholder "installedTests"}" + (lib.mesonBool "skip_gtk_tests" (!finalAttrs.finalPackage.doCheck)) ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isMusl) [ "-Dprofiler=disabled" From df576420d8709c04d21372d9097b382482aeb135 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Nov 2025 19:01:17 +0000 Subject: [PATCH 050/542] ucc: 1.5.1 -> 1.6.0 --- pkgs/by-name/uc/ucc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uc/ucc/package.nix b/pkgs/by-name/uc/ucc/package.nix index fc43ddc832d4..71fc9146fa5f 100644 --- a/pkgs/by-name/uc/ucc/package.nix +++ b/pkgs/by-name/uc/ucc/package.nix @@ -40,13 +40,13 @@ effectiveStdenv.mkDerivation (finalAttrs: { strictDeps = true; pname = "ucc"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucc"; tag = "v${finalAttrs.version}"; - hash = "sha256-gNLpcVvOsBCR0+KL21JSdWZyt/Z8EjQQTiHJw5vzOOo="; + hash = "sha256-xt138R3lSArfkxi/qJgR2xMlhhtm0hAwIUZBLpwFwvc="; }; outputs = [ From f3d6f2c773814039f91c405cce1f739516760f0a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 14 Nov 2025 22:19:06 +0100 Subject: [PATCH 051/542] haskellPackages.crucible*: adjust to package updates - Some patches have been released properly. - what4 1.7.1.0 has been released. --- .../haskell-modules/configuration-common.nix | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index af78708b231b..837ad13463d7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3109,7 +3109,7 @@ with haskellLib; ] ) super) what4 - what4_1_7 + what4_1_7_1_0 ; copilot-theorem = lib.pipe super.copilot-theorem [ @@ -3171,29 +3171,15 @@ with haskellLib; # https://github.com/tweag/monad-bayes/issues/378 (doJailbreak super.monad-bayes); - crucible = - lib.pipe - (super.crucible.override { - what4 = self.what4_1_7; - }) - [ - # 2025-04-13: jailbreak to allow th-abstraction >= 0.7 - (warnAfterVersion "0.7.2") - doJailbreak - - # Prevent clashes with now exported Prelude.foldl' - (appendPatch ( - pkgs.fetchpatch { - name = "base-4.20-foldl'.patch"; - url = "https://github.com/GaloisInc/crucible/commit/10f372e4b0389dd3966e04163dcd67d71e651709.patch"; - relative = "crucible"; - sha256 = "sha256-frxTs5SB1ENjH+X0lIlQ8k6pDIDOANylrqIOQpEtObU="; - } - )) - ]; + # 2025-04-13: jailbreak to allow th-abstraction >= 0.7 + crucible = doJailbreak ( + super.crucible.override { + what4 = self.what4_1_7_1_0; + } + ); crucible-llvm = super.crucible-llvm.override { - what4 = self.what4_1_7; + what4 = self.what4_1_7_1_0; }; # Test suite invokes cabal-install in a way incompatible with our generic builder From 358af583316edcea0827fc4c68afd259aebe1f32 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 14 Nov 2025 22:19:44 +0100 Subject: [PATCH 052/542] haskellPackages.gi-gtk-hs: drop obsolete override --- .../haskell-modules/configuration-common.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 837ad13463d7..418ce026192c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3317,25 +3317,6 @@ with haskellLib; stripe-signature = doJailbreak super.stripe-signature; stripe-wreq = doJailbreak super.stripe-wreq; - # 2025-10-12: gi-gtk was renamed to gi-gtk3 - # https://github.com/haskell-gi/haskell-gi/issues/478 - gi-gtk-hs = - appendPatches - [ - (pkgs.fetchpatch { - name = "gi-gtk-hs-use-gtk3.patch"; - url = "https://github.com/haskell-gi/haskell-gi/commit/e2ed85835499f70e119f050a2f37f22481f93886.patch"; - sha256 = "sha256-MzxXtBNBbJJaNwTOrq/CYqK4yGfS4Yk5fQ38ihFcclA="; - relative = "gi-gtk-hs"; - }) - ] - ( - super.gi-gtk-hs.override { - gi-gdk = self.gi-gdk3; - gi-gtk = self.gi-gtk3; - } - ); - # 2025-08-04: Disable failing testcases. It would feel bad to disable all the # checks in a cryptography related package. botan-low = overrideCabal (drv: { From 5a8eefbddcc22456e5a6f159c086be214200b19c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Nov 2025 09:53:27 +0000 Subject: [PATCH 053/542] wine-staging: 10.18 -> 10.19 --- pkgs/applications/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 44eaf9aed9b5..86368dfb1225 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -133,9 +133,9 @@ rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.18"; + version = "10.19"; url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; - hash = "sha256-Uftyc9ZdCd6gMsSl4hl7EnJLJ8o2DhpiKyNz0e5QrXs="; + hash = "sha256-fOxYMjxvKq7nrKk1Fzecu/75biwsWAxo/4XdAAy73UY="; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE @@ -145,7 +145,7 @@ rec { # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { inherit version; - hash = "sha256-vhIjeEbWLpcKtkBd/KeAeaLKOUZt7LAkH6GTebs3ROM="; + hash = "sha256-GmHeqHZPnFZkntMOJJzRDUN9H+G1qXdacy/Al6T5eZU="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; From f711865b1b8e121308ce6af7ad6dc2517d4fb391 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Nov 2025 14:33:26 +0000 Subject: [PATCH 054/542] google-cloud-cpp: 2.38.0 -> 2.43.0 Diff: https://github.com/googleapis/google-cloud-cpp/compare/v2.38.0...v2.43.0 --- pkgs/by-name/go/google-cloud-cpp/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index 4446c8105dc2..da911db925be 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -14,32 +14,32 @@ nlohmann_json, openssl, pkg-config, - protobuf_31, + protobuf, pkgsBuildHost, - # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 + # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v2.43.0/cmake/GoogleCloudCppFeatures.cmake#L24 apis ? [ "*" ], staticOnly ? stdenv.hostPlatform.isStatic, }: let # defined in cmake/GoogleapisConfig.cmake - googleapisRev = "f01a17a560b4fbc888fd552c978f4e1f8614100b"; + googleapisRev = "2193a2bfcecb92b92aad7a4d81baa428cafd7dfd"; googleapis = fetchFromGitHub { name = "googleapis-src"; owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256-eJA3KM/CZMKTR3l6omPJkxqIBt75mSNsxHnoC+1T4gw="; + hash = "sha256-M+3ywDd1kyo6U/9o7fpsqYIPuulf8fDe3a4mjJKEN2U="; }; in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "2.38.0"; + version = "2.43.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "sha256-TF3MLBmjUbKJkZVcaPXbagXrAs3eEhlNQBjYQf0VtT8="; + sha256 = "sha256-2OnzObCTmB6E4Ut0blmL7CRAJJ9EKl6eSVdfuPS4B2Y="; }; patches = [ @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { grpc nlohmann_json openssl - protobuf_31 + protobuf gbenchmark gtest ]; From 51c7fb6b1c67fa8d616004fa5a8d9c723b065b75 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Nov 2025 16:47:28 +0000 Subject: [PATCH 055/542] google-cloud-cpp: modernize --- pkgs/by-name/go/google-cloud-cpp/package.nix | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index da911db925be..c2433ca8ed77 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -31,15 +31,15 @@ let hash = "sha256-M+3ywDd1kyo6U/9o7fpsqYIPuulf8fDe3a4mjJKEN2U="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "google-cloud-cpp"; version = "2.43.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; - rev = "v${version}"; - sha256 = "sha256-2OnzObCTmB6E4Ut0blmL7CRAJJ9EKl6eSVdfuPS4B2Y="; + tag = "v${finalAttrs.version}"; + hash = "sha256-2OnzObCTmB6E4Ut0blmL7CRAJJ9EKl6eSVdfuPS4B2Y="; }; patches = [ @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ]; ldLibraryPathName = "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH"; in - lib.optionalString doInstallCheck ( + lib.optionalString finalAttrs.doInstallCheck ( lib.optionalString (!staticOnly) '' export ${ldLibraryPathName}=${lib.concatStringsSep ":" additionalLibraryPaths} '' @@ -114,32 +114,33 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - nativeInstallCheckInputs = lib.optionals doInstallCheck [ + nativeInstallCheckInputs = lib.optionals finalAttrs.doInstallCheck [ gbenchmark gtest ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS:BOOL=${if staticOnly then "OFF" else "ON"}" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!staticOnly)) # unconditionally build tests to catch linker errors as early as possible # this adds a good chunk of time to the build - "-DBUILD_TESTING:BOOL=ON" - "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF" + (lib.cmakeBool "BUILD_TESTING" true) + (lib.cmakeBool "GOOGLE_CLOUD_CPP_ENABLE_EXAMPLES" false) ] ++ lib.optionals (apis != [ "*" ]) [ - "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" + (lib.cmakeFeature "GOOGLE_CLOUD_CPP_ENABLE" (lib.concatStringsSep ";" apis)) ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-DGOOGLE_CLOUD_CPP_GRPC_PLUGIN_EXECUTABLE=${lib.getBin pkgsBuildHost.grpc}/bin/grpc_cpp_plugin" + (lib.cmakeFeature "GOOGLE_CLOUD_CPP_GRPC_PLUGIN_EXECUTABLE" "${lib.getBin pkgsBuildHost.grpc}/bin/grpc_cpp_plugin") ]; requiredSystemFeatures = [ "big-parallel" ]; - meta = with lib; { - license = with licenses; [ asl20 ]; + meta = { + license = with lib.licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; + changelog = "https://github.com/googleapis/google-cloud-cpp/blob/v${finalAttrs.version}/CHANGELOG.md"; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with maintainers; [ cpcloud ]; + maintainers = with lib.maintainers; [ cpcloud ]; }; -} +}) From 212b1cf7aa5f5c57c732c83ba8538aad3f298a59 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 17 Oct 2024 16:04:00 +0200 Subject: [PATCH 056/542] openscap: replace reference to perl538Package with perlPackages --- pkgs/by-name/op/openscap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix index 34776269a5ca..6262ad6dc43e 100644 --- a/pkgs/by-name/op/openscap/package.nix +++ b/pkgs/by-name/op/openscap/package.nix @@ -35,7 +35,7 @@ perl, doxygen, pkg-config, - perl538Packages, + perlPackages, }: stdenv.mkDerivation rec { @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - with perl538Packages; + with perlPackages; [ XMLXPath LinuxACL From 750d1f0685e09892b4f699750f59390a37beea31 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 22 Feb 2025 23:38:22 +0100 Subject: [PATCH 057/542] isync: replace perl538Packages with perlPackages --- pkgs/by-name/is/isync/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/is/isync/package.nix b/pkgs/by-name/is/isync/package.nix index 414299bab329..6e514b3dec23 100644 --- a/pkgs/by-name/is/isync/package.nix +++ b/pkgs/by-name/is/isync/package.nix @@ -8,7 +8,7 @@ db, cyrus_sasl, zlib, - perl538Packages, + perlPackages, autoreconfHook, # Disabled by default as XOAUTH2 is an "OBSOLETE" SASL mechanism and this relies # on a package that isn't really maintained anymore: @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ]; buildInputs = [ - perl538Packages.TimeDate + perlPackages.TimeDate openssl db cyrus_sasl From de6e69cd4a817ca0197d911d2eed2c4d370c3c7b Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Tue, 22 Jul 2025 18:15:22 +0200 Subject: [PATCH 058/542] perl: 5.40.0 -> 5.42.0 Drop 0.38 and 5.40 --- .../interpreters/perl/CVE-2024-56406.patch | 26 -- .../interpreters/perl/CVE-2025-40909.patch | 408 ------------------ .../development/interpreters/perl/cross.patch | 28 +- .../interpreters/perl/cross540.patch | 224 ---------- .../development/interpreters/perl/default.nix | 17 +- .../fix-build-with-only-C-locale-5.40.0.patch | 57 --- .../interpreters/perl/interpreter.nix | 35 +- .../perl/no-sys-dirs-5.38.0.patch | 256 ----------- ...ys-dirs-5.40.0.patch => no-sys-dirs.patch} | 0 pkgs/top-level/all-packages.nix | 14 +- 10 files changed, 21 insertions(+), 1044 deletions(-) delete mode 100644 pkgs/development/interpreters/perl/CVE-2024-56406.patch delete mode 100644 pkgs/development/interpreters/perl/CVE-2025-40909.patch delete mode 100644 pkgs/development/interpreters/perl/cross540.patch delete mode 100644 pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch delete mode 100644 pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch rename pkgs/development/interpreters/perl/{no-sys-dirs-5.40.0.patch => no-sys-dirs.patch} (100%) diff --git a/pkgs/development/interpreters/perl/CVE-2024-56406.patch b/pkgs/development/interpreters/perl/CVE-2024-56406.patch deleted file mode 100644 index 3960d17e6519..000000000000 --- a/pkgs/development/interpreters/perl/CVE-2024-56406.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 385e8759c3ff1e7f7f996bd4ea391074d61d48c1 -Author: Karl Williamson -AuthorDate: 2024-12-18 18:25:29 -0700 -Commit: Steve Hay -CommitDate: 2025-03-30 11:59:51 +0100 - - CVE-2024-56406: Heap-buffer-overflow with tr// - - This was due to underallocating needed space. If the translation forces - something to become UTF-8 that is initially bytes, that UTF-8 could - now require two bytes where previously a single one would do. - - (cherry picked from commit f93109c8a6950aafbd7488d98e112552033a3686) - -diff --git a/op.c b/op.c -index 3fc23eca49a..aeee88e0335 100644 ---- a/op.c -+++ b/op.c -@@ -6649,6 +6649,7 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) - * same time. But otherwise one crosses before the other */ - if (t_cp < 256 && r_cp_end > 255 && r_cp != t_cp) { - can_force_utf8 = TRUE; -+ max_expansion = MAX(2, max_expansion); - } - } - diff --git a/pkgs/development/interpreters/perl/CVE-2025-40909.patch b/pkgs/development/interpreters/perl/CVE-2025-40909.patch deleted file mode 100644 index 984c56e871ff..000000000000 --- a/pkgs/development/interpreters/perl/CVE-2025-40909.patch +++ /dev/null @@ -1,408 +0,0 @@ -From 918bfff86ca8d6d4e4ec5b30994451e0bd74aba9 Mon Sep 17 00:00:00 2001 -From: Leon Timmermans -Date: Fri, 23 May 2025 15:40:41 +0200 -Subject: [PATCH] CVE-2025-40909: Clone dirhandles without fchdir - -This uses fdopendir and dup to dirhandles. This means it won't change -working directory during thread cloning, which prevents race conditions -that can happen if a third thread is active at the same time. ---- - Configure | 6 ++ - Cross/config.sh-arm-linux | 1 + - Cross/config.sh-arm-linux-n770 | 1 + - Porting/Glossary | 5 ++ - Porting/config.sh | 1 + - config_h.SH | 6 ++ - configure.com | 1 + - plan9/config_sh.sample | 1 + - sv.c | 91 +---------------------------- - t/op/threads-dirh.t | 104 +-------------------------------- - win32/config.gc | 1 + - win32/config.vc | 1 + - 12 files changed, 28 insertions(+), 191 deletions(-) - -diff --git a/Configure b/Configure -index 44c12ced4014..7a13249caa96 100755 ---- a/Configure -+++ b/Configure -@@ -478,6 +478,7 @@ d_fd_set='' - d_fds_bits='' - d_fdclose='' - d_fdim='' -+d_fdopendir='' - d_fegetround='' - d_ffs='' - d_ffsl='' -@@ -13344,6 +13345,10 @@ esac - set i_fcntl - eval $setvar - -+: see if fdopendir exists -+set fdopendir d_fdopendir -+eval $inlibc -+ - : see if fork exists - set fork d_fork - eval $inlibc -@@ -25052,6 +25057,7 @@ d_flockproto='$d_flockproto' - d_fma='$d_fma' - d_fmax='$d_fmax' - d_fmin='$d_fmin' -+d_fdopendir='$d_fdopendir' - d_fork='$d_fork' - d_fp_class='$d_fp_class' - d_fp_classify='$d_fp_classify' -diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux -index bfa0b00d5f0f..9e056539198b 100644 ---- a/Cross/config.sh-arm-linux -+++ b/Cross/config.sh-arm-linux -@@ -212,6 +212,7 @@ d_fd_macros='define' - d_fd_set='define' - d_fdclose='undef' - d_fdim='undef' -+d_fdopendir=undef - d_fds_bits='undef' - d_fegetround='define' - d_ffs='undef' -diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770 -index 47ad5c37e3fd..365e4c4f9671 100644 ---- a/Cross/config.sh-arm-linux-n770 -+++ b/Cross/config.sh-arm-linux-n770 -@@ -211,6 +211,7 @@ d_fd_macros='define' - d_fd_set='define' - d_fdclose='undef' - d_fdim='undef' -+d_fdopendir=undef - d_fds_bits='undef' - d_fegetround='define' - d_ffs='undef' -diff --git a/Porting/Glossary b/Porting/Glossary -index bb505c653b0b..8b2965ca99c6 100644 ---- a/Porting/Glossary -+++ b/Porting/Glossary -@@ -947,6 +947,11 @@ d_fmin (d_fmin.U): - This variable conditionally defines the HAS_FMIN symbol, which - indicates to the C program that the fmin() routine is available. - -+d_fdopendir (d_fdopendir.U): -+ This variable conditionally defines the HAS_FORK symbol, which -+ indicates that the fdopen routine is available to open a -+ directory descriptor. -+ - d_fork (d_fork.U): - This variable conditionally defines the HAS_FORK symbol, which - indicates to the C program that the fork() routine is available. -diff --git a/Porting/config.sh b/Porting/config.sh -index a921f7e1c79a..6231ea0f31ea 100644 ---- a/Porting/config.sh -+++ b/Porting/config.sh -@@ -223,6 +223,7 @@ d_fd_macros='define' - d_fd_set='define' - d_fdclose='undef' - d_fdim='define' -+d_fdopendir='define' - d_fds_bits='define' - d_fegetround='define' - d_ffs='define' -diff --git a/config_h.SH b/config_h.SH -index da0f2dbcd7b7..5a0f81cf2011 100755 ---- a/config_h.SH -+++ b/config_h.SH -@@ -142,6 +142,12 @@ sed <$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un - */ - #$d_fcntl HAS_FCNTL /**/ - -+/* HAS_FDOPENDIR: -+ * This symbol, if defined, indicates that the fdopen routine is -+ * available to open a directory descriptor. -+ */ -+#$d_fdopendir HAS_FDOPENDIR /**/ -+ - /* HAS_FGETPOS: - * This symbol, if defined, indicates that the fgetpos routine is - * available to get the file position indicator, similar to ftell(). -diff --git a/configure.com b/configure.com -index 99527c180bfc..7c38711bb85d 100644 ---- a/configure.com -+++ b/configure.com -@@ -6010,6 +6010,7 @@ $ WC "d_fd_set='" + d_fd_set + "'" - $ WC "d_fd_macros='define'" - $ WC "d_fdclose='undef'" - $ WC "d_fdim='" + d_fdim + "'" -+$ WC "d_fdopendir='undef'" - $ WC "d_fds_bits='define'" - $ WC "d_fegetround='undef'" - $ WC "d_ffs='undef'" -diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample -index 636acbdf6db3..246bad954424 100644 ---- a/plan9/config_sh.sample -+++ b/plan9/config_sh.sample -@@ -212,6 +212,7 @@ d_fd_macros='undef' - d_fd_set='undef' - d_fdclose='undef' - d_fdim='undef' -+d_fdopendir=undef - d_fds_bits='undef' - d_fegetround='undef' - d_ffs='undef' -diff --git a/sv.c b/sv.c -index ae6d09dea28a..8a005b2d165b 100644 ---- a/sv.c -+++ b/sv.c -@@ -14096,15 +14096,6 @@ Perl_dirp_dup(pTHX_ DIR *const dp, CLONE_PARAMS *const param) - { - DIR *ret; - --#if defined(HAS_FCHDIR) && defined(HAS_TELLDIR) && defined(HAS_SEEKDIR) -- DIR *pwd; -- const Direntry_t *dirent; -- char smallbuf[256]; /* XXX MAXPATHLEN, surely? */ -- char *name = NULL; -- STRLEN len = 0; -- long pos; --#endif -- - PERL_UNUSED_CONTEXT; - PERL_ARGS_ASSERT_DIRP_DUP; - -@@ -14116,89 +14107,13 @@ Perl_dirp_dup(pTHX_ DIR *const dp, CLONE_PARAMS *const param) - if (ret) - return ret; - --#if defined(HAS_FCHDIR) && defined(HAS_TELLDIR) && defined(HAS_SEEKDIR) -+#ifdef HAS_FDOPENDIR - - PERL_UNUSED_ARG(param); - -- /* create anew */ -- -- /* open the current directory (so we can switch back) */ -- if (!(pwd = PerlDir_open("."))) return (DIR *)NULL; -- -- /* chdir to our dir handle and open the present working directory */ -- if (fchdir(my_dirfd(dp)) < 0 || !(ret = PerlDir_open("."))) { -- PerlDir_close(pwd); -- return (DIR *)NULL; -- } -- /* Now we should have two dir handles pointing to the same dir. */ -- -- /* Be nice to the calling code and chdir back to where we were. */ -- /* XXX If this fails, then what? */ -- PERL_UNUSED_RESULT(fchdir(my_dirfd(pwd))); -+ ret = fdopendir(dup(my_dirfd(dp))); - -- /* We have no need of the pwd handle any more. */ -- PerlDir_close(pwd); -- --#ifdef DIRNAMLEN --# define d_namlen(d) (d)->d_namlen --#else --# define d_namlen(d) strlen((d)->d_name) --#endif -- /* Iterate once through dp, to get the file name at the current posi- -- tion. Then step back. */ -- pos = PerlDir_tell(dp); -- if ((dirent = PerlDir_read(dp))) { -- len = d_namlen(dirent); -- if (len > sizeof(dirent->d_name) && sizeof(dirent->d_name) > PTRSIZE) { -- /* If the len is somehow magically longer than the -- * maximum length of the directory entry, even though -- * we could fit it in a buffer, we could not copy it -- * from the dirent. Bail out. */ -- PerlDir_close(ret); -- return (DIR*)NULL; -- } -- if (len <= sizeof smallbuf) name = smallbuf; -- else Newx(name, len, char); -- Move(dirent->d_name, name, len, char); -- } -- PerlDir_seek(dp, pos); -- -- /* Iterate through the new dir handle, till we find a file with the -- right name. */ -- if (!dirent) /* just before the end */ -- for(;;) { -- pos = PerlDir_tell(ret); -- if (PerlDir_read(ret)) continue; /* not there yet */ -- PerlDir_seek(ret, pos); /* step back */ -- break; -- } -- else { -- const long pos0 = PerlDir_tell(ret); -- for(;;) { -- pos = PerlDir_tell(ret); -- if ((dirent = PerlDir_read(ret))) { -- if (len == (STRLEN)d_namlen(dirent) -- && memEQ(name, dirent->d_name, len)) { -- /* found it */ -- PerlDir_seek(ret, pos); /* step back */ -- break; -- } -- /* else we are not there yet; keep iterating */ -- } -- else { /* This is not meant to happen. The best we can do is -- reset the iterator to the beginning. */ -- PerlDir_seek(ret, pos0); -- break; -- } -- } -- } --#undef d_namlen -- -- if (name && name != smallbuf) -- Safefree(name); --#endif -- --#ifdef WIN32 -+#elif defined(WIN32) - ret = win32_dirp_dup(dp, param); - #endif - -diff --git a/t/op/threads-dirh.t b/t/op/threads-dirh.t -index bb4bcfc14184..14c399ca19cd 100644 ---- a/t/op/threads-dirh.t -+++ b/t/op/threads-dirh.t -@@ -13,16 +13,12 @@ BEGIN { - skip_all_if_miniperl("no dynamic loading on miniperl, no threads"); - skip_all("runs out of memory on some EBCDIC") if $ENV{PERL_SKIP_BIG_MEM_TESTS}; - -- plan(6); -+ plan(1); - } - - use strict; - use warnings; - use threads; --use threads::shared; --use File::Path; --use File::Spec::Functions qw 'updir catdir'; --use Cwd 'getcwd'; - - # Basic sanity check: make sure this does not crash - fresh_perl_is <<'# this is no comment', 'ok', {}, 'crash when duping dirh'; -@@ -31,101 +27,3 @@ fresh_perl_is <<'# this is no comment', 'ok', {}, 'crash when duping dirh'; - async{}->join for 1..2; - print "ok"; - # this is no comment -- --my $dir; --SKIP: { -- skip "telldir or seekdir not defined on this platform", 5 -- if !$Config::Config{d_telldir} || !$Config::Config{d_seekdir}; -- my $skip = sub { -- chdir($dir); -- chdir updir; -- skip $_[0], 5 -- }; -- -- if(!$Config::Config{d_fchdir} && $^O ne "MSWin32") { -- $::TODO = 'dir handle cloning currently requires fchdir on non-Windows platforms'; -- } -- -- my @w :shared; # warnings accumulator -- local $SIG{__WARN__} = sub { push @w, $_[0] }; -- -- $dir = catdir getcwd(), "thrext$$" . int rand() * 100000; -- -- rmtree($dir) if -d $dir; -- mkdir($dir); -- -- # Create a dir structure like this: -- # $dir -- # | -- # `- toberead -- # | -- # +---- thrit -- # | -- # +---- rile -- # | -- # `---- zor -- -- chdir($dir); -- mkdir 'toberead'; -- chdir 'toberead'; -- {open my $fh, ">thrit" or &$skip("Cannot create file thrit")} -- {open my $fh, ">rile" or &$skip("Cannot create file rile")} -- {open my $fh, ">zor" or &$skip("Cannot create file zor")} -- chdir updir; -- -- # Then test that dir iterators are cloned correctly. -- -- opendir my $toberead, 'toberead'; -- my $start_pos = telldir $toberead; -- my @first_2 = (scalar readdir $toberead, scalar readdir $toberead); -- my @from_thread = @{; async { [readdir $toberead ] } ->join }; -- my @from_main = readdir $toberead; -- is join('-', sort @from_thread), join('-', sort @from_main), -- 'dir iterator is copied from one thread to another'; -- like -- join('-', "", sort(@first_2, @from_thread), ""), -- qr/(?join, 'undef', -- 'cloned dir iterator that points to the end of the directory' -- ; -- } -- -- # Make sure the cloning code can handle file names longer than 255 chars -- SKIP: { -- chdir 'toberead'; -- open my $fh, -- ">floccipaucinihilopilification-" -- . "pneumonoultramicroscopicsilicovolcanoconiosis-" -- . "lopadotemachoselachogaleokranioleipsanodrimypotrimmatosilphiokarabo" -- . "melitokatakechymenokichlepikossyphophattoperisteralektryonoptokephal" -- . "liokinklopeleiolagoiosiraiobaphetraganopterygon" -- or -- chdir updir, -- skip("OS does not support long file names (and I mean *long*)", 1); -- chdir updir; -- opendir my $dirh, "toberead"; -- my $test_name -- = "dir iterators can be cloned when the next fn > 255 chars"; -- while() { -- my $pos = telldir $dirh; -- my $fn = readdir($dirh); -- if(!defined $fn) { fail($test_name); last SKIP; } -- if($fn =~ 'lagoio') { -- seekdir $dirh, $pos; -- last; -- } -- } -- is length async { scalar readdir $dirh } ->join, 258, $test_name; -- } -- -- is scalar @w, 0, 'no warnings during all that' or diag @w; -- chdir updir; --} --rmtree($dir); -diff --git a/win32/config.gc b/win32/config.gc -index f8776188c09c..34aa8de6ed75 100644 ---- a/win32/config.gc -+++ b/win32/config.gc -@@ -199,6 +199,7 @@ d_fd_macros='define' - d_fd_set='define' - d_fdclose='undef' - d_fdim='undef' -+d_fdopendir='undef' - d_fds_bits='define' - d_fegetround='undef' - d_ffs='undef' -diff --git a/win32/config.vc b/win32/config.vc -index 619979e22b53..536085fe94e0 100644 ---- a/win32/config.vc -+++ b/win32/config.vc -@@ -199,6 +199,7 @@ d_fd_macros='define' - d_fd_set='define' - d_fdclose='undef' - d_fdim='undef' -+d_fdopendir='undef' - d_fds_bits='define' - d_fegetround='undef' - d_ffs='undef' diff --git a/pkgs/development/interpreters/perl/cross.patch b/pkgs/development/interpreters/perl/cross.patch index e0f05ede90d0..0736c16d4f45 100644 --- a/pkgs/development/interpreters/perl/cross.patch +++ b/pkgs/development/interpreters/perl/cross.patch @@ -7,36 +7,10 @@ ExtUtils::MakeMaker JSON::PP Data::Dumper -Updated for perl v5.38.0 by stig@stig.io +Updated for perl v5.40.0 by marcus@means.no --- -diff --git a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm -index b0e83b0d2d..dab4907704 100644 ---- a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm -+++ b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm -@@ -86,21 +86,7 @@ sub new { - # from version::vpp - sub _find_magic_vstring { - my $value = shift; -- my $tvalue = ''; -- require B; -- my $sv = B::svref_2object(\$value); -- my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef; -- while ( $magic ) { -- if ( $magic->TYPE eq 'V' ) { -- $tvalue = $magic->PTR; -- $tvalue =~ s/^v?(.+)$/v$1/; -- last; -- } -- else { -- $magic = $magic->MOREMAGIC; -- } -- } -- return $tvalue; -+ return version::->parse($value)->stringify; - } - # safe if given an unblessed reference diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm index 746abd63bc..c55d7cd2d0 100644 diff --git a/pkgs/development/interpreters/perl/cross540.patch b/pkgs/development/interpreters/perl/cross540.patch deleted file mode 100644 index 0736c16d4f45..000000000000 --- a/pkgs/development/interpreters/perl/cross540.patch +++ /dev/null @@ -1,224 +0,0 @@ -From: =?UTF-8?q?Christian=20K=C3=B6gler?= -Date: Mon, 10 Apr 2023 22:12:24 +0200 -Subject: [PATCH] miniperl compatible modules - -CPAN::Meta -ExtUtils::MakeMaker -JSON::PP -Data::Dumper - -Updated for perl v5.40.0 by marcus@means.no - ---- - - # safe if given an unblessed reference -diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm -index 746abd63bc..c55d7cd2d0 100644 ---- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm -+++ b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm -@@ -1,6 +1,7 @@ - use 5.008001; # sane UTF-8 support - use strict; - use warnings; -+no warnings 'experimental::builtin'; - package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e - # XXX-INGY is 5.8.1 too old/broken for utf8? - # XXX-XDG Lancaster consensus was that it was sufficient until -@@ -650,27 +651,29 @@ sub _dump_string { - join '', map { "$_\n" } @lines; - } - --sub _has_internal_string_value { -+# taken from cpan/JSON-PP/lib/JSON/PP.pm -+sub _looks_like_number { - my $value = shift; -- my $b_obj = B::svref_2object(\$value); # for round trip problem -- return $b_obj->FLAGS & B::SVf_POK(); -+ no warnings 'numeric'; -+ # if the utf8 flag is on, it almost certainly started as a string -+ return if utf8::is_utf8($value); -+ # detect numbers -+ # string & "" -> "" -+ # number & "" -> 0 (with warning) -+ # nan and inf can detect as numbers, so check with * 0 -+ return unless length((my $dummy = "") & $value); -+ return unless 0 + $value eq $value; -+ return 1 if $value * 0 == 0; -+ return -1; # inf/nan - } - - sub _dump_scalar { - my $string = $_[1]; - my $is_key = $_[2]; -- # Check this before checking length or it winds up looking like a string! -- my $has_string_flag = _has_internal_string_value($string); - return '~' unless defined $string; - return "''" unless length $string; -- if (Scalar::Util::looks_like_number($string)) { -- # keys and values that have been used as strings get quoted -- if ( $is_key || $has_string_flag ) { -- return qq['$string']; -- } -- else { -- return $string; -- } -+ if (_looks_like_number($string)) { -+ return qq['$string']; - } - if ( $string =~ /[\x00-\x09\x0b-\x0d\x0e-\x1f\x7f-\x9f\'\n]/ ) { - $string =~ s/\\/\\\\/g; -@@ -800,9 +803,6 @@ sub errstr { - # Helper functions. Possibly not needed. - - --# Use to detect nv or iv --use B; -- - # XXX-INGY Is flock CPAN::Meta::YAML's responsibility? - # Some platforms can't flock :-( - # XXX-XDG I think it is. When reading and writing files, we ought -@@ -822,35 +822,8 @@ sub _can_flock { - } - } - -- --# XXX-INGY Is this core in 5.8.1? Can we remove this? --# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this --##################################################################### --# Use Scalar::Util if possible, otherwise emulate it -- --use Scalar::Util (); - BEGIN { -- local $@; -- if ( eval { Scalar::Util->VERSION(1.18); } ) { -- *refaddr = *Scalar::Util::refaddr; -- } -- else { -- eval <<'END_PERL'; --# Scalar::Util failed to load or too old --sub refaddr { -- my $pkg = ref($_[0]) or return undef; -- if ( !! UNIVERSAL::can($_[0], 'can') ) { -- bless $_[0], 'Scalar::Util::Fake'; -- } else { -- $pkg = undef; -- } -- "$_[0]" =~ /0x(\w+)/; -- my $i = do { no warnings 'portable'; hex $1 }; -- bless $_[0], $pkg if defined $pkg; -- $i; --} --END_PERL -- } -+ *refaddr = *builtin::refaddr; - } - - delete $CPAN::Meta::YAML::{refaddr}; -diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm -index 3604eae402..991f69d275 100644 ---- a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm -+++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm -@@ -1,12 +1,13 @@ - use strict; - use warnings; -+no warnings 'experimental::builtin'; - - package CPAN::Meta::Merge; - - our $VERSION = '2.150010'; - - use Carp qw/croak/; --use Scalar::Util qw/blessed/; -+use builtin qw/blessed/; - use CPAN::Meta::Converter 2.141170; - - sub _is_identical { -diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm -index d4e93fd8a5..809da68d02 100644 ---- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm -+++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm -@@ -1,6 +1,7 @@ - use 5.006; - use strict; - use warnings; -+no warnings 'experimental::builtin'; - package CPAN::Meta::Prereqs; - - our $VERSION = '2.150010'; -@@ -14,7 +15,6 @@ our $VERSION = '2.150010'; - #pod =cut - - use Carp qw(confess); --use Scalar::Util qw(blessed); - use CPAN::Meta::Requirements 2.121; - - #pod =method new -@@ -168,7 +168,12 @@ sub types_in { - sub with_merged_prereqs { - my ($self, $other) = @_; - -- my @other = blessed($other) ? $other : @$other; -+ eval 'require Scalar::Util'; -+ my @other = unless($@){ -+ Scalar::Util::blessed($other) ? $other : @$other; -+ }else{ -+ builtin::blessed($other) ? $other : @$other; -+ } - - my @prereq_objs = ($self, @other); - -diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm -index fc8fcbc8f0..cda7b90c65 100644 ---- a/cpan/JSON-PP/lib/JSON/PP.pm -+++ b/cpan/JSON-PP/lib/JSON/PP.pm -@@ -4,6 +4,7 @@ package JSON::PP; - - use 5.008; - use strict; -+no warnings 'experimental::builtin'; - - use Exporter (); - BEGIN { our @ISA = ('Exporter') } -diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm -index bb6d3caedb..0c2fde4743 100644 ---- a/dist/Data-Dumper/Dumper.pm -+++ b/dist/Data-Dumper/Dumper.pm -@@ -11,6 +11,7 @@ package Data::Dumper; - - use strict; - use warnings; -+no warnings 'experimental::builtin'; - - #$| = 1; - -@@ -125,8 +126,7 @@ sub new { - # Packed numeric addresses take less memory. Plus pack is faster than sprintf - - sub format_refaddr { -- require Scalar::Util; -- pack "J", Scalar::Util::refaddr(shift); -+ pack "J", builtin::refaddr(shift); - }; - - # -@@ -282,9 +282,8 @@ sub _dump { - warn "WARNING(Freezer method call failed): $@" if $@; - } - -- require Scalar::Util; -- my $realpack = Scalar::Util::blessed($val); -- my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val; -+ my $realpack = builtin::blessed($val); -+ my $realtype = $realpack ? builtin::reftype($val) : ref $val; - $id = format_refaddr($val); - - # Note: By this point $name is always defined and of non-zero length. -@@ -576,7 +575,7 @@ sub _dump { - # here generates a different result. So there are actually "three" different - # implementations of Data::Dumper (kind of sort of) but we only test two. - elsif (!defined &_vstring -- and ref $ref eq 'VSTRING' || eval{Scalar::Util::isvstring($val)}) { -+ and ref $ref eq 'VSTRING') { - $out .= sprintf "v%vd", $val; - } - # \d here would treat "1\x{660}" as a safe decimal number diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 69d02530a90f..8fc7b5dd07a3 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -68,19 +68,10 @@ let in rec { - # Maint version - perl538 = callPackage ./interpreter.nix { - self = perl538; - version = "5.38.2"; - sha256 = "sha256-oKMVNEUet7g8fWWUpJdUOlTUiLyQygD140diV39AZV4="; - inherit passthruFun; - }; - - # Maint version - perl540 = callPackage ./interpreter.nix { - self = perl540; - version = "5.40.0"; - sha256 = "sha256-x0A0jzVzljJ6l5XT6DI7r9D+ilx4NfwcuroMyN/nFh8="; + perl5 = callPackage ./interpreter.nix { + self = perl5; + version = "5.42.0"; + sha256 = "sha256-4JPvGE1/mhuXl+JGUpb1VRCtttq4hCsMPtUzKWYwltw="; inherit passthruFun; }; } diff --git a/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch b/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch deleted file mode 100644 index 9f9e1e96f619..000000000000 --- a/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bd0ab509f890a6638bd5033ef58526f8c74f7e4b Mon Sep 17 00:00:00 2001 -From: Andrei Horodniceanu -Date: Wed, 4 Sep 2024 12:46:44 +0300 -Subject: [PATCH] locale.c: Fix compilation on platforms with only a C locale - -Signed-off-by: Andrei Horodniceanu ---- - AUTHORS | 1 + - locale.c | 16 ++++++++++++++++ - 2 files changed, 17 insertions(+) - -diff --git a/AUTHORS b/AUTHORS -index b2e0bf2043a9..b196b93bda13 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -103,6 +103,7 @@ Andreas König - Andreas Marienborg - Andreas Schwab - Andreas Voegele -+Andrei Horodniceanu - Andrei Yelistratov - Andrej Borsenkow - Andrew Bettison -diff --git a/locale.c b/locale.c -index 168b94914318..d764b4b3c11e 100644 ---- a/locale.c -+++ b/locale.c -@@ -8963,6 +8963,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn) - * categories into our internal indices. */ - if (map_LC_ALL_position_to_index[0] == LC_ALL_INDEX_) { - -+# ifdef PERL_LC_ALL_CATEGORY_POSITIONS_INIT - /* Use this array, initialized by a config.h constant */ - int lc_all_category_positions[] = PERL_LC_ALL_CATEGORY_POSITIONS_INIT; - STATIC_ASSERT_STMT( C_ARRAY_LENGTH(lc_all_category_positions) -@@ -8975,6 +8976,21 @@ Perl_init_i18nl10n(pTHX_ int printwarn) - map_LC_ALL_position_to_index[i] = - get_category_index(lc_all_category_positions[i]); - } -+# else -+ /* It is possible for both PERL_LC_ALL_USES_NAME_VALUE_PAIRS and -+ * PERL_LC_ALL_CATEGORY_POSITIONS_INIT not to be defined, e.g. on -+ * systems with only a C locale during ./Configure. Assume that this -+ * can only happen as part of some sort of bootstrapping so allow -+ * compilation to succeed by ignoring correctness. -+ */ -+ for (unsigned int i = 0; -+ i < C_ARRAY_LENGTH(map_LC_ALL_position_to_index); -+ i++) -+ { -+ map_LC_ALL_position_to_index[i] = 0; -+ } -+# endif -+ - } - - LOCALE_UNLOCK; diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 16e6bd821d5a..3de44189f354 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -15,7 +15,7 @@ zlib, config, passthruFun, - perlAttr ? "perl${lib.versions.major version}${lib.versions.minor version}", + perlAttr ? "perl${lib.versions.major version}", enableThreading ? true, coreutils, makeWrapper, @@ -71,27 +71,16 @@ stdenv.mkDerivation ( disallowedReferences = [ stdenv.cc ]; - patches = [ - ./CVE-2024-56406.patch - ./CVE-2025-40909.patch - ] - # Do not look in /usr etc. for dependencies. - ++ lib.optional ((lib.versions.majorMinor version) == "5.38") ./no-sys-dirs-5.38.0.patch - ++ lib.optional ((lib.versions.majorMinor version) == "5.40") ./no-sys-dirs-5.40.0.patch - - # Fix compilation on platforms with only a C locale: https://github.com/Perl/perl5/pull/22569 - ++ lib.optional (version == "5.40.0") ./fix-build-with-only-C-locale-5.40.0.patch - - ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ./cpp-precomp.patch - ./sw_vers.patch - ] - # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option - # https://github.com/arsv/perl-cross/pull/159 - ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross-fdopendir.patch - ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch - ++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch; + patches = + [ + ./no-sys-dirs.patch + ] + ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ./cpp-precomp.patch + ./sw_vers.patch + ] + ++ lib.optional crossCompiling ./cross.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -186,7 +175,7 @@ stdenv.mkDerivation ( dontAddPrefix = !crossCompiling; - enableParallelBuilding = false; + enableParallelBuilding = true; # perl includes the build date, the uname of the build system and the # username of the build user in some files. diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch deleted file mode 100644 index c959730d1420..000000000000 --- a/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch +++ /dev/null @@ -1,256 +0,0 @@ -diff --git a/Configure b/Configure -index e261cb9548..3bbbc4b9df 100755 ---- a/Configure -+++ b/Configure -@@ -108,15 +108,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th - fi - - : Proper PATH setting --paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' --paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" --paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" --paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" --paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" --paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" --paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" --paths="$paths /sbin /usr/sbin /usr/libexec" --paths="$paths /system/gnu_library/bin" -+paths='' - - for p in $paths - do -@@ -1455,8 +1447,7 @@ groupstype='' - i_whoami='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" --locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" -+locincpth="" - : - : no include file wanted by default - inclwanted='' -@@ -1470,17 +1461,12 @@ DEBUGGING='' - archobjs='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 --xlibpth='/usr/lib/386 /lib/386' -+xlibpth='' - : Possible local library directories to search. --loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" --loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" -+loclibpth="" - - : general looking path for locating libraries --glibpth="/lib /usr/lib $xlibpth" --glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" --test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" --test -f /shlib/libc.so && glibpth="/shlib $glibpth" --test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" -+glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -@@ -1515,8 +1501,6 @@ libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld" - libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. --glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` --glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - -@@ -2581,7 +2565,6 @@ uname - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` --pth="$pth $sysroot/lib $sysroot/usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in -@@ -5023,7 +5006,7 @@ esac - : Set private lib path - case "$plibpth" in - '') if ./mips; then -- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" -+ plibpth="$incpath/usr/lib" - fi;; - esac - case "$libpth" in -@@ -8860,13 +8843,8 @@ esac - echo " " - case "$sysman" in - '') -- syspath='/usr/share/man/man1 /usr/man/man1' -- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -- syspath="$syspath /usr/man/u_man/man1" -- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -- sysman=`./loc . /usr/man/man1 $syspath` -+ syspath='' -+ sysman='' - ;; - esac - if $test -d "$sysman"; then -@@ -21500,9 +21478,10 @@ $rm_try tryp - case "$full_ar" in - '') full_ar=$ar ;; - esac -+full_ar=ar - - : Store the full pathname to the sed program for use in the C program --full_sed=$sed -+full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL -index ae647d5f06..9a05d66592 100644 ---- a/ext/Errno/Errno_pm.PL -+++ b/ext/Errno/Errno_pm.PL -@@ -135,12 +135,7 @@ sub get_files { - if ($dep =~ /(\S+errno\.h)/) { - push(@file, $1); - } -- } elsif ($^O eq 'linux' && -- $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i && -- # might be using, say, Intel's icc -- $linux_errno_h -- ) { -+ } elsif (0) { - push(@file, $linux_errno_h); - } elsif ($^O eq 'haiku') { - # hidden in a special place -diff --git a/hints/freebsd.sh b/hints/freebsd.sh -index 4d26835e99..c6d365d84d 100644 ---- a/hints/freebsd.sh -+++ b/hints/freebsd.sh -@@ -127,21 +127,21 @@ case "$osvers" in - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -- libpth="/usr/lib/aout /usr/local/lib /usr/lib" -- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" -+ libpth="" -+ glibpth="" - fi - lddlflags='-Bshareable' - else -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi - cccdlflags='-DPIC -fPIC' - ;; - *) -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - cccdlflags='-DPIC -fPIC' -diff --git a/hints/linux.sh b/hints/linux.sh -index e1508c7509..5a187c583a 100644 ---- a/hints/linux.sh -+++ b/hints/linux.sh -@@ -150,28 +150,6 @@ case "$optimize" in - ;; - esac - --# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries --# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us --# where to look. We don't want gcc's own libraries, however, so we --# filter those out. --# This could be conditional on Ubuntu, but other distributions may --# follow suit, and this scheme seems to work even on rather old gcc's. --# This unconditionally uses gcc because even if the user is using another --# compiler, we still need to find the math library and friends, and I don't --# know how other compilers will cope with that situation. --# Morever, if the user has their own gcc earlier in $PATH than the system gcc, --# we don't want its libraries. So we try to prefer the system gcc --# Still, as an escape hatch, allow Configure command line overrides to --# plibpth to bypass this check. --if [ -x /usr/bin/gcc ] ; then -- gcc=/usr/bin/gcc --# clang also provides -print-search-dirs --elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then -- gcc=${cc:-cc} --else -- gcc=gcc --fi -- - case "$plibpth" in - '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | - cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` -@@ -208,32 +186,6 @@ case "$usequadmath" in - ;; - esac - --case "$libc" in --'') --# If you have glibc, then report the version for ./myconfig bug reporting. --# (Configure doesn't need to know the specific version since it just uses --# gcc to load the library for all tests.) --# We don't use __GLIBC__ and __GLIBC_MINOR__ because they --# are insufficiently precise to distinguish things like --# libc-2.0.6 and libc-2.0.7. -- for p in $plibpth -- do -- for trylib in libc.so.6 libc.so -- do -- if $test -e $p/$trylib; then -- libc=`ls -l $p/$trylib | awk '{print $NF}'` -- if $test "X$libc" != X; then -- break -- fi -- fi -- done -- if $test "X$libc" != X; then -- break -- fi -- done -- ;; --esac -- - if ${sh:-/bin/sh} -c exit; then - echo '' - echo 'You appear to have a working bash. Good.' -@@ -311,33 +263,6 @@ sparc*) - ;; - esac - --# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than --# true libraries. The scripts cause binding against static --# version of -lgdbm which is a bad idea. So if we have 'nm' --# make sure it can read the file --# NI-S 2003/08/07 --case "$nm" in -- '') ;; -- *) -- for p in $plibpth -- do -- if $test -r $p/libndbm.so; then -- if $nm $p/libndbm.so >/dev/null 2>&1 ; then -- echo 'Your shared -lndbm seems to be a real library.' -- _libndbm_real=1 -- break -- fi -- fi -- done -- if $test "X$_libndbm_real" = X; then -- echo 'Your shared -lndbm is not a real library.' -- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` -- shift -- libswanted="$*" -- fi -- ;; --esac -- - # Linux on Synology. - if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then - # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch b/pkgs/development/interpreters/perl/no-sys-dirs.patch similarity index 100% rename from pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch rename to pkgs/development/interpreters/perl/no-sys-dirs.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ab3d82d2ef8..5fdb2ddca247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -327,11 +327,6 @@ with pkgs; stdenv = clangStdenv; }; - cope = callPackage ../by-name/co/cope/package.nix { - perl = perl538; - perlPackages = perl538Packages; - }; - coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); cup-docker-noserver = cup-docker.override { withServer = false; }; @@ -8928,13 +8923,12 @@ with pkgs; ### DEVELOPMENT / PERL MODULES perlInterpreters = import ../development/interpreters/perl { inherit callPackage; }; - inherit (perlInterpreters) perl538 perl540; + inherit (perlInterpreters) perl5; - perl538Packages = recurseIntoAttrs perl538.pkgs; - perl540Packages = recurseIntoAttrs perl540.pkgs; + perl5Packages = recurseIntoAttrs perl5.pkgs; - perl = perl540; - perlPackages = perl540Packages; + perl = perl5; + perlPackages = perl5Packages; ack = perlPackages.ack; From 13e62bda431a3c1e6258db3b5af2984a58cf144f Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sat, 26 Jul 2025 21:59:02 +0200 Subject: [PATCH 059/542] PerlPackages.BKeywords: 1.27 -> 1.28 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 26a964e72138..fc6c50fa70d8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2596,10 +2596,10 @@ with self; BKeywords = buildPerlPackage { pname = "B-Keywords"; - version = "1.27"; + version = "1.28"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.27.tar.gz"; - hash = "sha256-7xC5CF5nTqpBfMt9aS+2zZj3u2feKhJ+ujRX2K5YfP8="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.28.tar.gz"; + hash = "sha256-nn62dpWSlIfGGq8trouvndoa2HYCu1oJTxB0SxJ2Xj4="; }; meta = { description = "Lists of reserved barewords and symbol names"; From fdbfe3aada8d67eec4f6acb453fb4fe398839e22 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 26 Jul 2025 22:20:20 +0200 Subject: [PATCH 060/542] perlPackages.Mouse: 2.5.10 -> 2.5.11 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fc6c50fa70d8..4b620c91b1eb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -24675,10 +24675,10 @@ with self; Mouse = buildPerlModule { pname = "Mouse"; - version = "2.5.10"; + version = "2.5.11"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.10.tar.gz"; - hash = "sha256-zo3COUYVOkZ/8JdlFn7iWQ9cUCEg9IotlEFzPzmqMu4="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.11.tar.gz"; + hash = "sha256-4qDQkwGQwhpES5YHk6ouNp7yih3QuPNIKXlfhqGRWVY="; }; buildInputs = [ ModuleBuildXSUtil From 84acd893afe3aee2067f8f7cadbaad77eca9b90f Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sat, 26 Jul 2025 22:13:12 +0200 Subject: [PATCH 061/542] PerlPackages.TestSimple13: drop --- pkgs/by-name/hy/hydra/package.nix | 1 - pkgs/servers/mail/public-inbox/default.nix | 2 -- pkgs/top-level/perl-packages.nix | 32 ---------------------- 3 files changed, 35 deletions(-) diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index a8e40efcdf39..55c86b663f08 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -117,7 +117,6 @@ let TermReadKey Test2Harness TestPostgreSQL - TestSimple13 TextDiff TextTable UUID4Tiny diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix index 32effee18f62..4ee96bff0ad2 100644 --- a/pkgs/servers/mail/public-inbox/default.nix +++ b/pkgs/servers/mail/public-inbox/default.nix @@ -39,7 +39,6 @@ PlackMiddlewareReverseProxy, PlackTestExternalServer, Xapian, - TestSimple13, TimeDate, URI, XMLTreePP, @@ -145,7 +144,6 @@ buildPerlPackage rec { xapian EmailMIME PlackTestExternalServer - TestSimple13 XMLTreePP ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b620c91b1eb..78ac121a5bfd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3383,7 +3383,6 @@ with self; buildInputs = [ ModuleBuildTiny TestLongString - TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -3804,7 +3803,6 @@ with self; buildInputs = [ CatalystRuntime TestLongString - TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -4178,7 +4176,6 @@ with self; buildInputs = [ CatalystRuntime TestLongString - TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV @@ -6439,7 +6436,6 @@ with self; }; buildInputs = [ TestException - TestSimple13 ]; meta = { description = "Run code after a subroutine call, preserving the context the subroutine would have seen if it were the last statement in the caller"; @@ -7318,7 +7314,6 @@ with self; buildInputs = [ ModuleBuildTiny TestFatal - TestSimple13 ]; propagatedBuildInputs = [ CaptureTiny @@ -10052,7 +10047,6 @@ with self; }; buildInputs = [ DBIxClass - TestSimple13 ]; propagatedBuildInputs = [ DBDSQLite @@ -10672,7 +10666,6 @@ with self; namespaceclean ]; buildInputs = [ - TestSimple13 TestWarnings ]; meta = { @@ -15611,7 +15604,6 @@ with self; hash = "sha256-vJpKo47JjwqYKJ41q/mhfC8qMjmiIJoymADglwqi4MU="; }; propagatedBuildInputs = [ HashMerge ]; - buildInputs = [ TestSimple13 ]; meta = { description = "Return difference between two hashes as a hash"; @@ -17493,7 +17485,6 @@ with self; ]; buildInputs = [ ModuleBuildTiny - TestSimple13 ]; meta = { description = "Functions for working with IO::Handle like objects"; @@ -24150,7 +24141,6 @@ with self; buildInputs = [ ModuleBuildTiny TestFatal - TestSimple13 TestTableDriven ]; propagatedBuildInputs = [ @@ -24303,7 +24293,6 @@ with self; MooseXRoleParameterized TestFatal TestRequires - TestSimple13 ]; propagatedBuildInputs = [ Moose @@ -24402,7 +24391,6 @@ with self; buildInputs = [ ModuleBuildTiny TestFatal - TestSimple13 ]; propagatedBuildInputs = [ DateTime @@ -24428,7 +24416,6 @@ with self; buildInputs = [ ModuleBuildTiny TestFatal - TestSimple13 ]; propagatedBuildInputs = [ DateTimeXEasy @@ -31874,7 +31861,6 @@ with self; }; buildInputs = [ TestException - TestSimple13 TestTableDriven ]; propagatedBuildInputs = [ @@ -33381,7 +33367,6 @@ with self; IPCRun3 Test2Suite ]; - propagatedBuildInputs = [ TestSimple13 ]; meta = { description = "Fail if tests warn"; homepage = "https://metacpan.org/release/Test2-Plugin-NoWarnings"; @@ -33401,7 +33386,6 @@ with self; ScopeGuard SubInfo TermTable - TestSimple13 ]; meta = { description = "Distribution with a rich set of tools built upon the Test2 framework"; @@ -35259,21 +35243,6 @@ with self; }; }; - TestSimple13 = buildPerlPackage { - pname = "Test-Simple"; - version = "1.302195"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302195.tar.gz"; - hash = "sha256-s5C7I1kuC5Rsla27PDCxG8Y0ooayhHvmEa2SnFfjmmw="; - }; - meta = { - description = "Basic utilities for writing tests"; - license = with lib.licenses; [ - artistic1 - gpl1Plus - ]; - }; - }; TestSnapshot = buildPerlPackage { pname = "Test-Snapshot"; @@ -39060,7 +39029,6 @@ with self; buildInputs = [ ExtUtilsDepends TestFatal - TestSimple13 ]; meta = { description = "Opaque, extensible XS pointer backed objects using sv_magic"; From 950b27f453db6653120d94f5cd9251681b5a5491 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 26 Jul 2025 22:31:03 +0200 Subject: [PATCH 062/542] perlPackages.PerlCriticCommunity: 1.0.3 -> 1.0.4 --- pkgs/top-level/perl-packages.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 78ac121a5bfd..dc342d768af4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -27792,18 +27792,18 @@ with self; PerlCriticCommunity = buildPerlModule { pname = "Perl-Critic-Community"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.3.tar.gz"; - hash = "sha256-Ed3bt5F5/mIp8zPKOS+U/firXNmJzJfZk1IaidXEetU="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.4.tar.gz"; + hash = "sha256-OzFiTqDPQ5K49Dl6UpUVJIgUohZml/GkU9WKtvES0gk="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ PPI PathTiny PerlCritic + PerlCriticPolicyPliceaseProhibitArrayAssignAref PerlCriticPolicyVariablesProhibitLoopOnHash - PerlCriticPulp ]; meta = { description = "Community-inspired Perl::Critic policies"; @@ -27831,6 +27831,21 @@ with self; }; }; + PerlCriticPolicyPliceaseProhibitArrayAssignAref = buildPerlPackage { + pname = "Perl-Critic-Policy-Plicease-ProhibitArrayAssignAref"; + version = "100.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Perl-Critic-Policy-Plicease-ProhibitArrayAssignAref-100.00.tar.gz"; + hash = "sha256-2LcyMNK4vyuAEE/Ap1jHSLn/N7CL+Buqc/jXCeIM/r4="; + }; + propagatedBuildInputs = [ PerlCritic ]; + meta = { + homepage = "https://metacpan.org/pod/Perl::Critic::Policy::Plicease::ProhibitArrayAssignAref"; + description = "Don't assign an anonymous arrayref to an array"; + license = lib.licenses.gpl3Plus; + }; + }; + PerlCriticPolicyVariablesProhibitLoopOnHash = buildPerlPackage { pname = "Perl-Critic-Policy-Variables-ProhibitLoopOnHash"; version = "0.008"; From a63f168de2871eb461d9f7d18d402c50379dab2b Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 26 Jul 2025 22:34:30 +0200 Subject: [PATCH 063/542] perlPackages.SyntaxKeywordTry: 0.29 -> 0.30 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dc342d768af4..51b900d62faa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -32344,10 +32344,10 @@ with self; SyntaxKeywordTry = buildPerlModule { pname = "Syntax-Keyword-Try"; - version = "0.29"; + version = "0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.29.tar.gz"; - hash = "sha256-zDIHGdNgjaqVFHQ6Q9rCvpnLjM2Ymx/vooUpDLHVnY8="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.30.tar.gz"; + hash = "sha256-8Gjwuccf/4/vbYqentaVHLelK5djIr2VUYHMXnsX5pI="; }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ XSParseKeyword ]; From 7027bf8fec74986909fc50ddf8639f615276691a Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 26 Jul 2025 22:37:42 +0200 Subject: [PATCH 064/542] perlPackages.Test2Harness: 1.000155 -> 1.000161 --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 51b900d62faa..faf356cd0509 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -35258,7 +35258,6 @@ with self; }; }; - TestSnapshot = buildPerlPackage { pname = "Test-Snapshot"; version = "0.06"; From 45d0b8a68fceefd4e219154bac1e48db531c69a8 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sun, 27 Jul 2025 14:02:05 +0200 Subject: [PATCH 065/542] perlPackages.NetAmazonS3: apply patch from upstream to fix test suite --- pkgs/top-level/perl-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index faf356cd0509..d95bb535f3b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -25057,6 +25057,12 @@ with self; url = "mirror://cpan/authors/id/B/BA/BARNEY/Net-Amazon-S3-0.991.tar.gz"; hash = "sha256-+3r4umSUjRo/MdgJ13EFImiA8GmYrH8Rn4JITmijI9M="; }; + patches = [ + (fetchpatch { + url = "https://github.com/rustyconover/net-amazon-s3/commit/233cb0f2812c4f71b4fecd4058dbf34fe8d6824d.patch"; + hash = "sha256-lVx1CoAFY37KIkDdl2Inqb16aZ9D0lXt475/7LyjOLM="; + }) + ]; buildInputs = [ TestDeep TestException From 2f8c776f600a379f33846b7205918a8dbf2c8c8a Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Mon, 28 Jul 2025 08:53:38 +0200 Subject: [PATCH 066/542] perlPackages.PerlTidy: 20230912 -> 20250711 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d95bb535f3b2..ace76654c4b3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -28107,10 +28107,10 @@ with self; PerlTidy = buildPerlPackage { pname = "Perl-Tidy"; - version = "20230912"; + version = "20250711"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20230912.tar.gz"; - hash = "sha256-DFeIjyBvmHd34WZA5yV0qgp3eEZxn44+0EE8NTJfVUA="; + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20250711.tar.gz"; + hash = "sha256-NHqpC8773itZDa9I04fvH9m3pzqZawQCafEatvuLpEg="; }; meta = { description = "Indent and reformat perl scripts"; From 0debac0acce955b5ff18b4547e48b1453f7b0d51 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Mon, 28 Jul 2025 09:48:50 +0200 Subject: [PATCH 067/542] perlPackages.EV: apply patch for 5.42 compatibility --- pkgs/top-level/perl-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ace76654c4b3..6962971ba116 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12278,6 +12278,13 @@ with self; url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.34.tar.gz"; hash = "sha256-EhFoPc57Z3H0q3EMwVNxK913umFXoTKU0LtzSR/QZWA="; }; + patches = [ + (fetchpatch { + name = "EV-4.34-perl-5.42.patch"; + url = "https://free.nchc.org.tw/gentoo-portage/dev-perl/EV/files/EV-4.34-perl-5.42.patch"; + hash = "sha256-GiQ89pk3EZ3b6oxB7jDTY5C62qqKsZUjJ4Ag2JVwGFw="; + }) + ]; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; meta = { From e6402f52b3745d1511c2155d55608dec42f32d28 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Mon, 28 Jul 2025 10:16:11 +0200 Subject: [PATCH 068/542] perlPackages.XSParseSublike: 0.29 -> 0.37 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6962971ba116..3cbea2111b1e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -39091,10 +39091,10 @@ with self; XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; - version = "0.29"; + version = "0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.29.tar.gz"; - hash = "sha256-UnX1w457gFe6cuzRzAcpO26TOadzdA51pse+lSAfHjw="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.37.tar.gz"; + hash = "sha256-c2UoyIjqe2phkQEeXVp4JOw4pWIFB95u9F5LxuHPDak="; }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ FileShareDir ]; From a0de9bfd9a666a4d210aec4ee5a5d230c18273c3 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Mon, 28 Jul 2025 10:21:06 +0200 Subject: [PATCH 069/542] perlPackages.FutureAsyncAwait: 0.66 -> 0.70 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3cbea2111b1e..68980fee7928 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14465,10 +14465,10 @@ with self; FutureAsyncAwait = buildPerlModule { pname = "Future-AsyncAwait"; - version = "0.66"; + version = "0.70"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.66.tar.gz"; - hash = "sha256-xqD03kYr8yS1usoXddGZ7DJGo1jBPbm2Ssv82+bl7CE="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.70.tar.gz"; + hash = "sha256-hCiZBJyXf7IyaoCWkmRB5XvsqRK7K0kY1c4JDfTUprc="; }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ From 1a2ef0c9af38aa0ff7500f757f54ed788c3c864d Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Thu, 31 Jul 2025 19:51:52 +0200 Subject: [PATCH 070/542] perlPackages.Error: 0.17029 -> 0.17030 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 68980fee7928..8110742ec34d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12257,10 +12257,10 @@ with self; Error = buildPerlModule { pname = "Error"; - version = "0.17029"; + version = "0.17030"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17029.tar.gz"; - hash = "sha256-GiP3kTAyrtbUtoMhNzo4mcpmWQ9HJzkaCR7BnJW/etw="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17030.tar.gz"; + hash = "sha256-NNOCJ2wPsNazg1W5TJajCxLYNNVmLrU/CI7iXj5xKSQ="; }; meta = { description = "Error/exception handling in an OO-ish way"; From ea55a49b7fc749a9f55b8bd1e9f3e666b6055c5e Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sun, 7 Sep 2025 11:51:24 +0200 Subject: [PATCH 071/542] perl: add cross patchset for 5.42.0 --- .../interpreters/perl/interpreter.nix | 29 +-- .../interpreters/perl/perl-5.42.0-cross.patch | 186 ++++++++++++++++++ 2 files changed, 203 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/interpreters/perl/perl-5.42.0-cross.patch diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 3de44189f354..be75635d7e98 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -71,16 +71,15 @@ stdenv.mkDerivation ( disallowedReferences = [ stdenv.cc ]; - patches = - [ - ./no-sys-dirs.patch - ] - ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ./cpp-precomp.patch - ./sw_vers.patch - ] - ++ lib.optional crossCompiling ./cross.patch; + patches = [ + ./no-sys-dirs.patch + ] + ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ./cpp-precomp.patch + ./sw_vers.patch + ] + ++ lib.optional crossCompiling ./cross.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -318,8 +317,14 @@ stdenv.mkDerivation ( rev = crossVersion; hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw="; }; - - # Patches are above!!! + patches = [ + # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option + # https://github.com/arsv/perl-cross/pull/159 + ./cross-fdopendir.patch + # Add patchset for 5.42.0 - Can hopefully be removed once perl-cross is updated + # https://github.com/arsv/perl-cross/pull/164 + ./perl-5.42.0-cross.patch + ]; depsBuildBuild = [ buildPackages.stdenv.cc diff --git a/pkgs/development/interpreters/perl/perl-5.42.0-cross.patch b/pkgs/development/interpreters/perl/perl-5.42.0-cross.patch new file mode 100644 index 000000000000..66b536b6973d --- /dev/null +++ b/pkgs/development/interpreters/perl/perl-5.42.0-cross.patch @@ -0,0 +1,186 @@ +From b47ef629459076a5ccb3d0caf83ccfbb8ba0571b Mon Sep 17 00:00:00 2001 +From: Marcus Ramberg +Date: Wed, 3 Sep 2025 10:35:58 +0200 +Subject: [PATCH] patches for perl-5.42.0 + +--- + cnf/diffs/perl5-5.42.0/constant.patch | 1 + + cnf/diffs/perl5-5.42.0/dynaloader.patch | 1 + + cnf/diffs/perl5-5.42.0/findext.patch | 1 + + cnf/diffs/perl5-5.42.0/installscripts.patch | 1 + + cnf/diffs/perl5-5.42.0/liblist.patch | 80 +++++++++++++++++++++ + cnf/diffs/perl5-5.42.0/makemaker.patch | 1 + + cnf/diffs/perl5-5.42.0/posix-makefile.patch | 1 + + cnf/diffs/perl5-5.42.0/test-checkcase.patch | 1 + + cnf/diffs/perl5-5.42.0/test-makemaker.patch | 1 + + cnf/diffs/perl5-5.42.0/xconfig.patch | 1 + + 10 files changed, 89 insertions(+) + create mode 120000 cnf/diffs/perl5-5.42.0/constant.patch + create mode 120000 cnf/diffs/perl5-5.42.0/dynaloader.patch + create mode 120000 cnf/diffs/perl5-5.42.0/findext.patch + create mode 120000 cnf/diffs/perl5-5.42.0/installscripts.patch + create mode 100644 cnf/diffs/perl5-5.42.0/liblist.patch + create mode 120000 cnf/diffs/perl5-5.42.0/makemaker.patch + create mode 120000 cnf/diffs/perl5-5.42.0/posix-makefile.patch + create mode 120000 cnf/diffs/perl5-5.42.0/test-checkcase.patch + create mode 120000 cnf/diffs/perl5-5.42.0/test-makemaker.patch + create mode 120000 cnf/diffs/perl5-5.42.0/xconfig.patch + +diff --git a/cnf/diffs/perl5-5.42.0/constant.patch b/cnf/diffs/perl5-5.42.0/constant.patch +new file mode 120000 +index 0000000..065e198 +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/constant.patch +@@ -0,0 +1 @@ ++../perl5-5.22.3/constant.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/dynaloader.patch b/cnf/diffs/perl5-5.42.0/dynaloader.patch +new file mode 120000 +index 0000000..ffb73eb +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/dynaloader.patch +@@ -0,0 +1 @@ ++../perl5-5.22.3/dynaloader.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/findext.patch b/cnf/diffs/perl5-5.42.0/findext.patch +new file mode 120000 +index 0000000..9efbe5b +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/findext.patch +@@ -0,0 +1 @@ ++../perl5-5.22.3/findext.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/installscripts.patch b/cnf/diffs/perl5-5.42.0/installscripts.patch +new file mode 120000 +index 0000000..1c05e0f +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/installscripts.patch +@@ -0,0 +1 @@ ++../perl5-5.36.0/installscripts.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/liblist.patch b/cnf/diffs/perl5-5.42.0/liblist.patch +new file mode 100644 +index 0000000..5e6331f +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/liblist.patch +@@ -0,0 +1,80 @@ ++When deciding which libraries are available, the original Configure uses ++shaky heuristics to physically locate library files. ++This is a very very bad thing to do, *especially* when cross-compiling, ++as said heiristics are likely to locate the host libraries, not the target ones. ++ ++The only real need for this test is to make sure it's safe to pass -llibrary ++to the compiler. So that's exactly what perl-cross does, pass -llibrary ++and see if it breaks things. ++ ++Note this is a part of MakeMaker, and only applies to module Makefiles. ++ ++ ++--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm +++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm ++@@ -20,9 +20,10 @@ ++ use File::Spec; ++ ++ sub ext { ++- if ( $^O eq 'VMS' ) { goto &_vms_ext; } ++- elsif ( $^O eq 'MSWin32' ) { goto &_win32_ext; } ++- else { goto &_unix_os2_ext; } +++ if ($Config{usemmldlt}){ goto &_ld_ext; } +++ elsif($^O eq 'VMS') { goto &_vms_ext; } +++ elsif($^O eq 'MSWin32') { goto &_win32_ext; } +++ else { goto &_unix_os2_ext; } ++ } ++ ++ sub _unix_os2_ext { ++@@ -661,4 +662,51 @@ ++ wantarray ? ( $lib, '', $ldlib, '', ( $give_libs ? \@flibs : () ) ) : $lib; ++ } ++ +++# A direct test for -l validity. +++# Because guessing real file names for -llib options when dealing +++# with a cross compiler is generally a BAD IDEA^tm. +++sub _ld_ext { +++ my($self,$potential_libs, $verbose, $give_libs) = @_; +++ $verbose ||= 0; +++ +++ if ($^O =~ 'os2' and $Config{perllibs}) { +++ # Dynamic libraries are not transitive, so we may need including +++ # the libraries linked against perl.dll again. +++ +++ $potential_libs .= " " if $potential_libs; +++ $potential_libs .= $Config{perllibs}; +++ } +++ return ("", "", "", "", ($give_libs ? [] : ())) unless $potential_libs; +++ warn "Potential libraries are '$potential_libs':\n" if $verbose; +++ +++ my($ld) = $Config{ld}; +++ my($ldflags) = $Config{ldflags}; +++ my($libs) = defined $Config{perllibs} ? $Config{perllibs} : $Config{libs}; +++ +++ my $try = 'try_mm.c'; +++ my $tryx = 'try_mm.x'; +++ open(TRY, '>', $try) || die "Can't create MakeMaker test file $try: $!\n"; +++ print TRY "int main(void) { return 0; }\n"; +++ close(TRY); +++ +++ my $testlibs = ''; +++ my @testlibs = (); +++ foreach my $thislib (split ' ', $potential_libs) { +++ $testlibs = join(' ', @testlibs); +++ if($thislib =~ /^-L/) { +++ push(@testlibs, $thislib); +++ next +++ }; +++ my $cmd = "$ld $ldflags -o $tryx $try $testlibs $thislib >/dev/null 2>&1"; +++ my $ret = system($cmd); +++ warn "Warning (mostly harmless): " . "No library found for $thislib\n" if $ret; +++ next if $ret; +++ push @testlibs, $thislib; +++ } +++ unlink($try); +++ unlink($tryx); +++ +++ return (join(' ', @testlibs), '', join(' ', @testlibs), ''); +++} +++ ++ 1; +diff --git a/cnf/diffs/perl5-5.42.0/makemaker.patch b/cnf/diffs/perl5-5.42.0/makemaker.patch +new file mode 120000 +index 0000000..d7bd609 +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/makemaker.patch +@@ -0,0 +1 @@ ++../perl5-5.38.0/makemaker.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/posix-makefile.patch b/cnf/diffs/perl5-5.42.0/posix-makefile.patch +new file mode 120000 +index 0000000..29463b7 +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/posix-makefile.patch +@@ -0,0 +1 @@ ++../perl5-5.22.3/posix-makefile.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/test-checkcase.patch b/cnf/diffs/perl5-5.42.0/test-checkcase.patch +new file mode 120000 +index 0000000..36c5186 +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/test-checkcase.patch +@@ -0,0 +1 @@ ++../perl5-5.22.3/test-checkcase.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/test-makemaker.patch b/cnf/diffs/perl5-5.42.0/test-makemaker.patch +new file mode 120000 +index 0000000..4e970ff +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/test-makemaker.patch +@@ -0,0 +1 @@ ++../perl5-5.34.0/test-makemaker.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/xconfig.patch b/cnf/diffs/perl5-5.42.0/xconfig.patch +new file mode 120000 +index 0000000..1c22c96 +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/xconfig.patch +@@ -0,0 +1 @@ ++../perl5-5.41.3/xconfig.patch +\ No newline at end of file From 637727353c8db2a71fa7f52e22426e19feb904fe Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Wed, 9 Jul 2025 00:03:35 +0200 Subject: [PATCH 072/542] perlPackages: Deprecate shortenPerlShebang --- doc/languages-frameworks/perl.section.md | 33 +---- .../setup-hooks/shorten-perl-shebang.sh | 88 +------------ .../perl-modules/generic/builder.sh | 7 +- pkgs/top-level/perl-packages.nix | 118 ++++++++++++++++-- 4 files changed, 117 insertions(+), 129 deletions(-) diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md index 50fc4945ff76..dd95f3740837 100644 --- a/doc/languages-frameworks/perl.section.md +++ b/doc/languages-frameworks/perl.section.md @@ -71,7 +71,7 @@ To install it with `nix-env` instead: `nix-env -f. -iA perlPackages.ClassC3`. So what does `buildPerlPackage` do? It does the following: 1. In the configure phase, it calls `perl Makefile.PL` to generate a Makefile. You can set the variable `makeMakerFlags` to pass flags to `Makefile.PL` -2. It adds the contents of the `PERL5LIB` environment variable to `#! .../bin/perl` line of Perl scripts as `-Idir` flags. This ensures that a script can find its dependencies. (This can cause this shebang line to become too long for Darwin to handle; see the note below.) +2. It adds the contents of the `PERL5LIB` environment variable to a use lib statement at the start of Perl scripts. This ensures that a script can find its dependencies. 3. In the fixup phase, it writes the propagated build inputs (`propagatedBuildInputs`) to the file `$out/nix-support/propagated-user-env-packages`. `nix-env` recursively installs all packages listed in this file when you install a package that has it. This ensures that a Perl package can find its dependencies. `buildPerlPackage` is built on top of `stdenv`, so everything can be customised in the usual way. For instance, the `BerkeleyDB` module has a `preConfigure` hook to generate a configuration file used by `Makefile.PL`: @@ -120,37 +120,6 @@ Dependencies on other Perl packages can be specified in the `buildInputs` and `p } ``` -On Darwin, if a script has too many `-Idir` flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the `shortenPerlShebang` function from the `postInstall` phase: - -```nix -{ - lib, - stdenv, - buildPerlPackage, - fetchurl, - shortenPerlShebang, -}: - -{ - ImageExifTool = buildPerlPackage { - pname = "Image-ExifTool"; - version = "12.50"; - - src = fetchurl { - url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg="; - }; - - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/exiftool - ''; - }; -} -``` - -This will remove the `-I` flags from the shebang line, rewrite them in the `use lib` form, and put them on the next line instead. This function can be given any number of Perl scripts as arguments; it will modify them in-place. - ### Generation from CPAN {#ssec-generation-from-CPAN} Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program `nix-generate-from-cpan`, which can be installed as follows: diff --git a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh index 825da1bde962..e573ba0b13db 100644 --- a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh +++ b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh @@ -1,88 +1,4 @@ -# This setup hook modifies a Perl script so that any "-I" flags in its shebang -# line are rewritten into a "use lib ..." statement on the next line. This gets -# around a limitation in Darwin, which will not properly handle a script whose -# shebang line exceeds 511 characters. -# -# Each occurrence of "-I /path/to/lib1" or "-I/path/to/lib2" is removed from -# the shebang line, along with the single space that preceded it. These library -# paths are placed into a new line of the form -# -# use lib "/path/to/lib1", "/path/to/lib2"; -# -# immediately following the shebang line. If a library appeared in the original -# list more than once, only its first occurrence will appear in the output -# list. In other words, the libraries are deduplicated, but the ordering of the -# first appearance of each one is preserved. -# -# Any flags other than "-I" in the shebang line are left as-is, and the -# interpreter is also left alone (although the script will abort if the -# interpreter does not seem to be either "perl" or else "env" with "perl" as -# its argument). Each line after the shebang line is left unchanged. Each file -# is modified in place. -# -# Usage: -# shortenPerlShebang SCRIPT... - +# Deprecated. Invocation in derivations can be safely removed. shortenPerlShebang() { - while [ $# -gt 0 ]; do - _shortenPerlShebang "$1" - shift - done -} - -_shortenPerlShebang() { - local program="$1" - - echo "shortenPerlShebang: rewriting shebang line in $program" - - if ! isScript "$program"; then - die "shortenPerlShebang: refusing to modify $program because it is not a script" - fi - - local temp="$(mktemp)" - - gawk ' - (NR == 1) { - if (!($0 ~ /\/(perl|env +perl)\>/)) { - print "shortenPerlShebang: script does not seem to be a Perl script" > "/dev/stderr" - exit 1 - } - idx = 0 - while (match($0, / -I ?([^ ]+)/, pieces)) { - matches[idx] = pieces[1] - idx++ - $0 = gensub(/ -I ?[^ ]+/, "", 1, $0) - } - print $0 - if (idx > 0) { - prefix = "use lib " - for (idx in matches) { - path = matches[idx] - if (!(path in seen)) { - printf "%s\"%s\"", prefix, path - seen[path] = 1 - prefix = ", " - } - } - print ";" - } - } - (NR > 1 ) { - print - } - ' "$program" > "$temp" || die - # Preserve the mode of the original file - cp --preserve=mode --attributes-only "$program" "$temp" - mv "$temp" "$program" - - # Measure the new shebang line length and make sure it's okay. We subtract - # one to account for the trailing newline that "head" included in its - # output. - local new_length=$(( $(head -n 1 "$program" | wc -c) - 1 )) - - # Darwin is okay when the shebang line contains 511 characters, but not - # when it contains 512 characters. - if [ $new_length -ge 512 ]; then - die "shortenPerlShebang: shebang line is $new_length characters--still too long for Darwin!" - fi + : } diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 97d0bbcce7ac..afd42c840182 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,9 +1,10 @@ PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" -perlFlags= +perlUseLibs='use lib' for i in $(IFS=:; echo $PERL5LIB); do - perlFlags="$perlFlags -I$i" + perlUseLibs="$perlUseLibs \"$i\"," done +perlUseLibs=$(echo "$perlUseLibs" | sed 's/,$/;/') oldPreConfigure="$preConfigure" preConfigure() { @@ -15,7 +16,7 @@ preConfigure() { first=$(dd if="$fn" count=2 bs=1 2> /dev/null) if test "$first" = "#!"; then echo "patching $fn..." - sed -i "$fn" -e "s|^#\!\(.*\bperl\b.*\)$|#\!\1$perlFlags|" + sed -i "$fn" -e "s|^#\!\(.*\bperl\b.*\)$|#\!\1\n$perlUseLibs|" fi fi done diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8110742ec34d..cd6a5c21508f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2798,6 +2798,10 @@ with self; }; propagatedBuildInputs = [ TaskWeaken ]; buildInputs = [ ExtUtilsDepends ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/utils/40walk.t + ''; meta = { description = "Helper functions for op tree manipulation"; homepage = "https://search.cpan.org/dist/B-Utils"; @@ -4438,6 +4442,11 @@ with self; TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/rt-84767.t + rm t/param_list_context.t + ''; meta = { description = "Handle Common Gateway Interface requests and responses"; homepage = "https://metacpan.org/module/CGI"; @@ -5293,6 +5302,12 @@ with self; url = "mirror://cpan/authors/id/K/KM/KMX/Class-Throwable-0.13.tar.gz"; hash = "sha256-3JoR4Nq1bcIg3qjJT+PEfbXn3Xwe0E3IF4qlu3v7vM4="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/10_Class_Throwable_test.t + rm t/20_Class_Throwable_subException_test.t + rm t/35_Class_Throwable_sub_class_test.t + ''; meta = { description = "Minimal lightweight exception class"; license = with lib.licenses; [ @@ -10215,6 +10230,10 @@ with self; SafeIsa TextBrew ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/ResultSet/Errors.t + ''; meta = { description = "Simplify the common case stuff for DBIx::Class"; homepage = "https://github.com/frioux/DBIx-Class-Helpers"; @@ -14402,6 +14421,10 @@ with self; DirSelf TestFatal ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/eating_strict_error.t + ''; meta = { description = "Define functions and methods with parameter lists (\"subroutine signatures\")"; license = with lib.licenses; [ @@ -22027,6 +22050,10 @@ with self; TestDeep TestNoWarnings ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/20_parse_self.t + ''; meta = { description = "Find out what modules are used"; license = with lib.licenses; [ @@ -27792,6 +27819,11 @@ with self; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/perlcritic ''; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/20_policy_require_tidy_code.t + rm t/03_pragmas.t + ''; meta = { description = "Critique Perl source code for best-practices"; homepage = "http://perlcritic.com"; @@ -28510,6 +28542,10 @@ with self; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/pls ''; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/02document-new.t + ''; meta = { description = "Perl Language Server"; homepage = "https://github.com/FractalBoy/perl-language-server"; @@ -28630,10 +28666,12 @@ with self; TaskWeaken ]; - # Remove test that fails due to unexpected shebang after - # patchShebang. - preCheck = "rm t/03_document.t"; - + preCheck = " + # Remove test that fails due to unexpected shebang after patchShebang. + rm t/03_document.t + # Remove tests with hardcoded line numbers. + rm t/29_logical_filename.t + "; meta = { description = "Parse, Analyze and Manipulate Perl (without perl)"; homepage = "https://github.com/Perl-Critic/PPI"; @@ -29209,6 +29247,10 @@ with self; url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.75.tar.gz"; hash = "sha256-82O1dOxmCvbtvT5dTJ/8UVodRsvxx8ytmkbO0oh5wiE="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/pod/podchkenc.t + ''; meta = { description = "Verifies POD documentation contents for compliance with the POD format specifications"; license = with lib.licenses; [ @@ -29319,6 +29361,10 @@ with self; }; propagatedBuildInputs = [ MixinLinewise ]; buildInputs = [ TestDeep ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/non-pod.t + ''; meta = { description = "Read a POD document as a series of trivial events"; homepage = "https://github.com/rjbs/Pod-Eventual"; @@ -30198,6 +30244,10 @@ with self; AnyEvent DataSExpression ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/06.query.t + ''; meta = { description = "Asynchronous Remote Procedure Stack"; license = with lib.licenses; [ @@ -32052,6 +32102,11 @@ with self; url = "mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz"; hash = "sha256-Bo0nIIZRTdHoQrakCxvtuv7mOQDlsIiQ72cAA53vrW8="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/04codelocation-pureperl.t + rm t/04codelocation.t + ''; meta = { description = "Retrieve names of code references"; license = with lib.licenses; [ @@ -32306,6 +32361,10 @@ with self; url = "mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz"; hash = "sha256-VbZh3SL5zpub5afgo/UomsAM0lTCHj2GAyiaVlrm3DI="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/10use.t + ''; meta = { description = "Additional utils for Perl symbols manipulation"; license = with lib.licenses; [ @@ -33526,6 +33585,10 @@ with self; hash = "sha256-/NzkHVcnOIFYGt9oCiCmrfUaTDt+McP2mGb7kQk3AoA="; }; propagatedBuildInputs = [ LogTrace ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/Test-Assertions.t + ''; meta = { description = "Simple set of building blocks for both unit and runtime testing"; license = with lib.licenses; [ gpl2Only ]; @@ -33621,6 +33684,14 @@ with self; ModuleRuntime TryTiny ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/runtests_die.t + rm t/runtests_die_empty.t + rm t/runtests_die_nearlyempty.t + rm t/runtests_result.t + rm t/todo.t + ''; meta = { description = "Easily create test classes in an xUnit/JUnit style"; license = with lib.licenses; [ @@ -33946,6 +34017,10 @@ with self; hash = "sha256-FWsT8Hdk92bYtFpDco8kOa+Bo1EmJUON6reDt4g+tTM="; }; propagatedBuildInputs = [ SubUplevel ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/return.t + ''; meta = { description = "Test exception-based code"; license = with lib.licenses; [ @@ -34327,6 +34402,11 @@ with self; url = "mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.17.tar.gz"; hash = "sha256-d31k0pOPXqWGMA7vl+8D6stD1MGFPJw7EJHrMxFGeXA="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/09_info_more.t + rm t/11_logfp.t + ''; meta = { description = "Traces memory leaks"; homepage = "https://metacpan.org/release/Test-LeakTrace"; @@ -34608,6 +34688,10 @@ with self; url = "mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-1.3.tar.gz"; hash = "sha256-j/51/5tpNSSIcn3Kc9uR+KoUtZ8voQTrdxfA1xpfGzM="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/02-bad-source.t + ''; meta = { description = "Check your source for encoding misbehavior"; homepage = "https://github.com/creaktive/Test-Mojibake"; @@ -34820,6 +34904,13 @@ with self; TextDiff ]; buildInputs = [ TestPerlCritic ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/perltidy.t + rm t/list_files.t + rm t/exclude_files.t + rm t/exclude_perltidy.t + ''; meta = { description = "Check that all your files are tidy"; homepage = "https://metacpan.org/release/Test-PerlTidy"; @@ -35217,13 +35308,15 @@ with self; url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.29.tar.gz"; hash = "sha256-iS5+bB6nsWcQkJlCz1wL2rcO7i79SqnBbqlS4rkPiVA="; }; - buildInputs = [ Test2Suite ]; - propagatedBuildInputs = [ CaptureTiny ProbePerl ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/test_script__script_compiles.t + ''; meta = { description = "Basic cross-platform tests for scripts"; license = with lib.licenses; [ @@ -35488,6 +35581,9 @@ with self; hash = "sha256-mMoy5/L16om4v7mgYJl389FT4kLi5RcFEmy5VPGga1c="; }; propagatedBuildInputs = [ SubUplevel ]; + # Tests fail because they hardcode line numbers which have been shifted due to the inclusion of + # libraries. + doCheck = false; meta = { description = "Perl extension to test methods for warnings"; license = with lib.licenses; [ @@ -35651,6 +35747,10 @@ with self; hash = "sha256-36phHnFGrZyXabW89oiUmXa4Ny3354ekC5M6FI2JIDk="; }; propagatedBuildInputs = [ XMLLibXML ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/simple.t + ''; meta = { description = "Test XML and HTML content and structure with XPath expressions"; license = with lib.licenses; [ @@ -36496,9 +36596,11 @@ with self; url = "mirror://cpan/authors/id/G/GF/GFUJI/Test-Vars-0.015.tar.gz"; hash = "sha256-4Y3RWCcuTsmTnh37M8dDGrTnXGtAsoDDi16AT9pHGlQ="; }; - buildInputs = [ ModuleBuildTiny ]; - + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/03_warned.t + ''; meta = { description = "Detects unused variables in perl modules"; homepage = "https://github.com/houseabsolute/p5-Test-Vars"; From 2e2fd3106581c1688b0625a565b46693b705df0c Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Fri, 12 Sep 2025 00:38:40 +0200 Subject: [PATCH 073/542] various: Stop using shortenPerlShebang --- pkgs/by-name/bi/biber-ms/package.nix | 5 - pkgs/by-name/bi/biber/package.nix | 6 -- pkgs/by-name/co/convos/package.nix | 9 +- pkgs/by-name/fe/feedgnuplot/package.nix | 22 ++--- pkgs/by-name/ge/get_iplayer/package.nix | 7 +- .../by-name/oc/ocsinventory-agent/package.nix | 6 +- pkgs/by-name/pg/pgformatter/package.nix | 7 -- pkgs/by-name/pg/pgtop/package.nix | 7 -- pkgs/by-name/sh/shelldap/package.nix | 7 -- pkgs/by-name/wa/wakeonlan/package.nix | 8 +- .../perl-modules/ImageExifTool/default.nix | 14 +-- .../perl-modules/Percona-Toolkit/default.nix | 6 -- .../WWW-YoutubeViewer/default.nix | 5 - .../strip-nondeterminism/default.nix | 7 -- .../development/tools/misc/sqitch/default.nix | 6 +- pkgs/tools/misc/pgbadger/default.nix | 11 --- pkgs/tools/typesetting/tex/texlive/bin.nix | 1 - pkgs/top-level/perl-packages.nix | 94 +------------------ 18 files changed, 15 insertions(+), 213 deletions(-) diff --git a/pkgs/by-name/bi/biber-ms/package.nix b/pkgs/by-name/bi/biber-ms/package.nix index 0ab78240ec49..1789c38419ef 100644 --- a/pkgs/by-name/bi/biber-ms/package.nix +++ b/pkgs/by-name/bi/biber-ms/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, perlPackages, - shortenPerlShebang, texlive, }: @@ -78,7 +77,6 @@ perlPackages.buildPerlModule { XMLWriter autovivification ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; preConfigure = '' cp '${multiscriptBltxml}' t/tdata/multiscript.bltxml @@ -86,9 +84,6 @@ perlPackages.buildPerlModule { postInstall = '' mv "$out"/bin/biber{,-ms} - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang "$out"/bin/biber-ms ''; meta = with lib; { diff --git a/pkgs/by-name/bi/biber/package.nix b/pkgs/by-name/bi/biber/package.nix index ccc47ea66539..8f4ea872e8cd 100644 --- a/pkgs/by-name/bi/biber/package.nix +++ b/pkgs/by-name/bi/biber/package.nix @@ -3,7 +3,6 @@ stdenv, fetchpatch, perlPackages, - shortenPerlShebang, texlive, }: @@ -69,11 +68,6 @@ perlPackages.buildPerlModule { TestDifferences PerlIOutf8_strict ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/biber - ''; meta = with lib; { description = "Backend for BibLaTeX"; diff --git a/pkgs/by-name/co/convos/package.nix b/pkgs/by-name/co/convos/package.nix index aa65ed66b656..74c3b41cfbeb 100644 --- a/pkgs/by-name/co/convos/package.nix +++ b/pkgs/by-name/co/convos/package.nix @@ -5,7 +5,6 @@ perl, perlPackages, makeWrapper, - shortenPerlShebang, openssl, nixosTests, }: @@ -21,10 +20,7 @@ perlPackages.buildPerlPackage rec { sha256 = "sha256-dBvXo8y4OMKcb0imgnnzoklnPN3YePHDvy5rIBOkTfs="; }; - nativeBuildInputs = [ - makeWrapper - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; [ CryptPassphrase @@ -108,9 +104,6 @@ perlPackages.buildPerlPackage rec { cp -vR templates $out/templates cp Makefile.PL $out/Makefile.PL '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/convos - '' + '' wrapProgram $out/bin/convos --set MOJO_HOME $out ''; diff --git a/pkgs/by-name/fe/feedgnuplot/package.nix b/pkgs/by-name/fe/feedgnuplot/package.nix index 9b1f5e7380e3..c472eec8205d 100644 --- a/pkgs/by-name/fe/feedgnuplot/package.nix +++ b/pkgs/by-name/fe/feedgnuplot/package.nix @@ -8,7 +8,6 @@ perl, perlPackages, stdenv, - shortenPerlShebang, installShellFiles, }: @@ -34,8 +33,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper installShellFiles - ] - ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + ]; buildInputs = [ gnuplot @@ -57,18 +55,14 @@ perlPackages.buildPerlPackage rec { # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5. doCheck = false; - postInstall = - lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/feedgnuplot - '' - + '' - wrapProgram $out/bin/feedgnuplot \ - --prefix "PATH" ":" "$PATH" \ - --prefix "PERL5LIB" ":" "$PERL5LIB" + postInstall = '' + wrapProgram $out/bin/feedgnuplot \ + --prefix "PATH" ":" "$PATH" \ + --prefix "PERL5LIB" ":" "$PERL5LIB" - installShellCompletion --bash --name feedgnuplot.bash completions/bash/feedgnuplot - installShellCompletion --zsh completions/zsh/_feedgnuplot - ''; + installShellCompletion --bash --name feedgnuplot.bash completions/bash/feedgnuplot + installShellCompletion --zsh completions/zsh/_feedgnuplot + ''; meta = with lib; { description = "General purpose pipe-oriented plotting tool"; diff --git a/pkgs/by-name/ge/get_iplayer/package.nix b/pkgs/by-name/ge/get_iplayer/package.nix index 811f18801919..63f45dcb606e 100644 --- a/pkgs/by-name/ge/get_iplayer/package.nix +++ b/pkgs/by-name/ge/get_iplayer/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, makeWrapper, stdenv, - shortenPerlShebang, perl, atomicparsley, ffmpeg, @@ -23,7 +22,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-O/mVtbudrYw0jKeSckZlgonFDiWxfeiVc8gdcy4iNBw="; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; propagatedBuildInputs = with perlPackages; [ LWP @@ -54,10 +53,6 @@ perlPackages.buildPerlPackage rec { runHook postInstall ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/.get_iplayer-wrapped - ''; - passthru.tests.version = testers.testVersion { package = get_iplayer; command = "HOME=$(mktemp -d) get_iplayer --help"; diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix index 1a3ef373e127..f9c5bc2f1144 100644 --- a/pkgs/by-name/oc/ocsinventory-agent/package.nix +++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, fetchpatch, makeWrapper, - shortenPerlShebang, coreutils, dmidecode, findutils, @@ -43,7 +42,7 @@ perlPackages.buildPerlPackage rec { }) ]; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; @@ -94,10 +93,7 @@ perlPackages.buildPerlPackage rec { util-linux # last, lsblk, mount ]; in - lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/ocsinventory-agent '' - + '' wrapProgram $out/bin/ocsinventory-agent --prefix PATH : ${lib.makeBinPath runtimeDependencies} ''; diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 05a491f51baa..0721b37acb20 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, perlPackages, fetchFromGitHub, - shortenPerlShebang, }: perlPackages.buildPerlPackage rec { @@ -33,11 +31,6 @@ perlPackages.buildPerlPackage rec { --replace "'INSTALLDIRS' => \$INSTALLDIRS," "'INSTALLDIRS' => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3'," ''; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/pg_format - ''; - doCheck = false; meta = { diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix index f34ae6c2e4f4..fdb3153caf5f 100644 --- a/pkgs/by-name/pg/pgtop/package.nix +++ b/pkgs/by-name/pg/pgtop/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, perlPackages, fetchFromGitHub, - shortenPerlShebang, }: perlPackages.buildPerlPackage rec { @@ -27,11 +25,6 @@ perlPackages.buildPerlPackage rec { LWP ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/pgtop - ''; - meta = { description = "PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL"; mainProgram = "pgtop"; diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix index 3144a7fdce05..4b222ed0e8b7 100644 --- a/pkgs/by-name/sh/shelldap/package.nix +++ b/pkgs/by-name/sh/shelldap/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, perlPackages, - shortenPerlShebang, }: perlPackages.buildPerlPackage rec { @@ -29,8 +28,6 @@ perlPackages.buildPerlPackage rec { YAMLSyck ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - prePatch = '' touch Makefile.PL ''; @@ -41,10 +38,6 @@ perlPackages.buildPerlPackage rec { runHook postInstall ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/shelldap - ''; - # no make target 'test', not tests provided by source doCheck = false; diff --git a/pkgs/by-name/wa/wakeonlan/package.nix b/pkgs/by-name/wa/wakeonlan/package.nix index 4bc1b65674fd..2e36ef4d2275 100644 --- a/pkgs/by-name/wa/wakeonlan/package.nix +++ b/pkgs/by-name/wa/wakeonlan/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, perlPackages, fetchFromGitHub, installShellFiles, - shortenPerlShebang, }: perlPackages.buildPerlPackage rec { @@ -22,8 +20,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ installShellFiles - ] - ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + ]; nativeCheckInputs = [ perlPackages.TestPerlCritic @@ -38,9 +35,6 @@ perlPackages.buildPerlPackage rec { installPhase = '' install -Dt $out/bin wakeonlan installManPage blib/man1/wakeonlan.1 - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/wakeonlan ''; meta = with lib; { diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix index b264606cd05a..5659a58e9a65 100644 --- a/pkgs/development/perl-modules/ImageExifTool/default.nix +++ b/pkgs/development/perl-modules/ImageExifTool/default.nix @@ -3,9 +3,7 @@ fetchFromGitHub, gitUpdater, lib, - shortenPerlShebang, - stdenv, - versionCheckHook, + testers, }: buildPerlPackage rec { @@ -19,20 +17,10 @@ buildPerlPackage rec { hash = "sha256-GPm3HOt7fNMbXRrV5V+ykJAfhww1O6NrD0l/7hA2i28="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postPatch = '' patchShebangs exiftool ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/exiftool - ''; - - doInstallCheck = true; - nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "-ver"; - passthru = { updateScript = gitUpdater { }; }; diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index d27972dff455..f155a9542d47 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPerlPackage, - shortenPerlShebang, DBDmysql, DBI, IOSocketSSL, @@ -42,7 +41,6 @@ buildPerlPackage { nativeBuildInputs = [ git - shortenPerlShebang ]; buildInputs = [ @@ -64,10 +62,6 @@ buildPerlPackage { export HOME=$TMPDIR ''; - postInstall = '' - shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*) - ''; - meta = { description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks"; homepage = "https://www.percona.com/software/database-tools/percona-toolkit"; diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index 0669f5b7c7af..495b9f66e972 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, buildPerlPackage, - shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, @@ -22,16 +21,12 @@ buildPerlPackage rec { sha256 = "9Z4fv2B0AnwtYsp7h9phnRMmHtBOMObIJvK8DmKQRxs="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP LWPProtocolHttps DataDump JSON ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/youtube-viewer - ''; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index 3d16d4cb245a..8a768ff7e444 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -7,7 +7,6 @@ ArchiveZip, ArchiveCpio, SubOverride, - shortenPerlShebang, gitUpdater, }: @@ -29,7 +28,6 @@ buildPerlPackage rec { }; strictDeps = true; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; buildInputs = [ ArchiveZip ArchiveCpio @@ -49,9 +47,6 @@ buildPerlPackage rec { # we don’t need the debhelper script rm $out/bin/dh_strip_nondeterminism rm $out/share/man/man1/dh_strip_nondeterminism.1 - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/strip-nondeterminism ''; installCheckPhase = '' @@ -60,8 +55,6 @@ buildPerlPackage rec { runHook postInstallCheck ''; - # running shortenPerlShebang in postBuild results in non-functioning binary 'exec format error' - doCheck = !stdenv.hostPlatform.isDarwin; doInstallCheck = true; passthru = { diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index bbd7bef633ef..5e60898c76dc 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -3,7 +3,6 @@ lib, perlPackages, makeWrapper, - shortenPerlShebang, mysqlSupport ? false, postgresqlSupport ? false, sqliteSupport ? false, @@ -25,7 +24,7 @@ stdenv.mkDerivation { pname = "sqitch"; version = sqitch.version; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ]; src = sqitch; dontBuild = true; @@ -39,9 +38,6 @@ stdenv.mkDerivation { ln -s ${sqitch}/$d $out/$d fi done - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/sqitch ''; dontStrip = true; postFixup = '' diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix index 3d8d76c2b886..8eab77a847cb 100644 --- a/pkgs/tools/misc/pgbadger/default.nix +++ b/pkgs/tools/misc/pgbadger/default.nix @@ -7,8 +7,6 @@ nix-update-script, pgbadger, PodMarkdown, - shortenPerlShebang, - stdenv, testers, TextCSV_XS, which, @@ -29,13 +27,6 @@ buildPerlPackage rec { patchShebangs ./pgbadger ''; - # pgbadger has too many `-Idir` flags on its shebang line on Darwin, - # causing the build to fail when trying to generate the documentation. - # Rewrite the -I flags in `use lib` form. - preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang ./pgbadger - ''; - outputs = [ "out" ]; PERL_MM_OPT = "INSTALL_BASE=${placeholder "out"}"; @@ -46,8 +37,6 @@ buildPerlPackage rec { TextCSV_XS ]; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; - nativeCheckInputs = [ bzip2 which diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index f7d4a1b408a9..5f15b950012e 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -43,7 +43,6 @@ woff2, xxHash, makeWrapper, - shortenPerlShebang, useFixedHashes, asymptote, biber-ms, diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cd6a5c21508f..c0b5d53d0994 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20,7 +20,6 @@ fetchFromGitHub, fetchFromGitLab, perl, - shortenPerlShebang, nixosTests, }: @@ -126,11 +125,7 @@ with self; "man" ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileNext ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/ack - ''; # tests fails on nixos and hydra because of different purity issues doCheck = false; @@ -1217,10 +1212,6 @@ with self; --replace-fail http://cpanmetadb.plackperl.org https://cpanmetadb.plackperl.org ''; propagatedBuildInputs = [ IOSocketSSL ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/cpanm - ''; meta = { description = "Get, unpack, build and install modules from CPAN"; homepage = "https://github.com/miyagawa/cpanminus"; @@ -1258,10 +1249,6 @@ with self; ParallelPipes locallib ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/cpm - ''; meta = { description = "Fast CPAN module installer"; homepage = "https://github.com/skaji/cpm"; @@ -1309,7 +1296,6 @@ with self; TextLayout ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ Wx ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; # Delete tests that fail when version env var is set, see # https://github.com/ChordPro/chordpro/issues/293 @@ -1318,7 +1304,6 @@ with self; ''; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/chordpro rm $out/bin/wxchordpro # Wx not supported on darwin ''; meta = { @@ -6646,14 +6631,10 @@ with self; url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111017.tar.gz"; hash = "sha256-8gQpO+JqyEGsyHBEoYjbD1kegIgTFseiiK7A7s4wYVU="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileHomeDir LWPProtocolHttps ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/minicpan - ''; meta = { description = "Create a minimal mirror of CPAN"; @@ -7119,7 +7100,6 @@ with self; url = "mirror://cpan/authors/id/B/BA/BARTB/Crypt-HSXKPasswd-v3.6.tar.gz"; hash = "sha256-lZ3MX58BG/ALha0i31ZrerK/XqHTYrDeD7WuKfvEWLM="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ Clone DateTime @@ -7134,9 +7114,6 @@ with self; TextUnidecode TypeTiny ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/hsxkpasswd - ''; meta = { description = "Secure memorable password generator"; @@ -7588,10 +7565,6 @@ with self; LWP ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/pgplet - ''; doCheck = false; # test fails with 'No random source available!' meta = { @@ -10619,10 +10592,6 @@ with self; CaptureTiny TestDifferences ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/* - ''; meta = { description = "Powerful fast feature-rich Perl source code profiler"; homepage = "https://code.google.com/p/perl-devel-nytprof"; @@ -11046,10 +11015,6 @@ with self; TermUI YAMLTiny ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/dzil - ''; doCheck = false; meta = { description = "Distribution builder; installer not included"; @@ -11907,13 +11872,9 @@ with self; Throwable TryTiny ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; postPatch = '' patchShebangs --build util ''; - preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang util/sendmail - ''; meta = { description = "Library for sending email"; homepage = "https://github.com/rjbs/Email-Sender"; @@ -14823,10 +14784,6 @@ with self; url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.004007.tar.gz"; hash = "sha256-2pe/dnKAlbO27nHaGfC/GUMBsvRd9HietU23Tt0hCjs="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/git-autofixup - ''; meta = { description = "Create fixup commits for topic branches"; license = with lib.licenses; [ artistic2 ]; @@ -15605,16 +15562,12 @@ with self; TermSk namespaceclean ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; patches = [ ../development/perl-modules/Hailo-fix-test-gld.patch ]; postPatch = '' patchShebangs bin ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/hailo - ''; meta = { description = "Pluggable Markov engine analogous to MegaHAL"; homepage = "https://github.com/hailo/hailo"; @@ -17329,10 +17282,6 @@ with self; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/treescan - ''; meta = { description = "Asynchronous/Advanced Input/Output"; license = with lib.licenses; [ @@ -18473,8 +18422,7 @@ with self; ]; nativeBuildInputs = [ pkgs.makeWrapper - ] - ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + ]; makeMakerFlags = [ "TEXMF=\${tex}" "NOMKTEXLSR" @@ -18482,11 +18430,6 @@ with self; # shebangs need to be patched before executables are copied to $out preBuild = '' patchShebangs bin/ - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - for file in bin/*; do - shortenPerlShebang "$file" - done ''; postInstall = '' for file in latexmlc latexmlmath latexmlpost ; do @@ -27798,7 +27741,6 @@ with self; hash = "sha256-5c2V3j5DvOcHdRdidLqkBfMm/IdA3wBUu4FpdcyNNJs="; }; buildInputs = [ TestDeep ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ BKeywords ConfigTiny @@ -27816,9 +27758,6 @@ with self; Readonly StringFormat ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/perlcritic - ''; preCheck = '' # Remove tests with hardcoded line numbers. rm t/20_policy_require_tidy_code.t @@ -28538,10 +28477,6 @@ with self; PodMarkdown URI ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/pls - ''; preCheck = '' # Remove tests with hardcoded line numbers. rm t/02document-new.t @@ -29793,10 +29728,6 @@ with self; url = "mirror://cpan/authors/id/S/SY/SYP/App-rainbarf-1.4.tar.gz"; hash = "sha256-TxOa01+q8t4GI9wLsd2J+lpDHlSL/sh97hlM8OJcyX0="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/rainbarf - ''; meta = { description = "CPU/RAM/battery stats chart bar for tmux (and GNU screen)"; homepage = "https://github.com/creaktive/rainbarf"; @@ -31271,13 +31202,6 @@ with self; patchShebangs script ''; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - for file in $out/bin/*; do - shortenPerlShebang $file - done - ''; - meta = { description = "SQL DDL transformations and more"; license = with lib.licenses; [ @@ -31365,7 +31289,6 @@ with self; TestRequires TestTCP ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ DataDump HTTPParserXS @@ -31374,9 +31297,6 @@ with self; NetServerSSPrefork IOSocketINET6 ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/starman - ''; doCheck = false; # binds to various TCP ports meta = { @@ -36221,15 +36141,11 @@ with self; url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz"; hash = "sha256-wZHG1ezrjLdcBWUZI2BmLSAtcWutB6IzxLMppChNxxs="; }; - nativeBuildInputs = [ shortenPerlShebang ]; nativeCheckInputs = [ ListMoreUtils TestDifferences TestException ]; - postInstall = '' - shortenPerlShebang $out/bin/Markdown.pl - ''; meta = { description = "Convert Markdown syntax to (X)HTML"; license = with lib.licenses; [ bsd3 ]; @@ -38543,11 +38459,7 @@ with self; url = "mirror://cpan/authors/id/S/SI/SIXTEASE/XML-Entities-1.0002.tar.gz"; hash = "sha256-wyqk8wlXPXZIqy5Bb2K2sgZS8q2c/T7sgv1REB/nMQ0="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/download-entities.pl - ''; meta = { description = "Mapping of XML entities to Unicode"; license = with lib.licenses; [ @@ -38633,14 +38545,10 @@ with self; url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Filter-Sort-1.01.tar.gz"; hash = "sha256-UQWF85pJFszV+o1UXpYXnJHq9vx8l6QBp1aOhBFi+l8="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ XMLSAX XMLSAXWriter ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/xmlsort - ''; meta = { description = "SAX filter for sorting elements in XML"; license = with lib.licenses; [ From b5fa38a5e5e7c7b3f4b0ef71141b890391710e4e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 9 Sep 2025 19:23:34 +0200 Subject: [PATCH 074/542] perl: unconditionally set _GNU_SOURCE Perl uses GNU extensions if they are available. Its build system tries to detect whether the libc is one that recognizes _GNU_SOURCE with bad heuristics, that don't work for e.g. riscv64 musl. Upstream is not willing to unconditionally set _GNU_SOURCE like programs usually do, because of an IMO misguided fear of somebody one day writing a libc that interprets _GNU_SOURCE to mean something different, so the only thing we can really do is set it ourselves. On libcs that don't gate GNU extensions behind _GNU_SOURCE, like BSDs, this should be a no-op. This should also improve things for cross where musl builds are currently broken due to perl-cross setting _GNU_SOURCE for the configure step but not the build step, although I haven't tested that. Link: https://github.com/Perl/perl5/issues/16807#issuecomment-544099623 Link: https://github.com/arsv/perl-cross/issues/158 --- pkgs/development/interpreters/perl/interpreter.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index be75635d7e98..0de0d9c6cdb7 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -147,6 +147,7 @@ stdenv.mkDerivation ( "-Dinstallstyle=lib/perl5" "-Dlocincpth=${libcInc}/include" "-Dloclibpth=${libcLib}/lib" + "-Accflags=-D_GNU_SOURCE" ] ++ lib.optional stdenv.hostPlatform.isStatic "-Uusedl" ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ From 3ea2a8ad1d8103a862654d90c3fcc1b507bd46a1 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Fri, 12 Sep 2025 11:15:34 +0200 Subject: [PATCH 075/542] perlPackages.ObjectPad: 0.809 -> 0.821 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c0b5d53d0994..6db970c83bf3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -26545,10 +26545,10 @@ with self; ObjectPad = buildPerlModule { pname = "Object-Pad"; - version = "0.809"; + version = "0.821"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.809.tar.gz"; - hash = "sha256-EpUKZkwGB+o/ynSA82XfVNF0YpH0XrsO2AkXt0+xXvU="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.821.tar.gz"; + hash = "sha256-tdUF+PoWLg5r4q5YsPM0SUxPeRs6BA8va4kBTwSEUgw="; }; buildInputs = [ Test2Suite From 34256a9b6aa61d74709a9d243eb183f470d9ede8 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Fri, 12 Sep 2025 13:39:41 +0200 Subject: [PATCH 076/542] perlPackages.{BSON,BSONXS,MongoDB}: drop EOL since 2020 and breaks with 5.42 --- pkgs/top-level/perl-packages.nix | 105 ++----------------------------- 1 file changed, 5 insertions(+), 100 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6db970c83bf3..1c213e694555 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2717,63 +2717,6 @@ with self; }; }; - BSON = buildPerlPackage { - pname = "BSON"; - version = "1.12.2"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-v1.12.2.tar.gz"; - hash = "sha256-9GEsDDVDEHQbmattJkUSJoIxUMonEJsbORIy1c/dpts="; - }; - buildInputs = [ - JSONMaybeXS - PathTiny - TestDeep - TestFatal - ]; - propagatedBuildInputs = [ - CryptURandom - Moo - TieIxHash - boolean - namespaceclean - ]; - meta = { - description = "BSON serialization and deserialization (EOL)"; - homepage = "https://github.com/mongodb-labs/mongo-perl-bson"; - license = with lib.licenses; [ asl20 ]; - }; - }; - - BSONXS = buildPerlPackage { - pname = "BSON-XS"; - version = "0.8.4"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-XS-v0.8.4.tar.gz"; - hash = "sha256-KPfTOP14tvnJpggL6d4/XLI9iIuW6/b8v6zp8pZq6/k="; - }; - buildInputs = [ - ConfigAutoConf - JSONMaybeXS - PathTiny - TestDeep - TestFatal - TieIxHash - ]; - propagatedBuildInputs = [ - BSON - boolean - JSONXS - JSONPP - CpanelJSONXS - ]; - meta = { - description = "XS implementation of MongoDB's BSON serialization (EOL)"; - homepage = "https://github.com/mongodb-labs/mongo-perl-bson-xs"; - license = with lib.licenses; [ asl20 ]; - platforms = lib.platforms.linux; # configure phase fails with "ld: unknown option: -mmacosx-version-min=10.12" - }; - }; - BUtils = buildPerlPackage { pname = "B-Utils"; version = "0.27"; @@ -22924,47 +22867,6 @@ with self; }; }; - MongoDB = buildPerlPackage { - pname = "MongoDB"; - version = "2.2.2"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MO/MONGODB/MongoDB-v2.2.2.tar.gz"; - hash = "sha256-IBk1+S2slPOcNd5zZh6LJSQ55JbyKGV9uF/5MlfDJo8="; - }; - buildInputs = [ - JSONMaybeXS - PathTiny - TestDeep - TestFatal - TimeMoment - ]; - propagatedBuildInputs = [ - AuthenSASLSASLprep - AuthenSCRAM - BSON - IOSocketSSL - NetSSLeay - ClassXSAccessor - BSONXS - TypeTinyXS - MozillaCA - Moo - NetDNS - SafeIsa - SubQuote - TieIxHash - TypeTiny - UUIDURandom - boolean - namespaceclean - ]; - meta = { - description = "Official MongoDB Driver for Perl (EOL)"; - homepage = "https://github.com/mongodb-labs/mongo-perl-driver"; - license = with lib.licenses; [ asl20 ]; - }; - }; - MonitoringPlugin = buildPerlPackage { pname = "Monitoring-Plugin"; version = "0.40"; @@ -39576,7 +39478,10 @@ with self; SubExporterUtil = self.SubExporter; version = self.Version; - Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15 - pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07 + BSON = throw "BSON has been removed"; # 2025-09-12 + BSONXS = throw "BSONXS has been removed"; # 2025-09-12 GnuPG = throw "'GnuPG' has been removed"; # 2025-01-11 + Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15 + MongoDB = throw "MongoDB has been removed"; # 2025-09-12 + pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07 } From 98a0968fb419623dc12d51c93054246201407738 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 28 Sep 2025 14:39:10 +0200 Subject: [PATCH 077/542] perlPackages.DevelSize: 0.84 -> 0.85 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1c213e694555..b9dbc1e05dc5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10624,10 +10624,10 @@ with self; DevelSize = buildPerlPackage { pname = "Devel-Size"; - version = "0.84"; + version = "0.85"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.84.tar.gz"; - hash = "sha256-2y5NZfaI2/WSc7XoIQGsPxpm9mWvsFlNzhaLhlCk0OQ="; + url = "mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.85.tar.gz"; + hash = "sha256-KS+YsT7dGqSlROOlzx2fLXAZ91xzZNLo+oo16lRR5z4="; }; meta = { description = "Perl extension for finding the memory usage of Perl variables"; From 4ce528e3a9924f94b5e00b33e7357da93e0efb1d Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Tue, 14 Oct 2025 17:51:26 +0300 Subject: [PATCH 078/542] perl: Workaround Scalar::Util missing for miniperl Signed-off-by: Alexander V. Nikolaev --- .../development/interpreters/perl/cross.patch | 73 +++++++++---------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/pkgs/development/interpreters/perl/cross.patch b/pkgs/development/interpreters/perl/cross.patch index 0736c16d4f45..c8379a3985d3 100644 --- a/pkgs/development/interpreters/perl/cross.patch +++ b/pkgs/development/interpreters/perl/cross.patch @@ -27,7 +27,7 @@ index 746abd63bc..c55d7cd2d0 100644 @@ -650,27 +651,29 @@ sub _dump_string { join '', map { "$_\n" } @lines; } - + -sub _has_internal_string_value { +# taken from cpan/JSON-PP/lib/JSON/PP.pm +sub _looks_like_number { @@ -46,7 +46,7 @@ index 746abd63bc..c55d7cd2d0 100644 + return 1 if $value * 0 == 0; + return -1; # inf/nan } - + sub _dump_scalar { my $string = $_[1]; my $is_key = $_[2]; @@ -69,8 +69,8 @@ index 746abd63bc..c55d7cd2d0 100644 $string =~ s/\\/\\\\/g; @@ -800,9 +803,6 @@ sub errstr { # Helper functions. Possibly not needed. - - + + -# Use to detect nv or iv -use B; - @@ -80,7 +80,7 @@ index 746abd63bc..c55d7cd2d0 100644 @@ -822,35 +822,8 @@ sub _can_flock { } } - + - -# XXX-INGY Is this core in 5.8.1? Can we remove this? -# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this @@ -112,7 +112,7 @@ index 746abd63bc..c55d7cd2d0 100644 - } + *refaddr = *builtin::refaddr; } - + delete $CPAN::Meta::YAML::{refaddr}; diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm index 3604eae402..991f69d275 100644 @@ -122,16 +122,16 @@ index 3604eae402..991f69d275 100644 use strict; use warnings; +no warnings 'experimental::builtin'; - + package CPAN::Meta::Merge; - + our $VERSION = '2.150010'; - + use Carp qw/croak/; -use Scalar::Util qw/blessed/; +use builtin qw/blessed/; use CPAN::Meta::Converter 2.141170; - + sub _is_identical { diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm index d4e93fd8a5..809da68d02 100644 @@ -143,40 +143,27 @@ index d4e93fd8a5..809da68d02 100644 use warnings; +no warnings 'experimental::builtin'; package CPAN::Meta::Prereqs; - + our $VERSION = '2.150010'; -@@ -14,7 +15,6 @@ our $VERSION = '2.150010'; +@@ -14,7 +14,7 @@ our $VERSION = '2.150010'; #pod =cut - + use Carp qw(confess); -use Scalar::Util qw(blessed); ++use builtin qw(blessed); use CPAN::Meta::Requirements 2.121; - + #pod =method new -@@ -168,7 +168,12 @@ sub types_in { - sub with_merged_prereqs { - my ($self, $other) = @_; - -- my @other = blessed($other) ? $other : @$other; -+ eval 'require Scalar::Util'; -+ my @other = unless($@){ -+ Scalar::Util::blessed($other) ? $other : @$other; -+ }else{ -+ builtin::blessed($other) ? $other : @$other; -+ } - - my @prereq_objs = ($self, @other); - diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm index fc8fcbc8f0..cda7b90c65 100644 --- a/cpan/JSON-PP/lib/JSON/PP.pm +++ b/cpan/JSON-PP/lib/JSON/PP.pm @@ -4,6 +4,7 @@ package JSON::PP; - + use 5.008; use strict; +no warnings 'experimental::builtin'; - + use Exporter (); BEGIN { our @ISA = ('Exporter') } diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm @@ -184,34 +171,34 @@ index bb6d3caedb..0c2fde4743 100644 --- a/dist/Data-Dumper/Dumper.pm +++ b/dist/Data-Dumper/Dumper.pm @@ -11,6 +11,7 @@ package Data::Dumper; - + use strict; use warnings; +no warnings 'experimental::builtin'; - + #$| = 1; - + @@ -125,8 +126,7 @@ sub new { # Packed numeric addresses take less memory. Plus pack is faster than sprintf - + sub format_refaddr { - require Scalar::Util; - pack "J", Scalar::Util::refaddr(shift); + pack "J", builtin::refaddr(shift); }; - + # @@ -282,9 +282,8 @@ sub _dump { warn "WARNING(Freezer method call failed): $@" if $@; } - + - require Scalar::Util; - my $realpack = Scalar::Util::blessed($val); - my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val; + my $realpack = builtin::blessed($val); + my $realtype = $realpack ? builtin::reftype($val) : ref $val; $id = format_refaddr($val); - + # Note: By this point $name is always defined and of non-zero length. @@ -576,7 +575,7 @@ sub _dump { # here generates a different result. So there are actually "three" different @@ -222,3 +209,15 @@ index bb6d3caedb..0c2fde4743 100644 $out .= sprintf "v%vd", $val; } # \d here would treat "1\x{660}" as a safe decimal number +diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm +index fc8fcbc8f0..cda7b90c65 100644 +--- a/cpan/JSON-PP/lib/JSON/PP.pm ++++ b/cpan/JSON-PP/lib/JSON/PP.pm +@@ -12,6 +12,6 @@ package JSON::PP; + + use Carp (); +-use Scalar::Util qw(blessed reftype refaddr); ++use builtin qw(blessed reftype refaddr); + #use Devel::Peek; + + From 2b13410f7a684706528c8d9b1b418a498714194d Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Tue, 14 Oct 2025 17:52:13 +0300 Subject: [PATCH 079/542] perl: Fix missing B.pm issue in case of crosscompilation Resurrect and rewrite hunk from cross.patch Signed-off-by: Alexander V. Nikolaev --- .../development/interpreters/perl/cross.patch | 80 ++++++++++++++++++- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/cross.patch b/pkgs/development/interpreters/perl/cross.patch index c8379a3985d3..46ed70bbeb7c 100644 --- a/pkgs/development/interpreters/perl/cross.patch +++ b/pkgs/development/interpreters/perl/cross.patch @@ -11,7 +11,62 @@ Updated for perl v5.40.0 by marcus@means.no --- - # safe if given an unblessed reference +diff --git a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm +index b0e83b0d2d..dab4907704 100644 +--- a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm ++++ b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm +@@ -52,21 +52,38 @@ + # from version::vpp + sub _find_magic_vstring { + my $value = shift; +- my $tvalue = ''; +- require B; +- my $sv = B::svref_2object(\$value); +- my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef; +- while ( $magic ) { +- if ( $magic->TYPE eq 'V' ) { +- $tvalue = $magic->PTR; +- $tvalue =~ s/^v?(.+)$/v$1/; +- last; +- } +- else { +- $magic = $magic->MOREMAGIC; ++ ++ # B is not available in miniperl (it depends on XS), so try to load it safely ++ my $has_B = eval { require B; 1 }; ++ ++ if ($has_B) { ++ my $sv = B::svref_2object(\$value); ++ my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef; ++ while ($magic) { ++ if ($magic->TYPE eq 'V') { ++ my $tvalue = $magic->PTR; ++ $tvalue =~ s/^v?(.+)$/v$1/; ++ return $tvalue; ++ } ++ $magic = $magic->MOREMAGIC; + } + } +- return $tvalue; ++ ++ # --- Fallback for miniperl --- ++ # Perl represents vstrings internally as sequences of bytes like "\x01\x02\x03" ++ # and only shows them as "v1.2.3" when printed. ++ # Try to detect that pattern heuristically. ++ use builtin qw/reftype/; ++ if (!ref($value) && reftype(\$value) eq 'VSTRING') { ++ return sprintf("v%vd", $value); ++ } ++ ++ # If it's already a "v1.2.3" string, just return it as is ++ if ($value =~ /^v\d+(?:\.\d+)*$/) { ++ return $value; ++ } ++ ++ return ''; + } + + # Perl 5.10.0 didn't have "is_qv" in version.pm diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm index 746abd63bc..c55d7cd2d0 100644 --- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm @@ -21,7 +76,7 @@ index 746abd63bc..c55d7cd2d0 100644 use strict; use warnings; +no warnings 'experimental::builtin'; - package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e + package CPAN::Meta::YAML; # git description: v1.75-3-g85169f1 # XXX-INGY is 5.8.1 too old/broken for utf8? # XXX-XDG Lancaster consensus was that it was sufficient until @@ -650,27 +651,29 @@ sub _dump_string { @@ -221,3 +276,24 @@ index fc8fcbc8f0..cda7b90c65 100644 #use Devel::Peek; +diff --git a/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm b/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm +--- a/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm ++++ b/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm +@@ -53,7 +53,8 @@ sub load_json_string { + my ($class, $string) = @_; + require Encode; + # load_json_string takes characters, decode_json expects bytes +- my $encoded = Encode::encode('UTF-8', $string, Encode::PERLQQ()); ++ my $encoded = $string; ++ utf8::encode($encoded); # Miniperl workaround + my $data = eval { $class->json_decoder()->can('decode_json')->($encoded) }; + croak $@ if $@; + return $data || {}; +@@ -122,7 +122,7 @@ sub _slurp { + open my $fh, "<:raw", "$_[0]" ## no critic + or die "can't open $_[0] for reading: $!"; + my $content = do { local $/; <$fh> }; +- $content = Encode::decode('UTF-8', $content, Encode::PERLQQ()); ++ utf8::decode($content); # Workaround for miniperl + return $content; + } From 738cc1a199d941d8f333529324c6cb0b2bc2920f Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Tue, 14 Oct 2025 17:53:02 +0300 Subject: [PATCH 080/542] perl: Fix bootstrap loop in case of cross-compilation Signed-off-by: Alexander V. Nikolaev --- pkgs/development/interpreters/perl/interpreter.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 0de0d9c6cdb7..9255a3d6d9fb 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -166,10 +166,14 @@ stdenv.mkDerivation ( configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; # !canExecute cross uses miniperl which doesn't have this - postConfigure = lib.optionalString (!crossCompiling && stdenv.cc.targetPrefix != "") '' - substituteInPlace Makefile \ - --replace-fail "AR = ar" "AR = ${stdenv.cc.targetPrefix}ar" - ''; + postConfigure = + lib.optionalString (!crossCompiling && stdenv.cc.targetPrefix != "") '' + substituteInPlace Makefile \ + --replace-fail "AR = ar" "AR = ${stdenv.cc.targetPrefix}ar" + '' + + lib.optionalString crossCompiling '' + substituteInPlace miniperl_top --replace-fail '-I$top/lib' '-I$top/cpan/JSON-PP/lib -I$top/cpan/CPAN-Meta-YAML/lib -I$top/lib' + ''; dontAddStaticConfigureFlags = true; From 6a59ccb95fef9e8c9c9153e20bd2619b25c6cca2 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 15 Oct 2025 13:20:30 +0300 Subject: [PATCH 081/542] perl: generated ./Build have host shebang, run it with build perl Signed-off-by: Alexander V. Nikolaev --- pkgs/top-level/perl-packages.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b9dbc1e05dc5..deea295cd3b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -65,19 +65,22 @@ with self; args: buildPerlPackage ( { + # In case of cross-compilation, generated ./Build have host perl shebang, not build one + # so run it with build perl explicitly buildPhase = '' runHook preBuild - perl Build.PL --prefix=$out; ./Build build + perl Build.PL --prefix=$out; + perl ./Build build runHook postBuild ''; installPhase = '' runHook preInstall - ./Build install + perl ./Build install runHook postInstall ''; checkPhase = '' runHook preCheck - ./Build test + perl ./Build test runHook postCheck ''; } From f4c5eab672f6f670f1b740521bacffd28ca2f4f6 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Thu, 16 Oct 2025 12:27:23 +0300 Subject: [PATCH 082/542] perl: don't shadow common patches in perl-cross Signed-off-by: Alexander V. Nikolaev --- .../interpreters/perl/interpreter.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 9255a3d6d9fb..70368487e61b 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -33,6 +33,16 @@ assert (enableCrypt -> (libxcrypt != null)); let crossCompiling = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); + commonPatches = [ + ./no-sys-dirs.patch + ] + ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ./cpp-precomp.patch + ./sw_vers.patch + ] + ++ lib.optional crossCompiling ./cross.patch; + libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; libcInc = lib.getDev libc; libcLib = lib.getLib libc; @@ -71,15 +81,7 @@ stdenv.mkDerivation ( disallowedReferences = [ stdenv.cc ]; - patches = [ - ./no-sys-dirs.patch - ] - ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ./cpp-precomp.patch - ./sw_vers.patch - ] - ++ lib.optional crossCompiling ./cross.patch; + patches = commonPatches; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -322,7 +324,7 @@ stdenv.mkDerivation ( rev = crossVersion; hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw="; }; - patches = [ + patches = commonPatches ++ [ # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option # https://github.com/arsv/perl-cross/pull/159 ./cross-fdopendir.patch From b96c93906950ed50acc4e4669f3d8e520c5cc1a8 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 8 Nov 2025 19:35:16 +0100 Subject: [PATCH 083/542] perlPackages.AudioScan: 1.10 -> 1.11 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index deea295cd3b2..56e15a5514e5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1862,10 +1862,10 @@ with self; AudioScan = buildPerlPackage { pname = "Audio-Scan"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "https://github.com/Logitech/slimserver-vendor/raw/public/9.0/CPAN/Audio-Scan-1.10.tar.gz"; - hash = "sha256-Vqi/rnYKijmaWYwTFTyj88aMoDB2cCSHxHeR1bkfqSk="; + url = "https://github.com/Logitech/slimserver-vendor/raw/public/9.1/CPAN/Audio-Scan-1.11.tar.gz"; + hash = "sha256-G+0qaqP2c1w/UKuOmRawq/qKZjsWvZUzTAl5C6H6bUI="; }; buildInputs = [ pkgs.zlib From 2fe38d249cac2c7160330b6c594add0f3503bf48 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 8 Nov 2025 19:46:03 +0100 Subject: [PATCH 084/542] perlPackages.HTTPHeaderParserXS: remove Removed as it doesnt build anymore, hasn't been maintained since 2008. https://metacpan.org/pod/HTTP::HeaderParser::XS --- pkgs/top-level/perl-packages.nix | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 56e15a5514e5..3a84344ad222 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16618,25 +16618,6 @@ with self; }; }; - HTTPHeaderParserXS = buildPerlPackage { - pname = "HTTP-HeaderParser-XS"; - version = "0.20"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz"; - hash = "sha256-qeAP/7PYmRoUqq/dxh1tFoxP8U4xSuPbstTaMAjXRu8="; - }; - meta = { - description = "XS extension for processing HTTP headers"; - license = with lib.licenses; [ - artistic1 - gpl1Plus - ]; - broken = - stdenv.hostPlatform.isi686 # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080) - || stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTTPHeaderParserXS.x86_64-darwin - }; - }; - HTTPHeadersFast = buildPerlModule { pname = "HTTP-Headers-Fast"; version = "0.22"; @@ -39487,4 +39468,5 @@ with self; Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15 MongoDB = throw "MongoDB has been removed"; # 2025-09-12 pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07 + HTTPHeaderParserXS = throw "HTTPHeaderParserXS has been removed"; # Added 2025-11-08 } From c36022de524126b345bb82a6fdf03e85cb636b11 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 8 Nov 2025 20:11:57 +0100 Subject: [PATCH 085/542] perlPackages.MathPari: 2.030523 -> 2.030528 Also updated the local pari package from 2.1.7 to 2.3.5 --- pkgs/top-level/perl-packages.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3a84344ad222..0ecb24d994f7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20736,22 +20736,23 @@ with self; MathPari = buildPerlPackage rec { pname = "Math-Pari"; - version = "2.030523"; + version = "2.030528"; nativeBuildInputs = [ pkgs.unzip ]; - pariversion = "2.1.7"; + pariversion = "2.3.5"; pari_tgz = fetchurl { - url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/2.1/pari-${pariversion}.tgz"; - hash = "sha256-kULyza8wg8iWLxpcK7Dp/okV99lJDAMxKsI2HH6hVfo="; + url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/2.3/pari-${pariversion}.tar.gz"; + hash = "sha256-R92uGvc7RHZmDSqJM4SDlJBnqX/7h1jILoGJ36TInYg="; }; + # Workaround build failure on -fno-common toolchains: # ld: libPARI/libPARI.a(compat.o):(.bss+0x8): multiple definition of # `overflow'; Pari.o:(.bss+0x80): first defined here env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-error=implicit-int -Wno-error=implicit-function-declaration"; - preConfigure = "cp ${pari_tgz} pari-${pariversion}.tgz"; - makeMakerFlags = [ "pari_tgz=pari-${pariversion}.tgz" ]; + preConfigure = "cp ${pari_tgz} pari-${pariversion}.tar.gz"; + makeMakerFlags = [ "pari_tgz=pari-${pariversion}.tar.gz" ]; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/Math-Pari-2.030518.zip"; - hash = "sha256-3DiVWpaQvmuvqN4lJiEjd8Psn+jaXsAiY6nK+UtYu5E="; + url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/Math-Pari-2.030528.tar.gz"; + hash = "sha256-Z/dNIWxpY1qxxuo+J84ZdQqUorVgrnKIuy1s9xT85sg="; }; meta = { description = "Perl interface to PARI"; From 53587736fd31d179c108abd3368ce406cf0ffe5f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 8 Nov 2025 20:20:47 +0100 Subject: [PATCH 086/542] perlPackages.MusicBrainzDiscID: add compat patch --- ...inz-DiscID---ExtUtils-ParseXS-compat.patch | 19 +++++++++++++++++++ pkgs/top-level/perl-packages.nix | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch diff --git a/pkgs/development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch b/pkgs/development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch new file mode 100644 index 000000000000..f558f7c4dada --- /dev/null +++ b/pkgs/development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch @@ -0,0 +1,19 @@ +Patch from Fedora to fix ExtUtils::ParseXS ≥ 3.57: + + Unparseable XSUB parameter: 'offsets ...' in DiscID.xs, line 116 + +https://bugzilla-attachments.redhat.com/attachment.cgi?id=2089957 +https://bugzilla.redhat.com/show_bug.cgi?id=2364631 + +diff -up MusicBrainz-DiscID-0.06/DiscID.xs.orig MusicBrainz-DiscID-0.06/DiscID.xs +--- MusicBrainz-DiscID-0.06/DiscID.xs.orig 2025-05-15 14:01:31.501503137 +0200 ++++ MusicBrainz-DiscID-0.06/DiscID.xs 2025-05-15 14:02:10.538285963 +0200 +@@ -113,7 +113,7 @@ discid_get_track_length( disc, track_num + ## Provides the TOC of a known CD. + ## + int +-discid_put( disc, first_track, sectors, offsets ... ) ++discid_put( disc, first_track, sectors, offsets, ... ) + DiscId *disc + int first_track + int sectors diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0ecb24d994f7..4719b6e58252 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -24644,6 +24644,9 @@ with self; substituteInPlace Makefile.PL \ --replace-fail '`which pkg-config`' "'$PKG_CONFIG'" ''; + patches = [ + ../development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch + ]; doCheck = false; # The main test performs network access nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libdiscid ]; From d90770f20c48b3e86dcf189e3d9a5d03cee4ef56 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 8 Nov 2025 20:26:16 +0100 Subject: [PATCH 087/542] perlPackages.NetRemctl: remove failing test Remove t/backend/options.t as one of its tests fail. Seems benign. Failed test '...and correct error' at t/backend/options.t line 97. got: 'number: value "foo" invalid for option number (integer number expected)' expected: 'number: value "foo" invalid for option number (number expected)' --- pkgs/development/perl-modules/NetRemctl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/perl-modules/NetRemctl/default.nix b/pkgs/development/perl-modules/NetRemctl/default.nix index 78ee5dfdffcb..7d51489a9b0e 100644 --- a/pkgs/development/perl-modules/NetRemctl/default.nix +++ b/pkgs/development/perl-modules/NetRemctl/default.nix @@ -11,6 +11,7 @@ buildPerlModule { postPatch = '' cp -R tests/tap/perl/Test perl/t/lib + rm perl/t/backend/options.t cd perl ''; From 5772020bba6422184d2031740edf057b4834d88f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 8 Nov 2025 20:34:42 +0100 Subject: [PATCH 088/542] perlPackages.PDL: 2.025 -> 2.100 --- pkgs/top-level/perl-packages.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4719b6e58252..289e86669426 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -27500,21 +27500,11 @@ with self; PDL = buildPerlPackage { pname = "PDL"; - version = "2.025"; + version = "2.100"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/PDL-2.025.tar.gz"; - hash = "sha256-G1oWfq0ndy2V2tJ/jrfQlRnSkVbu1TxvwUQVGUtaitY="; + url = "mirror://cpan/authors/id/E/ET/ETJ/PDL-2.100.tar.gz"; + hash = "sha256-iqpu35AlWj0LTQBH1icOESS/HhrNJBSATocxC2s5vkA="; }; - patchPhase = '' - substituteInPlace perldl.conf \ - --replace 'POSIX_THREADS_LIBS => undef' 'POSIX_THREADS_LIBS => "-L${pkgs.glibc.dev}/lib"' \ - --replace 'POSIX_THREADS_INC => undef' 'POSIX_THREADS_INC => "-I${pkgs.glibc.dev}/include"' \ - --replace 'WITH_MINUIT => undef' 'WITH_MINUIT => 0' \ - --replace 'WITH_SLATEC => undef' 'WITH_SLATEC => 0' \ - --replace 'WITH_HDF => undef' 'WITH_HDF => 0' \ - --replace 'WITH_GD => undef' 'WITH_GD => 0' \ - --replace 'WITH_PROJ => undef' 'WITH_PROJ => 0' - ''; # FIXME: Why are these libraries in `nativeBuildInputs`? nativeBuildInputs = with pkgs; [ From 31b058833c2920e6f29489a600e52f92302b9fd6 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 8 Nov 2025 20:39:55 +0100 Subject: [PATCH 089/542] perlPackages.StatisticsCaseResampling: 0.15 -> 0.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 289e86669426..716559bd4ae9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -31206,10 +31206,10 @@ with self; StatisticsCaseResampling = buildPerlPackage { pname = "Statistics-CaseResampling"; - version = "0.15"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz"; - hash = "sha256-hRxDvW8Q0yKJUipQxqIJw7JGz9PrVmdz5oYe2gSkkIc="; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.17.tar.gz"; + hash = "sha256-buZtDu2BiC7E+kj//hY6BP2YxNVqwejNwUqfg70YObw="; }; meta = { description = "Efficient resampling and calculation of medians with confidence intervals"; From 0efcee4824e63f426d950f3c28a89d918fae07e5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 8 Nov 2025 20:45:20 +0100 Subject: [PATCH 090/542] perlPackages.TestLectroTest: remove impure test --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 716559bd4ae9..5e721d1ab1fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -34224,6 +34224,10 @@ with self; url = "mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz"; hash = "sha256-rCtPDZWJmvGhoex4TLdAsrkCVqvuEcg+eykRA+ye1zU="; }; + preCheck = '' + # Remove impure test + rm t/gens.t + ''; meta = { description = "Easy, automatic, specification-based tests"; license = with lib.licenses; [ From 0939725ec28c7856771815d11752f564fe8e083b Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 8 Nov 2025 20:49:08 +0100 Subject: [PATCH 091/542] perlPackages.VariableMagic: 0.63 -> 0.64 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5e721d1ab1fc..3b853f1ca2ea 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -37716,10 +37716,10 @@ with self; VariableMagic = buildPerlPackage { pname = "Variable-Magic"; - version = "0.63"; + version = "0.64"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.63.tar.gz"; - hash = "sha256-ukCDssMf8mlPI3EzPVVMgmqvJLTZjQPki1tKQ6Kg5nk="; + url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.64.tar.gz"; + hash = "sha256-n3hTJJyeo7TfkvtreQwDpgaA/AKfRMi/mJTczwGVFr0="; }; meta = { description = "Associate user-defined magic to variables from Perl"; From 90e1fe1d81a797be4ba2be3e65476264b5e25587 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 8 Nov 2025 21:52:53 +0100 Subject: [PATCH 092/542] perlPackages.X11XCB: 0.20 -> 0.24 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3b853f1ca2ea..f0142a127a63 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -38219,10 +38219,10 @@ with self; X11XCB = buildPerlPackage { pname = "X11-XCB"; - version = "0.20"; + version = "0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZH/ZHMYLOVE/X11-XCB-0.20.tar.gz"; - hash = "sha256-rVY5Yd4gIlVOdZHvXLjZY0ngxzdxIYXkeFBViMZ6L9I="; + url = "mirror://cpan/authors/id/Z/ZH/ZHMYLOVE/X11-XCB-0.24.tar.gz"; + hash = "sha256-eIUZZzpDxHUecwYaiCG2WPyV8G1cGcnx3rtgX7ILoEU="; }; env.AUTOMATED_TESTING = false; nativeBuildInputs = [ pkgs.pkg-config ]; From 3cf58860fd67036a4692214e3ba78d61f1a2d33d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 15 Nov 2025 12:54:53 -0800 Subject: [PATCH 093/542] python3Packages.click: 8.2.1 -> 8.3.1 Diff: https://github.com/pallets/click/compare/8.2.1...8.3.1 Changelog: https://github.com/pallets/click/blob/8.3.1/CHANGES.rst --- pkgs/development/python-modules/click/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 368589cac6ef..47f53fb6580b 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, importlib-metadata, pytestCheckHook, @@ -17,25 +16,16 @@ buildPythonPackage rec { pname = "click"; - version = "8.2.1"; + version = "8.3.1"; pyproject = true; src = fetchFromGitHub { owner = "pallets"; repo = "click"; tag = version; - hash = "sha256-3FfLKwpfkiGfY2+H2fQoZwLBqfPlV46xw2Bc4YEsyps="; + hash = "sha256-MbaIQJr6GbM8JwdbUkbeC8TqWN5dH82pFOqHwJE2PBA="; }; - patches = [ - # https://github.com/pallets/click/pull/2940 - (fetchpatch { - name = "fix-SystemExit-when-using-stdin.patch"; - url = "https://github.com/pallets/click/commit/93c6966eb3a575c2b600434d1cc9f4b3aee505ac.patch"; - hash = "sha256-DkVF0JnKbcsdAhgVjWJEDZZ8vr2sf6wba8P3SyRUy6o="; - }) - ]; - build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; From b7e706eb392a50e2e27afa44a680645b4b2d9531 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 25 Sep 2025 16:32:02 +0200 Subject: [PATCH 094/542] {xorg-server,xvfb}: refactor, move to pkgs/by-name, and rename from xorg.xorgserver relevant changes: - remove the hardingDisables --- lib/licenses.nix | 27 ++ .../xo/xorg-server}/darwin/bundle_main.patch | 0 .../darwin/dri/GL/internal/dri_interface.h | 0 .../xo/xorg-server/darwin/proto-package.nix | 11 + .../xo/xorg-server}/darwin/stub.patch | 0 .../dont-create-logdir-during-build.patch | 0 pkgs/by-name/xo/xorg-server/package.nix | 311 ++++++++++++++++++ pkgs/by-name/xv/xvfb/package.nix | 96 ++++++ pkgs/servers/x11/xorg/default.nix | 62 +--- .../x11/xorg/generate-expr-from-tarballs.pl | 5 + pkgs/servers/x11/xorg/overrides.nix | 242 -------------- pkgs/servers/x11/xorg/tarballs.list | 1 - 12 files changed, 454 insertions(+), 301 deletions(-) rename pkgs/{servers/x11/xorg => by-name/xo/xorg-server}/darwin/bundle_main.patch (100%) rename pkgs/{servers/x11/xorg => by-name/xo/xorg-server}/darwin/dri/GL/internal/dri_interface.h (100%) create mode 100644 pkgs/by-name/xo/xorg-server/darwin/proto-package.nix rename pkgs/{servers/x11/xorg => by-name/xo/xorg-server}/darwin/stub.patch (100%) rename pkgs/{servers/x11/xorg => by-name/xo/xorg-server}/dont-create-logdir-during-build.patch (100%) create mode 100644 pkgs/by-name/xo/xorg-server/package.nix create mode 100644 pkgs/by-name/xv/xvfb/package.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index c38379ed405b..e98180a4fc6f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -64,6 +64,11 @@ lib.mapAttrs mkLicense ( free = false; }; + adobeDisplayPostScript = { + spdxId = "Adobe-Display-PostScript"; + fullName = "Adobe Display PostScript License"; + }; + adobeUtopia = { fullName = "Adobe Utopia Font License"; spdxId = "Adobe-Utopia"; @@ -501,6 +506,11 @@ lib.mapAttrs mkLicense ( fullName = "curl License"; }; + dec3Clause = { + spdxId = "DEC-3-Clause"; + fullName = "DEC 3-Clause License"; + }; + doc = { spdxId = "DOC"; fullName = "DOC License"; @@ -727,6 +737,11 @@ lib.mapAttrs mkLicense ( spdxId = "HPND-sell-variant"; }; + hpndSellVariantMitDisclaimerXserver = { + spdxId = "HPND-sell-MIT-disclaimer-xserver"; + fullName = "Historical Permission Notice and Disclaimer - sell xserver variant with MIT disclaimer"; + }; + hpndDec = { fullName = "Historical Permission Notice and Disclaimer - DEC variant"; spdxId = "HPND-DEC"; @@ -1108,6 +1123,13 @@ lib.mapAttrs mkLicense ( fullName = "Non-Profit Open Software License 3.0"; }; + # NTP is basically HPND, but spdx and the OSI recognize it + # hpnd says "and without fee", ntp "with or without fee" + ntp = { + spdxId = "NTP"; + fullName = "NTP License"; + }; + nvidiaCuda = { shortName = "CUDA EULA"; fullName = "CUDA Toolkit End User License Agreement (EULA)"; @@ -1515,6 +1537,11 @@ lib.mapAttrs mkLicense ( fullName = "X11 License"; }; + x11NoPermitPersons = { + spdxId = "X11-no-permit-persons"; + fullName = "X11 no permit persons clause"; + }; + xerox = { spdxId = "Xerox"; fullName = "Xerox License"; diff --git a/pkgs/servers/x11/xorg/darwin/bundle_main.patch b/pkgs/by-name/xo/xorg-server/darwin/bundle_main.patch similarity index 100% rename from pkgs/servers/x11/xorg/darwin/bundle_main.patch rename to pkgs/by-name/xo/xorg-server/darwin/bundle_main.patch diff --git a/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h b/pkgs/by-name/xo/xorg-server/darwin/dri/GL/internal/dri_interface.h similarity index 100% rename from pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h rename to pkgs/by-name/xo/xorg-server/darwin/dri/GL/internal/dri_interface.h diff --git a/pkgs/by-name/xo/xorg-server/darwin/proto-package.nix b/pkgs/by-name/xo/xorg-server/darwin/proto-package.nix new file mode 100644 index 000000000000..bc96496bf8ba --- /dev/null +++ b/pkgs/by-name/xo/xorg-server/darwin/proto-package.nix @@ -0,0 +1,11 @@ +{ xorg-server }: +xorg-server.overrideAttrs (oldAttrs: { + configureFlags = oldAttrs.configureFlags ++ [ + "--disable-xquartz" + "--enable-xorg" + "--enable-xvfb" + "--enable-xnest" + "--enable-kdrive" + ]; + postInstall = ":"; # prevent infinite recursion +}) diff --git a/pkgs/servers/x11/xorg/darwin/stub.patch b/pkgs/by-name/xo/xorg-server/darwin/stub.patch similarity index 100% rename from pkgs/servers/x11/xorg/darwin/stub.patch rename to pkgs/by-name/xo/xorg-server/darwin/stub.patch diff --git a/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch b/pkgs/by-name/xo/xorg-server/dont-create-logdir-during-build.patch similarity index 100% rename from pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch rename to pkgs/by-name/xo/xorg-server/dont-create-logdir-during-build.patch diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix new file mode 100644 index 000000000000..271d279dd4a4 --- /dev/null +++ b/pkgs/by-name/xo/xorg-server/package.nix @@ -0,0 +1,311 @@ +{ + lib, + stdenv, + fetchurl, + fetchpatch, + callPackage, + + # build system + buildPackages, + pkg-config, + + # deps + dbus, + dri-pkgconfig-stub, + libdrm, + libepoxy, + libgbm, + libGL, + libGLU, + libpciaccess, + libunwind, + libx11, + libxau, + libxcb, + libxcb-image, + libxcb-keysyms, + libxcb-render-util, + libxcb-util, + libxcb-wm, + libxcvt, + libxdmcp, + libxext, + libxfixes, + libxfont_1, + libxfont_2, + libxkbfile, + libxshmfence, + mesa, + mesa-gl-headers, + openssl, + pixman, + udev, + xkbcomp, + xkeyboardconfig, + xorgproto, + xtrans, + zlib, + + # darwin specific deps + darwin, + autoconf, + automake, + autoreconfHook, + fontutil, + utilmacros, + libapplewm, + + writeScript, + testers, +}: +let + # XQuartz requires two compilations: the first to get X / XQuartz, + # and the second to get Xvfb, Xnest, etc. + darwinOtherX = callPackage ./darwin/proto-package.nix { }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "xorg-server"; + version = "21.1.20"; + + outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "dev"; + + src = fetchurl { + url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz"; + hash = "sha256-dpW8YYJLOoG2utL3iwVADKAVAD3kAtGzIhFxBbcC6Tc="; + }; + + patches = + lib.optionals (!stdenv.hostPlatform.isDarwin) [ + # The build process tries to create the specified logdir when building. + # + # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail + ./dont-create-logdir-during-build.patch + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # XQuartz patchset + (fetchpatch { + url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch"; + sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k"; + name = "use-cppflags-not-cflags.patch"; + }) + (fetchpatch { + url = "https://github.com/XQuartz/xorg-server/commit/75ee9649bcfe937ac08e03e82fd45d9e18110ef4.patch"; + sha256 = "1vlfylm011y00j8mig9zy6gk9bw2b4ilw2qlsc6la49zi3k0i9fg"; + name = "use-old-mitrapezoids-and-mitriangles-routines.patch"; + }) + (fetchpatch { + url = "https://github.com/XQuartz/xorg-server/commit/c58f47415be79a6564a9b1b2a62c2bf866141e73.patch"; + sha256 = "19sisqzw8x2ml4lfrwfvavc2jfyq2bj5xcf83z89jdxg8g1gdd1i"; + name = "revert-fb-changes-1.patch"; + }) + (fetchpatch { + url = "https://github.com/XQuartz/xorg-server/commit/56e6f1f099d2821e5002b9b05b715e7b251c0c97.patch"; + sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396"; + name = "revert-fb-changes-2.patch"; + }) + ./darwin/bundle_main.patch + ./darwin/stub.patch + ]; + + strictDeps = true; + + depsBuildBuild = lib.optionals (!stdenv.hostPlatform.isDarwin) [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + autoreconfHook + darwin.bootstrap_cmds + utilmacros + fontutil + ]; + + buildInputs = [ + libx11 + libxau + libxcb + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-util + libxcb-wm + libxcvt + libxdmcp + libxfixes + libxkbfile + openssl + xorgproto + xtrans + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + dri-pkgconfig-stub + libdrm + libgbm + mesa-gl-headers + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + autoconf + automake + darwin.bootstrap_cmds + mesa + ]; + + propagatedBuildInputs = [ + dbus + libepoxy + libGL + libGLU + libunwind + libxext + libxfont_1 + libxfont_2 + libxshmfence + pixman + xorgproto + zlib + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libpciaccess ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libapplewm ]; + + configureFlags = [ + "--with-default-font-path=" + # there were only paths containing "${prefix}", + # and there are no fonts in this package anyway + "--with-xkb-bin-directory=${xkbcomp}/bin" + "--with-xkb-path=${xkeyboardconfig}/share/X11/xkb" + "--with-xkb-output=$out/share/X11/xkb/compiled" + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + "--enable-kdrive" # not built by default + "--enable-xephyr" + "--enable-xcsecurity" # enable SECURITY extension + "--with-log-dir=/var/log" + "--enable-glamor" + "--with-os-name=Nix" # r13y, embeds the build machine's kernel version otherwise + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isMusl) [ + "--disable-tls" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # note: --enable-xquartz is auto + "CPPFLAGS=-I${./darwin/dri}" + "--disable-libunwind" # libunwind on darwin is missing unw_strerror + "--disable-glamor" + "--with-apple-application-name=XQuartz" + "--with-apple-applications-dir=\${out}/Applications" + "--with-bundle-id-prefix=org.nixos.xquartz" + "--with-sha1=CommonCrypto" + "--without-dtrace" # requires Command Line Tools for Xcode + ]; + + env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { + # Needed with GCC 12 + NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; + }; + + prePatch = lib.optionalString (!stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isMusl) '' + export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" + ''; + + postPatch = '' + substituteInPlace dri3/*.c \ + --replace-fail '#include ' '#include ' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace hw/xquartz/mach-startup/stub.c \ + --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app" + ''; + + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" + ''; + + postInstall = '' + rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others + cd "$dev" + for f in include/xorg/*.h; do + sed "1i#line 1 \"${finalAttrs.pname}-${finalAttrs.version}/$f\"" -i "$f" + done + ) + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + cp -rT ${darwinOtherX}/bin $out/bin + rm -f $out/bin/X + ln -s Xquartz $out/bin/X + + cp ${darwinOtherX}/share/man -rT $out/share/man + ''; + + passthru = { + inherit (finalAttrs) version; # needed by virtualbox guest additions + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/xserver/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "X server implementation by X.org"; + longDescription = '' + The X server accepts requests from client applications to create windows, which are (normally + rectangular) "virtual screens" that the client program can draw into. + Windows are then composed on the actual screen by the X server (or by a separate composite + manager) as directed by the window manager, which usually communicates with the user via + graphical controls such as buttons and draggable titlebars and borders. + + For a comprehensive overview of X Server and X Window System, consult the following article: + https://en.wikipedia.org/wiki/X_server + ''; + homepage = "https://x.org/wiki"; + license = with lib.licenses; [ + # because the license list is huge (1848 lines) this is documented by line range + # https://gitlab.freedesktop.org/xorg/xserver/-/blob/f05f269f1d5bddafe71cdfb290b118820bf17fdd/COPYING + + # 10-45, 148-170, 364-390, 431-454, 485-511, 512-534, 535-558, 1573-1593, 1692-1711, 1760-1779 + mit + + # 53-77, 124-147, 317-343, 455-484, 559-583, 629-654, 891-918, 1008-1034, 1056-1079, + # 1296-1326, 1438-1470, 1499-1522, 1523-1548 + x11 + + # 78-99, 171-191, 391-430 (doubled text), 584-605, 606-628, 707-729, 730-750, 807-828, + # 829-853, 854-879, 880-890, 919-939, 940-962, 963-985, 986-1007, 1035-1055, 1080-1102, + # 1103-1125, 1126-1148, 1149-1169, 1170-1192, 1193-1215, 1216-1236, 1237-1259, 1275-1295, + # 1327-1359, 1360-1383, 1549-1572, 1594-1617, 1618-1638, 1639-1670, 1671-1691, 1712-1732, + # 1733-1756, 1795-1814 + hpndSellVariant + + mitOpenGroup # 100-123 + hpnd # 192-214, 215-237, 344-363, 686-706, 1416-1437 + dec3Clause # 238-267 + x11NoPermitPersons # 268-292 + # missing last paragraph likely due to an error + # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2097 + sgi-b-20 # 293-316 + bsd3 # 655-685, 1471-1498, 1815-1848 (BSD-4-Clause UC with rescinded third clause) + adobeDisplayPostScript # 751-782 + ntp # 783-795 + hpndUc # 796-806 + isc # 1260-1274 + icu # 1383-1415 + # missing author/copyright notice + # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2098 + hpndSellVariantMitDisclaimerXserver # 1780-1793 + ]; + mainProgram = "X"; + maintainers = [ ]; + pkgConfigModules = [ "xorg-server" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix new file mode 100644 index 000000000000..c81ee24becee --- /dev/null +++ b/pkgs/by-name/xv/xvfb/package.nix @@ -0,0 +1,96 @@ +# xvfb is used by a bunch of things to run tests +# so try to reduce its reverse closure +{ + lib, + stdenv, + pkg-config, + xorg-server, + dri-pkgconfig-stub, + libdrm, + libGL, + libX11, + libXau, + libxcb, + libxcvt, + libxdmcp, + libxfixes, + libxfont_2, + libxkbfile, + libxshmfence, + mesa-gl-headers, + openssl, + pixman, + xcbutil, + xcbutilimage, + xcbutilkeysyms, + xcbutilrenderutil, + xcbutilwm, + xkbcomp, + xkeyboardconfig, + xorgproto, + xtrans, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xvfb"; + + inherit (xorg-server) src version; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + dri-pkgconfig-stub + libdrm + libGL + libX11 + libXau + libxcb + libxcvt + libxdmcp + libxfixes + libxfont_2 + libxkbfile + libxshmfence + mesa-gl-headers + openssl + pixman + xcbutil + xcbutilimage + xcbutilkeysyms + xcbutilrenderutil + xcbutilwm + xorgproto + xtrans + ]; + + configureFlags = [ + "--enable-xvfb" + "--disable-xorg" + "--disable-xquartz" + "--disable-xwayland" + "--with-xkb-bin-directory=${xkbcomp}/bin" + "--with-xkb-path=${xkeyboardconfig}/share/X11/xkb" + "--with-xkb-output=$out/share/X11/xkb/compiled" + ] + ++ lib.optional stdenv.hostPlatform.isDarwin "--without-dtrace"; + + meta = { + description = "X virtual framebuffer"; + longDescription = '' + Xvfb or X virtual framebuffer is a display server implementing the X11 display server + protocol. In contrast to other display servers, Xvfb performs all graphical operations in + virtual memory without showing any screen output. From the point of view of the X client app, + it acts exactly like any other X display server, serving requests and sending events and + errors as appropriate. However, no output is shown. This virtual server does not require the + computer it is running on to have any kind of graphics adapter, a screen or any input device. + Is is primarily used for testing. + ''; + inherit (xorg-server.meta) + homepage + license + mainProgram + ; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 61db87acd555..062e0caebdcc 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -128,6 +128,7 @@ xorg-cf-files, xorg-docs, xorgproto, + xorg-server, xorg-sgml-doctools, xprop, xrandr, @@ -137,6 +138,7 @@ xsm, xstdcmap, xtrans, + xvfb, xvinfo, xwininfo, xwud, @@ -202,6 +204,7 @@ self: with self; { xsm xstdcmap xtrans + xvfb xvinfo xwininfo xwud @@ -284,6 +287,7 @@ self: with self; { xcursorthemes = xcursor-themes; xorgcffiles = xorg-cf-files; xorgdocs = xorg-docs; + xorgserver = xorg-server; xorgsgmldoctools = xorg-sgml-doctools; # THIS IS A GENERATED FILE. DO NOT EDIT! @@ -3329,64 +3333,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgserver = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - openssl, - libX11, - libXau, - libxcb, - xcbutil, - xcbutilwm, - xcbutilimage, - xcbutilkeysyms, - xcbutilrenderutil, - libXdmcp, - libXfixes, - libxkbfile, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xorg-server"; - version = "21.1.20"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz"; - sha256 = "sha256-dpW8YYJLOoG2utL3iwVADKAVAD3kAtGzIhFxBbcC6Tc="; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - openssl - libX11 - libXau - libxcb - xcbutil - xcbutilwm - xcbutilimage - xcbutilkeysyms - xcbutilrenderutil - libXdmcp - libXfixes - libxkbfile - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xorg-server" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xpr = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index d87b1ad6879d..1af7f4bdb92b 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -76,6 +76,7 @@ $pcMap{"xinerama"} = "libXinerama"; $pcMap{"xkbfile"} = "libxkbfile"; $pcMap{"xmu"} = "libXmu"; $pcMap{"xmuu"} = "libXmu"; +$pcMap{"xorg-server"} = "xorgserver"; $pcMap{"xp"} = "libXp"; $pcMap{"xpm"} = "libXpm"; $pcMap{"xpresent"} = "libXpresent"; @@ -459,6 +460,7 @@ print OUT <|#include |" $i - done - ''; - meta = attrs_passed.meta // { - mainProgram = "X"; - }; - }; - in - attrs - // ( - let - version = lib.getVersion attrs; - commonBuildInputs = attrs.buildInputs ++ [ - xorg.xtrans - xorg.libxcvt - ]; - commonPropagatedBuildInputs = [ - dbus - libGL - libGLU - xorg.libXext - xorg.libXfont - xorg.libXfont2 - libepoxy - libunwind - xorg.libxshmfence - xorg.pixman - xorg.xorgproto - zlib - ]; - # XQuartz requires two compilations: the first to get X / XQuartz, - # and the second to get Xvfb, Xnest, etc. - darwinOtherX = xorg.xorgserver.overrideAttrs (oldAttrs: { - configureFlags = oldAttrs.configureFlags ++ [ - "--disable-xquartz" - "--enable-xorg" - "--enable-xvfb" - "--enable-xnest" - "--enable-kdrive" - ]; - postInstall = ":"; # prevent infinite recursion - }); - - fpgit = - commit: sha256: name: - fetchpatch ( - { - url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/${commit}.diff"; - inherit sha256; - } - // lib.optionalAttrs (name != null) { - name = name + ".patch"; - } - ); - in - if (!isDarwin) then - { - outputs = [ - "out" - "dev" - ]; - patches = [ - # The build process tries to create the specified logdir when building. - # - # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail - ./dont-create-logdir-during-build.patch - ]; - buildInputs = commonBuildInputs ++ [ - libdrm - libgbm - mesa-gl-headers - dri-pkgconfig-stub - ]; - propagatedBuildInputs = - attrs.propagatedBuildInputs or [ ] - ++ [ xorg.libpciaccess ] - ++ commonPropagatedBuildInputs - ++ lib.optionals stdenv.hostPlatform.isLinux [ - udev - ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - prePatch = lib.optionalString stdenv.hostPlatform.isMusl '' - export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" - ''; - configureFlags = [ - "--enable-kdrive" # not built by default - "--enable-xephyr" - "--enable-xcsecurity" # enable SECURITY extension - "--with-default-font-path=" - # there were only paths containing "${prefix}", - # and there are no fonts in this package anyway - "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" - "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" - "--with-xkb-output=$out/share/X11/xkb/compiled" - "--with-log-dir=/var/log" - "--enable-glamor" - "--with-os-name=Nix" # r13y, embeds the build machine's kernel version otherwise - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ - "--disable-tls" - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=array-bounds" - ]; - - postInstall = '' - rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it - ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others - cd "$dev" - for f in include/xorg/*.h; do - sed "1i#line 1 \"${attrs.pname}-${attrs.version}/$f\"" -i "$f" - done - ) - ''; - passthru = attrs.passthru // { - inherit version; # needed by virtualbox guest additions - }; - } - else - { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ - autoreconfHook - bootstrap_cmds - xorg.utilmacros - xorg.fontutil - ]; - buildInputs = commonBuildInputs ++ [ - bootstrap_cmds - automake - autoconf - mesa - ]; - propagatedBuildInputs = commonPropagatedBuildInputs ++ [ - xorg.libAppleWM - xorg.xorgproto - ]; - - patches = [ - # XQuartz patchset - (fetchpatch { - url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch"; - sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k"; - name = "use-cppflags-not-cflags.patch"; - }) - (fetchpatch { - url = "https://github.com/XQuartz/xorg-server/commit/75ee9649bcfe937ac08e03e82fd45d9e18110ef4.patch"; - sha256 = "1vlfylm011y00j8mig9zy6gk9bw2b4ilw2qlsc6la49zi3k0i9fg"; - name = "use-old-mitrapezoids-and-mitriangles-routines.patch"; - }) - (fetchpatch { - url = "https://github.com/XQuartz/xorg-server/commit/c58f47415be79a6564a9b1b2a62c2bf866141e73.patch"; - sha256 = "19sisqzw8x2ml4lfrwfvavc2jfyq2bj5xcf83z89jdxg8g1gdd1i"; - name = "revert-fb-changes-1.patch"; - }) - (fetchpatch { - url = "https://github.com/XQuartz/xorg-server/commit/56e6f1f099d2821e5002b9b05b715e7b251c0c97.patch"; - sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396"; - name = "revert-fb-changes-2.patch"; - }) - ./darwin/bundle_main.patch - ./darwin/stub.patch - ]; - - postPatch = attrs.postPatch + '' - substituteInPlace hw/xquartz/mach-startup/stub.c \ - --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app" - ''; - - configureFlags = [ - # note: --enable-xquartz is auto - "CPPFLAGS=-I${./darwin/dri}" - "--disable-libunwind" # libunwind on darwin is missing unw_strerror - "--disable-glamor" - "--with-default-font-path=" - "--with-apple-application-name=XQuartz" - "--with-apple-applications-dir=\${out}/Applications" - "--with-bundle-id-prefix=org.nixos.xquartz" - "--with-sha1=CommonCrypto" - "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" - "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" - "--with-xkb-output=$out/share/X11/xkb/compiled" - "--without-dtrace" # requires Command Line Tools for Xcode - ]; - preConfigure = '' - mkdir -p $out/Applications - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" - ''; - postInstall = '' - rm -fr $out/share/X11/xkb/compiled - - cp -rT ${darwinOtherX}/bin $out/bin - rm -f $out/bin/X - ln -s Xquartz $out/bin/X - - cp ${darwinOtherX}/share/man -rT $out/share/man - ''; - passthru = attrs.passthru // { - inherit version; - }; - } - ) - ); - - # xvfb is used by a bunch of things to run tests - # so try to reduce its reverse closure - xvfb = super.xorgserver.overrideAttrs (old: { - configureFlags = [ - "--enable-xvfb" - "--disable-xorg" - "--disable-xquartz" - "--disable-xwayland" - "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" - "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" - "--with-xkb-output=$out/share/X11/xkb/compiled" - ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - "--without-dtrace" - ]; - - buildInputs = old.buildInputs ++ [ - dri-pkgconfig-stub - libdrm - libGL - mesa-gl-headers - xorg.pixman - xorg.libXfont2 - xorg.xtrans - xorg.libxcvt - xorg.libxshmfence - ]; - }); - xclock = addMainProgram super.xclock { }; xinit = diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 33aa31bf7c8d..de8cea1b15e1 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -77,4 +77,3 @@ mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz From 1c463fb0cacc1b83bdd43770901333c7e6df2c43 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 16 Nov 2025 09:23:51 +1000 Subject: [PATCH 095/542] python3Packages.invoke: 2.2.0 -> 2.2.1 Changelog: https://www.pyinvoke.org/changelog.html --- pkgs/development/python-modules/invoke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 019ebd243f2c..db9c5d1e7b45 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "invoke"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7my7EBrxqFnH/oTyomTAWQILDLf+NTX5QkMAq1aPa9U="; + hash = "sha256-UVv0m0pIkyt5sCRZA0jaIvOcSULf+ZGtH7i4uuob5wc="; }; postPatch = '' From d35ac1297cb975857593a739d717ec901410c62f Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 15 Nov 2025 18:23:18 -0500 Subject: [PATCH 096/542] perl: remove sw_vers darwin patch The patch fails to apply on 5.42. It's no longer needed since: https://github.com/Perl/perl5/commit/55b5890c26936402c07d7ae9e41b2b9842e36842 --- pkgs/development/interpreters/perl/interpreter.nix | 5 +---- pkgs/development/interpreters/perl/sw_vers.patch | 13 ------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 pkgs/development/interpreters/perl/sw_vers.patch diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 70368487e61b..8c78a5324736 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -37,10 +37,7 @@ let ./no-sys-dirs.patch ] ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ./cpp-precomp.patch - ./sw_vers.patch - ] + ++ lib.optional stdenv.hostPlatform.isDarwin ./cpp-precomp.patch ++ lib.optional crossCompiling ./cross.patch; libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/pkgs/development/interpreters/perl/sw_vers.patch deleted file mode 100644 index 2e30dba92924..000000000000 --- a/pkgs/development/interpreters/perl/sw_vers.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/hints/darwin.sh b/hints/darwin.sh -index afadf53..80b7533 100644 ---- a/hints/darwin.sh -+++ b/hints/darwin.sh -@@ -329,7 +329,7 @@ EOM - # sw_vers output what we want - # "ProductVersion: 10.10.5" "10.10" - # "ProductVersion: 10.11" "10.11" -- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'` -+ prodvers="${MACOSX_DEPLOYMENT_TARGET:-10.12}" - case "$prodvers" in - 10.*) - add_macosx_version_min ccflags $prodvers From abe61db737b8d682dd632fd60ba071757021d4d6 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 16 Nov 2025 08:08:54 +0800 Subject: [PATCH 097/542] python-env: wrap python executable with --resolve-argv0 This commit, together with https://github.com/NixOS/nixpkgs/pull/442540, changes the way python environments are built: * When generating wrappers for python executables, we inherit argv[0] from the wrapper. This causes python to initialize its configuration in the environment with all the correct paths. * We also resolve argv[0] to absolute path when invoking python from PATH. This helps set python's prefix correctly on Darwin. The end result is that python environments no longer appear to be venvs, and behave more like a vanilla python installation. In addition it's possible to create a venv using an environment and use packages from both the environment and the venv. --- pkgs/development/interpreters/python/wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 55e86a8b9c36..914e4b354c49 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -50,6 +50,7 @@ let if [ "$prg" = "${python.executable}" ]; then makeWrapper "${python.interpreter}" "$out/bin/$prg" \ --inherit-argv0 \ + --resolve-argv0 \ ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} \ ${lib.concatStringsSep " " makeWrapperArgs} elif [ "$(readlink "$prg")" = "${python.executable}" ]; then From 6292cb6a988baf293317935e352d39431e62bbfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Nov 2025 05:23:48 +0000 Subject: [PATCH 098/542] publicsuffix-list: 0-unstable-2025-10-08 -> 0-unstable-2025-11-14 --- pkgs/by-name/pu/publicsuffix-list/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index 1edfa926dd47..c5560e186b7f 100644 --- a/pkgs/by-name/pu/publicsuffix-list/package.nix +++ b/pkgs/by-name/pu/publicsuffix-list/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2025-10-08"; + version = "0-unstable-2025-11-14"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "ee7dec4a99602baaf51879dd8469b6642881a494"; - hash = "sha256-IlR3dICad9EZeizI3V0A1YCQZiV/xg2GxtmTLG4EASU="; + rev = "64ba165cf391818a086139239c8fa223264eebcc"; + hash = "sha256-Ugou4SzYx9EtzcBtocCqhCZZaU1Sngvk1IEVAIJZ4KY="; }; dontBuild = true; From 93e142f083a31d4d500ffb8f5059a7936afdc9a8 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 15 Nov 2025 20:05:41 -0500 Subject: [PATCH 099/542] c-ares: fix IPv6 link-local DNS server support --- pkgs/development/libraries/c-ares/default.nix | 5 ++ .../c-ares/fix-link-local-dns-servers.patch | 50 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/libraries/c-ares/fix-link-local-dns-servers.patch diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 926859f60b2d..3bd0f48bc8f6 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { hash = "sha256-fZNXkOmvCBwlxJX9E8LPzaR5KYNBjpY1jvbnMg7gY0Y="; }; + patches = [ + # Fix being unable to use Ipv6 link-local DNS servers. See: https://github.com/c-ares/c-ares/pull/997. + ./fix-link-local-dns-servers.patch + ]; + outputs = [ "out" "dev" diff --git a/pkgs/development/libraries/c-ares/fix-link-local-dns-servers.patch b/pkgs/development/libraries/c-ares/fix-link-local-dns-servers.patch new file mode 100644 index 000000000000..07a5b5f2084c --- /dev/null +++ b/pkgs/development/libraries/c-ares/fix-link-local-dns-servers.patch @@ -0,0 +1,50 @@ +From 0fbeb87f65ad9e9e6cead10d778291db71489f34 Mon Sep 17 00:00:00 2001 +From: iucoen <68678186+iucoen@users.noreply.github.com> +Date: Thu, 5 Jun 2025 20:08:43 -0700 +Subject: [PATCH] Fix IPv6 link-local nameservers in /etc/resolv.conf (#997) + +There are two issues that broke link-local nameservers in resolv.conf +1. channel->sock_funcs needs to be initialized before +ares_init_by_sysconfig() +2. The aif_nametoindex and aif_indextoname function pointers were not +initlized at all. +--- + src/lib/ares_init.c | 4 ++-- + src/lib/ares_set_socket_functions.c | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/lib/ares_init.c b/src/lib/ares_init.c +index ae78262a11..ce6181833c 100644 +--- a/src/lib/ares_init.c ++++ b/src/lib/ares_init.c +@@ -271,6 +271,8 @@ int ares_init_options(ares_channel_t **channelptr, + goto done; + } + ++ ares_set_socket_functions_def(channel); ++ + /* Initialize Server List */ + channel->servers = + ares_slist_create(channel->rand_state, server_sort_cb, server_destroy_cb); +@@ -346,8 +348,6 @@ int ares_init_options(ares_channel_t **channelptr, + goto done; + } + +- ares_set_socket_functions_def(channel); +- + /* Initialize the event thread */ + if (channel->optmask & ARES_OPT_EVENT_THREAD) { + ares_event_thread_t *e = NULL; +diff --git a/src/lib/ares_set_socket_functions.c b/src/lib/ares_set_socket_functions.c +index cfe434327d..9994e81df5 100644 +--- a/src/lib/ares_set_socket_functions.c ++++ b/src/lib/ares_set_socket_functions.c +@@ -127,6 +127,8 @@ ares_status_t + channel->sock_funcs.asendto = funcs->asendto; + channel->sock_funcs.agetsockname = funcs->agetsockname; + channel->sock_funcs.abind = funcs->abind; ++ channel->sock_funcs.aif_nametoindex = funcs->aif_nametoindex; ++ channel->sock_funcs.aif_indextoname = funcs->aif_indextoname; + } + + /* Implement newer versions here ...*/ \ No newline at end of file From 9d8a1fff7dc251d75c75ca236dbb40b31b7fe230 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sun, 16 Nov 2025 09:41:52 -0800 Subject: [PATCH 100/542] haskellPackages.text-icu: disable homebrew flag on darwin By default text-icu sets homebrew=true. This can cause a nix build of text-icu to accidentally link the homebrew icu. It can also cause "doesn't work on my machine" issues when an old homebrew version with icu is installed on a mac and is accidentally picked up. --- pkgs/development/haskell-modules/configuration-darwin.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 9569f4b36597..35ac1db40d05 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -391,6 +391,10 @@ self: super: ''; }) super.rio; + # Don't use homebrew icu on macOS + # https://github.com/NixOS/nixpkgs/issues/462046 + text-icu = disableCabalFlag "homebrew" super.text-icu; + # https://github.com/haskell-crypto/cryptonite/issues/360 cryptonite = appendPatch ./patches/cryptonite-remove-argon2.patch super.cryptonite; From bd4121384165b2bd0d1828a8640b40bcd934fe66 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 14 Nov 2025 20:04:14 -0800 Subject: [PATCH 101/542] audit: enable risc-v --- pkgs/by-name/au/audit/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index d16ea8e58677..da374e413f20 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-legacy-actions" "--with-arm" "--with-aarch64" + "--with-riscv" "--with-io_uring" # allows putting audit files in /run/audit, which removes the requirement # to wait for tmpfiles to set up the /var/run -> /run symlink From 2e7e7c71d33e506e64a98f1a4732945b5fecf926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Lima?= Date: Mon, 17 Nov 2025 00:29:33 +0000 Subject: [PATCH 102/542] python3Packages.httpcore: remove unused dependencies --- pkgs/development/python-modules/httpcore/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 100a3d25e772..c3c364876a65 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -8,8 +8,6 @@ hatch-fancy-pypi-readme, h11, h2, - pproxy, - pytest-asyncio, pytest-httpbin, pytest-trio, pytestCheckHook, @@ -54,8 +52,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pproxy - pytest-asyncio pytest-httpbin pytest-trio pytestCheckHook From 3369fd951fe99649607f1f050adec556d616768b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 17 Nov 2025 09:37:42 +0200 Subject: [PATCH 103/542] python3Packages.numpy: 2.3.4 -> 2.3.5 Diff: https://github.com/numpy/numpy/compare/v2.3.4...v2.3.5 Changelog: https://github.com/numpy/numpy/releases/tag/v2.3.5 --- pkgs/development/python-modules/numpy/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 7bbd7781cb83..bff287b6b84d 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -60,7 +60,7 @@ let in buildPythonPackage rec { pname = "numpy"; - version = "2.3.4"; + version = "2.3.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -70,7 +70,7 @@ buildPythonPackage rec { repo = "numpy"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-MfL7UQeSuxJIEQzY/0LIuScyBCilINt8e+zAeUNPmH0="; + hash = "sha256-CMgJmsjPLgMCWN2iJk0OzcKIlnRRcayrTAns51S4B6k="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From 5f50a5563f6b37f95cec060ebbf4e2f99b3f7ac4 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 30 Dec 2024 21:43:39 -0500 Subject: [PATCH 104/542] ruby: Drop cargo, it's not used by yjit - https://github.com/ruby/ruby/blob/0b559eab0447905a784092824e5ea0999018cd01/yjit/yjit.mk#L22-L27 Only `$RUSTC`, which desugars to `rustc` by default, is used for yjit. Note that the plumbing for cargo does exist, but is used for development purposes only. Signed-off-by: Samuel Dionne-Riel (cherry picked from commit 90e5b96d7fc14cd8b4e290769f4d188e75329a32) --- pkgs/development/interpreters/ruby/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 33eaaf90ede2..8cd7959fd6d5 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -20,7 +20,6 @@ buildEnv, bundler, bundix, - cargo, rustPlatform, rustc, makeBinaryWrapper, @@ -104,7 +103,6 @@ let # - In $out/lib/libruby.so and/or $out/lib/libruby.dylib removeReferencesTo, jitSupport ? yjitSupport, - cargo, rustPlatform, rustc, yjitSupport ? yjitSupported, @@ -154,7 +152,6 @@ let ]) ++ ops yjitSupport [ rustPlatform.cargoSetupHook - cargo rustc ] ++ op useBaseRuby baseRuby; From 6c3170c73501a1bbf52175ead6770951f77f84bc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 17 Nov 2025 20:12:38 +0100 Subject: [PATCH 105/542] gst_all_1.gst-plugins-bad: Fix build on ppc64 --- pkgs/development/libraries/gstreamer/bad/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 5bee93cb5124..7e67bce24440 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -322,6 +322,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "doc" enableDocumentation) (lib.mesonEnable "directfb" false) (lib.mesonEnable "lcevcdecoder" lcevcdecSupport) + (lib.mesonEnable "ldac" ldacbtSupport) + (lib.mesonEnable "webrtcdsp" webrtcAudioProcessingSupport) + (lib.mesonEnable "isac" webrtcAudioProcessingSupport) ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only From ed348bddeda73d3966c3527afa616a0e62941f20 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 1 Nov 2025 22:52:14 +0000 Subject: [PATCH 106/542] pyright: fix cross compilation as `jq` is invoked at build time, we need to explicitly use the the build `jq` instead of the host `jq`. that can be done by placing it in `nativeBuildInputs`. --- pkgs/by-name/py/pyright/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 99f9dbab6530..d21cf6254984 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -16,12 +16,17 @@ let hash = "sha256-TQrmA65CzXar++79DLRWINaMsjoqNFdvNlwDzAcqOjM="; }; - patchedPackageJSON = runCommand "package.json" { } '' - ${jq}/bin/jq ' - .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser")) - | .scripts = { } - ' ${src}/package.json > $out - ''; + patchedPackageJSON = + runCommand "package.json" + { + nativeBuildInputs = [ jq ]; + } + '' + jq ' + .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser")) + | .scripts = { } + ' ${src}/package.json > $out + ''; pyright-root = buildNpmPackage { pname = "pyright-root"; From c78768e154c880add599fe81fc71598b4a40f268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:09 +0100 Subject: [PATCH 107/542] qgis: add man output --- pkgs/applications/gis/qgis/default.nix | 8 ++++---- pkgs/applications/gis/qgis/unwrapped.nix | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 74d5d6f732ce..fffd5ddd398d 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -14,14 +14,12 @@ }: let qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { - withGrass = withGrass; - withServer = withServer; - withWebKit = withWebKit; + inherit withGrass withServer withWebKit; }; in symlinkJoin { - inherit (qgis-unwrapped) version src; + inherit (qgis-unwrapped) version outputs src; pname = "qgis"; paths = [ qgis-unwrapped ]; @@ -42,6 +40,8 @@ symlinkJoin { --prefix PATH : $program_PATH \ --set PYTHONPATH $program_PYTHONPATH done + + ln -s ${qgis-unwrapped.man} $man ''; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index c102d9c23356..972e647da523 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -84,6 +84,10 @@ in mkDerivation rec { version = "3.44.3"; pname = "qgis-unwrapped"; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "qgis"; @@ -180,7 +184,7 @@ mkDerivation rec { dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' - # GRASS has to be availble on the command line even though we baked in + # GRASS has to be available on the command line even though we baked in # the path at build time using GRASS_PREFIX. # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. From e9efeac16ca11eabff1f69eb196beff4f0d72dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:27 +0100 Subject: [PATCH 108/542] gnuradio: add man output --- pkgs/applications/radio/gnuradio/shared.nix | 4 ++++ pkgs/applications/radio/gnuradio/wrapper.nix | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index 3eac7df05476..a5722c9058ee 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -27,6 +27,10 @@ let cross = stdenv.hostPlatform != stdenv.buildPlatform; in { + outputs = [ + "out" + "man" + ]; src = if overrideSrc != { } then overrideSrc diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 59e7dd7fa5d5..f7b96b1c1b95 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -79,7 +79,7 @@ let pythonEnv = unwrapped.python.withPackages (ps: pythonPkgs); pname = unwrapped.pname + "-wrapped"; - inherit (unwrapped) version; + inherit (unwrapped) outputs version; makeWrapperArgs = builtins.concatStringsSep " " ( [ ] @@ -214,15 +214,21 @@ let self = if doWrap then stdenv.mkDerivation { - inherit pname version passthru; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ + inherit + pname + outputs + version + passthru + ; + nativeBuildInputs = [ + makeWrapper xorg.lndir ]; buildCommand = '' mkdir $out cd $out - lndir -silent ${unwrapped} + lndir -silent ${unwrapped.out} + lndir -silent ${unwrapped.man} ${lib.optionalString (extraPackages != [ ]) ( builtins.concatStringsSep "\n" ( map (pkg: '' From 1af2b4e3f8c17631ec9fb7471f4eb1ab0026535b Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 17 Nov 2025 22:06:57 +0100 Subject: [PATCH 109/542] Revert "curl: enable c-ares" --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 894bcd0ee482..4bfa2678d5fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2514,7 +2514,6 @@ with pkgs; pslSupport = true; zstdSupport = true; http3Support = true; - c-aresSupport = true; } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { brotliSupport = true; From 14e2270069c66050d42fb751f7837bdd5c34ae7e Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Mon, 17 Nov 2025 20:35:49 +0000 Subject: [PATCH 110/542] uv: 0.9.9 -> 0.9.10 Changelog: https://github.com/astral-sh/uv/releases/tag/0.9.10 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 0ab5dfc75259..6d848d7cb933 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-i9vdpHA9EfXmw5fhK1tTZG0T2zOlDbjPCGBIizvQzZw="; + hash = "sha256-XpWBgFxBflyqsla0K83j/3aBgq5ccedQTa5PoaYs9f0="; }; - cargoHash = "sha256-RZkIjHQElqrj+UAz+q6w1CYW3E5/YW9uy2E5KpKvw+w="; + cargoHash = "sha256-9SEUnud2gu64+trX87GhpXzTlBaB/DLrXLjoZbGL0f4="; buildInputs = [ rust-jemalloc-sys From f5ab93698da8b54218f1bd8f9e0cc930108bfb63 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 17 Nov 2025 09:42:53 -0800 Subject: [PATCH 111/542] gnugrep: disable gnulib tests to fix Darwin cross --- pkgs/tools/text/gnugrep/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index e32a5a867c0f..c17e5e34f3b2 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -38,8 +38,9 @@ stdenv.mkDerivation { # Some gnulib tests fail # - on Musl: https://github.com/NixOS/nixpkgs/pull/228714 # - on x86_64-darwin: https://github.com/NixOS/nixpkgs/pull/228714#issuecomment-1576826330 + # - when building on Darwin (cross-compilation): test-nl_langinfo-mt fails postPatch = - if stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then + if stdenv.hostPlatform.isMusl || stdenv.buildPlatform.isDarwin then '' sed -i 's:gnulib-tests::g' Makefile.in '' From 9ad49c82b8f6a7795aeb2f2978d6da595dc27c8f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 18 Nov 2025 00:38:16 +0100 Subject: [PATCH 112/542] ladspa-sdk: 1.15 -> 1.17 --- pkgs/by-name/la/ladspa-sdk/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/ladspa-sdk/package.nix b/pkgs/by-name/la/ladspa-sdk/package.nix index 6f154ea224d8..561e7a3fec96 100644 --- a/pkgs/by-name/la/ladspa-sdk/package.nix +++ b/pkgs/by-name/la/ladspa-sdk/package.nix @@ -2,16 +2,19 @@ lib, stdenv, fetchurl, + libsndfile, }: stdenv.mkDerivation (finalAttrs: { pname = "ladspa-sdk"; - version = "1.15"; + version = "1.17"; src = fetchurl { url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz"; - sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; + hash = "sha256-J9JPJ55Lgb0X7L3MOOTEKZG7OIgmwLIABnzg61nT2ls="; }; + buildInputs = [ libsndfile ]; + sourceRoot = "ladspa_sdk_${finalAttrs.version}/src"; strictDeps = true; @@ -41,10 +44,11 @@ stdenv.mkDerivation (finalAttrs: { The LADSPA SDK, including the ladspa.h API header file, ten example LADSPA plugins and three example programs (applyplugin, analyseplugin and listplugins). + For just ladspa.h, use the ladspaH package. ''; homepage = "http://www.ladspa.org/ladspa_sdk/overview.html"; license = lib.licenses.lgpl2; - maintainers = [ lib.maintainers.magnetophon ]; + maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; }; }) From 8b1d51d891cda17113bf78e37062a8e57bfe999b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 18 Nov 2025 00:38:49 +0100 Subject: [PATCH 113/542] ladspaH: 1.15 -> 1.17 --- pkgs/by-name/la/ladspaH/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/ladspaH/package.nix b/pkgs/by-name/la/ladspaH/package.nix index 7c2515002b1c..fbd90eb81df7 100644 --- a/pkgs/by-name/la/ladspaH/package.nix +++ b/pkgs/by-name/la/ladspaH/package.nix @@ -5,10 +5,10 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ladspa.h"; - version = "1.15"; + version = "1.17"; src = fetchurl { url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz"; - sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; + hash = "sha256-J9JPJ55Lgb0X7L3MOOTEKZG7OIgmwLIABnzg61nT2ls="; }; installPhase = '' From d46fa2640e3d3f05b4da137be9b4f016cf043c37 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 17 Nov 2025 20:25:22 -0500 Subject: [PATCH 114/542] llvmPackages.clang-tools: add support for -cxx-isystem This is necessary after https://github.com/NixOS/nixpkgs/pull/445095, which moved libc++ to -cxx-isystem to improve compatibility with build systems that invoke `clang` to compile C++ code. --- pkgs/development/compilers/llvm/common/clang-tools/wrapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/clang-tools/wrapper b/pkgs/development/compilers/llvm/common/clang-tools/wrapper index 1008023fdc0d..2cb84ece693b 100755 --- a/pkgs/development/compilers/llvm/common/clang-tools/wrapper +++ b/pkgs/development/compilers/llvm/common/clang-tools/wrapper @@ -4,7 +4,7 @@ buildcpath() { local path after while (( $# )); do case $1 in - -isystem) + -isystem|-cxx-isystem) shift path=$path${path:+':'}$1 ;; From 3208867a9dc038d8cb195bfe453f70ba8c60506e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 18 Nov 2025 06:22:32 +0000 Subject: [PATCH 115/542] libimagequant: 4.4.0 -> 4.4.1 Changes: https://github.com/ImageOptim/libimagequant/compare/4.4.0...4.4.1 --- pkgs/by-name/li/libimagequant/Cargo.lock | 99 +++++++++++++++-------- pkgs/by-name/li/libimagequant/package.nix | 4 +- 2 files changed, 66 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/li/libimagequant/Cargo.lock b/pkgs/by-name/li/libimagequant/Cargo.lock index eaed4b693bfe..989062e597b6 100644 --- a/pkgs/by-name/li/libimagequant/Cargo.lock +++ b/pkgs/by-name/li/libimagequant/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "arrayvec" @@ -16,15 +16,15 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "bitflags" -version = "2.8.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bytemuck" -version = "1.21.0" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" [[package]] name = "c_test" @@ -36,24 +36,25 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.10" +version = "1.2.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" +checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36" dependencies = [ + "find-msvc-tools", "shlex", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -85,23 +86,30 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "find-msvc-tools" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", + "libz-rs-sys", "miniz_oxide", ] [[package]] name = "imagequant" -version = "4.4.0" +version = "4.4.1" dependencies = [ "arrayvec", "lodepng", @@ -122,15 +130,24 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.169" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" + +[[package]] +name = "libz-rs-sys" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd" +dependencies = [ + "zlib-rs", +] [[package]] name = "lodepng" -version = "3.11.0" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7720115060cd38dcfe5c758525a43fd34dc615d0566374212ff0dc3b6151eac" +checksum = "77a32335d22e44238e2bb0b4d726964d18952ce1f1279ec3305305d2c61539eb" dependencies = [ "crc32fast", "flate2", @@ -140,24 +157,25 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.3" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -165,9 +183,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -175,9 +193,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.50" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" +checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce" dependencies = [ "bytemuck", ] @@ -189,11 +207,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] -name = "thread_local" -version = "1.1.8" +name = "simd-adler32" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "thread_local" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ "cfg-if", - "once_cell", ] + +[[package]] +name = "zlib-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix index 687e006e47b0..dc45be56d77d 100644 --- a/pkgs/by-name/li/libimagequant/package.nix +++ b/pkgs/by-name/li/libimagequant/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "libimagequant"; rev = version; - hash = "sha256-c9j0wVwTWtNrPy9UUsc0Gxbe6lP82C3DMXe+k/ZBYEw="; + hash = "sha256-A7idjAAJ+syqIahyU+LPZBF+MLxVDymY+M3HM7d/qk0="; }; cargoLock = { From 6724e26a0862b99e4578f54c8262daf0bd159fd4 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Mon, 17 Nov 2025 12:00:00 +0000 Subject: [PATCH 116/542] Fix shebang of installed python scripts Closes: https://github.com/NixOS/nixpkgs/pull/449340 Fixes: https://github.com/NixOS/nixpkgs/issues/449325 --- .../interpreters/python/hooks/default.nix | 1 + .../python/hooks/pypa-install-hook.sh | 2 +- .../python-modules/installer/cross.patch | 67 +++++++++++++++++++ .../python-modules/installer/default.nix | 16 +++-- 4 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/installer/cross.patch diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index b3c97de30317..d50e12dc7262 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -138,6 +138,7 @@ in propagatedBuildInputs = [ installer ]; substitutions = { inherit pythonInterpreter pythonSitePackages; + python = python.interpreter; }; } ./pypa-install-hook.sh ) diff --git a/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh index f6d60be35d21..54e6375bb861 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh @@ -8,7 +8,7 @@ pypaInstallPhase() { pushd dist >/dev/null for wheel in *.whl; do - @pythonInterpreter@ -m installer --prefix "$out" "$wheel" + @pythonInterpreter@ -m installer --prefix "$out" --executable "@python@" "$wheel" echo "Successfully installed $wheel" done diff --git a/pkgs/development/python-modules/installer/cross.patch b/pkgs/development/python-modules/installer/cross.patch new file mode 100644 index 000000000000..3e7f185f041d --- /dev/null +++ b/pkgs/development/python-modules/installer/cross.patch @@ -0,0 +1,67 @@ +diff --git a/src/installer/__main__.py b/src/installer/__main__.py +index 51014b9..45682d0 100644 +--- a/src/installer/__main__.py ++++ b/src/installer/__main__.py +@@ -30,6 +30,13 @@ def _get_main_parser() -> argparse.ArgumentParser: + type=str, + help="override prefix to install packages to", + ) ++ parser.add_argument( ++ "--executable", ++ metavar="path", ++ default=sys.executable, ++ type=str, ++ help="#! executable to install scripts with (default=sys.executable)", ++ ) + parser.add_argument( + "--compile-bytecode", + action="append", +@@ -86,7 +93,7 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None: + with WheelFile.open(args.wheel) as source: + destination = SchemeDictionaryDestination( + scheme_dict=_get_scheme_dict(source.distribution, prefix=args.prefix), +- interpreter=sys.executable, ++ interpreter=args.executable, + script_kind=get_launcher_kind(), + bytecode_optimization_levels=bytecode_levels, + destdir=args.destdir, +@@ -94,5 +101,6 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None: + installer.install(source, destination, {}) + + ++ + if __name__ == "__main__": # pragma: no cover + _main(sys.argv[1:], "python -m installer") +diff --git a/tests/test_main.py b/tests/test_main.py +index 391a13d..d7b4192 100644 +--- a/tests/test_main.py ++++ b/tests/test_main.py +@@ -53,6 +53,28 @@ def test_main_prefix(fancy_wheel, tmp_path): + } + + ++def test_main_executable(fancy_wheel, tmp_path): ++ destdir = tmp_path / "dest" ++ ++ main( ++ [ ++ str(fancy_wheel), ++ "-d", ++ str(destdir), ++ "--executable", ++ "/monty/python3.x", ++ ], ++ "python -m installer", ++ ) ++ ++ installed_scripts = destdir.rglob("bin/*") ++ ++ for f in installed_scripts: ++ with f.open("rb") as fp: ++ shebang = fp.readline() ++ assert shebang == b"#!/monty/python3.x\n" ++ ++ + def test_main_no_pyc(fancy_wheel, tmp_path): + destdir = tmp_path / "dest" + diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix index 7170c110673e..377c3637d04a 100644 --- a/pkgs/development/python-modules/installer/default.nix +++ b/pkgs/development/python-modules/installer/default.nix @@ -21,11 +21,17 @@ buildPythonPackage rec { hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A="; }; - patches = lib.optionals (pythonAtLeast "3.13") [ - # Fix compatibility with Python 3.13 - # https://github.com/pypa/installer/pull/201 - ./python313-compat.patch - ]; + patches = + lib.optionals (pythonAtLeast "3.13") [ + # Fix compatibility with Python 3.13 + # https://github.com/pypa/installer/pull/201 + ./python313-compat.patch + ] + ++ [ + # Add -m flag to installer to correctly support cross + # https://github.com/pypa/installer/pull/258 + ./cross.patch + ]; nativeBuildInputs = [ flit-core ]; From fef47ea6e3b4157385cae080fa82d6a459a6fe13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Nov 2025 12:45:40 +0000 Subject: [PATCH 117/542] vim: 9.1.1869 -> 9.1.1918 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index eb20cd063c8e..16389cc824f7 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.1869"; + version = "9.1.1918"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-AHx4AHsJAsEE5LRzKgBeV3LoCaoHUB+0/gq7kOHObMk="; + hash = "sha256-NU/A7yWcLaC+wqsfiHYVhnSZHGDao6+Oib/bSFNSVyQ="; }; enableParallelBuilding = true; From e35cf1c2c1f2b831a862e9986d1e5bfd26b878fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Nov 2025 13:04:04 +0000 Subject: [PATCH 118/542] sphinxygen: 1.0.10 -> 1.0.12 --- pkgs/by-name/sp/sphinxygen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/sphinxygen/package.nix b/pkgs/by-name/sp/sphinxygen/package.nix index 2d227085768a..3d24ecb148a9 100644 --- a/pkgs/by-name/sp/sphinxygen/package.nix +++ b/pkgs/by-name/sp/sphinxygen/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sphinxygen"; - version = "1.0.10"; + version = "1.0.12"; pyproject = true; src = fetchFromGitLab { owner = "drobilla"; repo = "sphinxygen"; tag = "v${version}"; - hash = "sha256-Xii5pDa1eHrHUKERC2gDif/NIkpab/IZYBRvMq9YKtE="; + hash = "sha256-54D7h6JCsUEh3y6WmpSaMFlRBElve1lscbQtJz+OJTQ="; }; build-system = with python3.pkgs; [ setuptools ]; From fd7160eed0900a192e728a0cc8b7e223db5c5f37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Nov 2025 16:03:53 +0000 Subject: [PATCH 119/542] gn: 0-unstable-2025-08-29 -> 0-unstable-2025-09-18 --- pkgs/by-name/gn/gn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix index 286cb5d53af6..8255a7301bf8 100644 --- a/pkgs/by-name/gn/gn/package.nix +++ b/pkgs/by-name/gn/gn/package.nix @@ -11,11 +11,11 @@ version ? # This is a workaround for update-source-version to be able to update this let - _version = "0-unstable-2025-08-29"; + _version = "0-unstable-2025-09-18"; in _version, - rev ? "5d0a4153b0bcc86c5a23310d5b648a587be3c56d", - hash ? "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg=", + rev ? "81b24e01531ecf0eff12ec9359a555ec3944ec4e", + hash ? "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ=", }: stdenv.mkDerivation { From aa2285398433f652305ec2dee6573ab0ca8c2dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:33 +0100 Subject: [PATCH 120/542] R: add man output --- pkgs/applications/science/math/R/default.nix | 1 + pkgs/development/r-modules/wrapper.nix | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index b39a005bfbd1..e306c33223ee 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" + "man" "tex" ]; diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index 8d7445a50e97..e1b96aecfe28 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -11,6 +11,11 @@ symlinkJoin { preferLocalBuild = true; allowSubstitutes = false; + outputs = [ + "out" + "man" + ]; + buildInputs = [ R ] ++ recommendedPackages ++ packages; paths = [ R ]; @@ -24,6 +29,8 @@ symlinkJoin { makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \ --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" done + + ln -s ${R.man} $man ''; # Make the list of recommended R packages accessible to other packages such as rpy2 From d343dbf7c42dc463a86541d626163370930e4e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:39 +0100 Subject: [PATCH 121/542] python313Packages.ipython: add man output --- pkgs/development/python-modules/ipython/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index bd0bd4544c10..2f846a81ae1d 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { pname = "ipython"; version = "9.5.0"; + outputs = [ + "out" + "man" + ]; pyproject = true; src = fetchPypi { From 041e76d21e8cbb85abecfdcc625199802c10caa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:44 +0100 Subject: [PATCH 122/542] lilypond: add man output --- pkgs/misc/lilypond/default.nix | 4 ++++ pkgs/misc/lilypond/with-fonts.nix | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 733aa6288957..9bd6351bd2b1 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { pname = "lilypond"; version = "2.24.4"; + outputs = [ + "out" + "man" + ]; src = fetchzip { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index ed2917b369a6..95bb75318e05 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -7,7 +7,12 @@ }: lib.appendToName "with-fonts" (symlinkJoin { - inherit (lilypond) meta name version; + inherit (lilypond) + pname + outputs + version + meta + ; paths = [ lilypond ] ++ openlilylib-fonts.all; @@ -15,7 +20,9 @@ lib.appendToName "with-fonts" (symlinkJoin { postBuild = '' for p in $out/bin/*; do - wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}" + wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}" done + + ln -s ${lilypond.man} $man ''; }) From 3794fda5edc189e1aa791442e94b01640ff1bdde Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 17 Nov 2025 13:40:28 -0800 Subject: [PATCH 123/542] diffutils: disable gnulib tests to fix Darwin cross --- pkgs/tools/text/diffutils/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index aa42eeaf0b9f..a6c90629445a 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -44,8 +44,14 @@ stdenv.mkDerivation rec { # Disable stack-related gnulib tests on x86_64-darwin because they have problems running under # Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow and test-sigaction fail. + # Disable all gnulib tests when building on Darwin due to test-nl_langinfo-mt failure + # known by upstream https://www.mail-archive.com/bug-gnulib@gnu.org/msg50806.html postPatch = - if + if stdenv.buildPlatform.isDarwin then + '' + sed -i 's:gnulib-tests::g' Makefile.in + '' + else if ((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isAarch32)) then '' From d3503bd57f16c8cd67ef04bd5cd6b0ddfdd8d027 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 19 Nov 2025 15:17:11 -0500 Subject: [PATCH 124/542] typstPackages: Use makeScope so that it has typical pkgset attrs --- doc/languages-frameworks/typst.section.md | 2 +- pkgs/by-name/ty/typst/typst-packages.nix | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/typst.section.md b/doc/languages-frameworks/typst.section.md index 5d95f44ae7ad..711b6ce193bd 100644 --- a/doc/languages-frameworks/typst.section.md +++ b/doc/languages-frameworks/typst.section.md @@ -22,7 +22,7 @@ Since **Typst Universe** does not provide a way to fetch a package with a specif ```nix typst.withPackages.override (old: { - typstPackages = old.typstPackages.extend ( + typstPackages = old.typstPackages.overrideScope ( _: previous: { polylux_0_4_0 = previous.polylux_0_4_0.overrideAttrs (oldPolylux: { src = oldPolylux.src.overrideAttrs { outputHash = YourUpToDatePolyluxHash; }; diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix index 6a460aafb80f..382aed587283 100644 --- a/pkgs/by-name/ty/typst/typst-packages.nix +++ b/pkgs/by-name/ty/typst/typst-packages.nix @@ -1,13 +1,14 @@ { lib, callPackage, + newScope, }: let toPackageName = name: version: "${name}_${lib.replaceStrings [ "." ] [ "_" ] version}"; in -lib.makeExtensible ( - final: +lib.makeScope newScope ( + self: lib.recurseIntoAttrs ( lib.foldlAttrs ( packageSet: pname: versionSet: @@ -16,7 +17,7 @@ lib.makeExtensible ( subPackageSet: version: packageSpec: subPackageSet // { - ${toPackageName pname version} = callPackage ( + ${toPackageName pname version} = self.callPackage ( { lib, buildTypstPackage, @@ -32,7 +33,7 @@ lib.makeExtensible ( }; typstDeps = builtins.filter (x: x != null) ( - lib.map (d: (lib.attrsets.attrByPath [ d ] null final)) packageSpec.typstDeps + lib.map (d: (lib.attrsets.attrByPath [ d ] null self)) packageSpec.typstDeps ); meta = { @@ -46,7 +47,7 @@ lib.makeExtensible ( } ) { } versionSet) // { - ${pname} = final.${toPackageName pname (lib.last (lib.attrNames versionSet))}; + ${pname} = self.${toPackageName pname (lib.last (lib.attrNames versionSet))}; } ) { } (lib.importTOML ./typst-packages-from-universe.toml) ) From 057a0e1fb3ee82e56e5bc40933d76cf8a68e1211 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 19 Nov 2025 15:20:15 -0500 Subject: [PATCH 125/542] typstPackages: Move recurseIntoAttrs to all-packages This simplifies the in-derivation logic --- pkgs/by-name/ty/typst/typst-packages.nix | 78 ++++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix index 382aed587283..fbad5ec206c1 100644 --- a/pkgs/by-name/ty/typst/typst-packages.nix +++ b/pkgs/by-name/ty/typst/typst-packages.nix @@ -9,46 +9,44 @@ let in lib.makeScope newScope ( self: - lib.recurseIntoAttrs ( - lib.foldlAttrs ( - packageSet: pname: versionSet: - packageSet - // (lib.foldlAttrs ( - subPackageSet: version: packageSpec: - subPackageSet - // { - ${toPackageName pname version} = self.callPackage ( - { - lib, - buildTypstPackage, - fetchzip, - }: - buildTypstPackage (finalAttrs: { - inherit pname version; - - src = fetchzip { - inherit (packageSpec) hash; - url = "https://packages.typst.org/preview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - stripRoot = false; - }; - - typstDeps = builtins.filter (x: x != null) ( - lib.map (d: (lib.attrsets.attrByPath [ d ] null self)) packageSpec.typstDeps - ); - - meta = { - inherit (packageSpec) description; - maintainers = with lib.maintainers; [ cherrypiejam ]; - license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) packageSpec.license; - } - // (if packageSpec ? "homepage" then { inherit (packageSpec) homepage; } else { }); - }) - ) { }; - } - ) { } versionSet) + lib.foldlAttrs ( + packageSet: pname: versionSet: + packageSet + // (lib.foldlAttrs ( + subPackageSet: version: packageSpec: + subPackageSet // { - ${pname} = self.${toPackageName pname (lib.last (lib.attrNames versionSet))}; + ${toPackageName pname version} = self.callPackage ( + { + lib, + buildTypstPackage, + fetchzip, + }: + buildTypstPackage (finalAttrs: { + inherit pname version; + + src = fetchzip { + inherit (packageSpec) hash; + url = "https://packages.typst.org/preview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + stripRoot = false; + }; + + typstDeps = builtins.filter (x: x != null) ( + lib.map (d: (lib.attrsets.attrByPath [ d ] null self)) packageSpec.typstDeps + ); + + meta = { + inherit (packageSpec) description; + maintainers = with lib.maintainers; [ cherrypiejam ]; + license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) packageSpec.license; + } + // (if packageSpec ? "homepage" then { inherit (packageSpec) homepage; } else { }); + }) + ) { }; } - ) { } (lib.importTOML ./typst-packages-from-universe.toml) - ) + ) { } versionSet) + // { + ${pname} = self.${toPackageName pname (lib.last (lib.attrNames versionSet))}; + } + ) { } (lib.importTOML ./typst-packages-from-universe.toml) ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52e3564b51b3..594bb122fbcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12413,7 +12413,7 @@ with pkgs; buildTypstPackage = callPackage ../build-support/build-typst-package.nix { }; - typstPackages = typst.packages; + typstPackages = recurseIntoAttrs typst.packages; ueberzug = with python3Packages; toPythonApplication ueberzug; From 60169950cedbe515d57f45534117d25f4a23eda1 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 19 Nov 2025 15:28:32 -0500 Subject: [PATCH 126/542] typstPackages: move universe builder to its own file --- .../ty/typst/build-universe-package.nix | 32 +++++++++++++++++ pkgs/by-name/ty/typst/typst-packages.nix | 36 +++++-------------- 2 files changed, 41 insertions(+), 27 deletions(-) create mode 100644 pkgs/by-name/ty/typst/build-universe-package.nix diff --git a/pkgs/by-name/ty/typst/build-universe-package.nix b/pkgs/by-name/ty/typst/build-universe-package.nix new file mode 100644 index 000000000000..0a399e044d35 --- /dev/null +++ b/pkgs/by-name/ty/typst/build-universe-package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildTypstPackage, + fetchzip, + # typstPackages from within the scope + packages, + hash, + description, + license, + typstDeps, + homepage ? null, +}: +buildTypstPackage (finalAttrs: { + inherit pname version; + + src = fetchzip { + inherit hash; + url = "https://packages.typst.org/preview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + stripRoot = false; + }; + + typstDeps = builtins.filter (x: x != null) ( + lib.map (d: (lib.attrsets.attrByPath [ d ] null packages)) typstDeps + ); + + meta = { + inherit description; + maintainers = with lib.maintainers; [ cherrypiejam ]; + license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) license; + } + // (if homepage != null then { inherit homepage; } else { }); +}) diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix index fbad5ec206c1..841c44143de3 100644 --- a/pkgs/by-name/ty/typst/typst-packages.nix +++ b/pkgs/by-name/ty/typst/typst-packages.nix @@ -16,33 +16,15 @@ lib.makeScope newScope ( subPackageSet: version: packageSpec: subPackageSet // { - ${toPackageName pname version} = self.callPackage ( - { - lib, - buildTypstPackage, - fetchzip, - }: - buildTypstPackage (finalAttrs: { - inherit pname version; - - src = fetchzip { - inherit (packageSpec) hash; - url = "https://packages.typst.org/preview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - stripRoot = false; - }; - - typstDeps = builtins.filter (x: x != null) ( - lib.map (d: (lib.attrsets.attrByPath [ d ] null self)) packageSpec.typstDeps - ); - - meta = { - inherit (packageSpec) description; - maintainers = with lib.maintainers; [ cherrypiejam ]; - license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) packageSpec.license; - } - // (if packageSpec ? "homepage" then { inherit (packageSpec) homepage; } else { }); - }) - ) { }; + ${toPackageName pname version} = self.callPackage ./build-universe-package.nix { + inherit (packageSpec) + hash + description + license + typstDeps + homepage + ; + }; } ) { } versionSet) // { From 6b482e433f7ffaa2a3cd8418921c57456b6360ba Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 19 Nov 2025 15:42:44 -0500 Subject: [PATCH 127/542] typstPackages: Make a dedicated Universe package builder --- .../ty/typst/build-universe-package.nix | 67 ++++++++++++------- pkgs/by-name/ty/typst/typst-packages.nix | 7 +- 2 files changed, 49 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ty/typst/build-universe-package.nix b/pkgs/by-name/ty/typst/build-universe-package.nix index 0a399e044d35..a7628f6412dd 100644 --- a/pkgs/by-name/ty/typst/build-universe-package.nix +++ b/pkgs/by-name/ty/typst/build-universe-package.nix @@ -2,31 +2,50 @@ lib, buildTypstPackage, fetchzip, - # typstPackages from within the scope - packages, - hash, - description, - license, - typstDeps, - homepage ? null, + typstPackages, }: -buildTypstPackage (finalAttrs: { - inherit pname version; +lib.extendMkDerivation { + inheritFunctionArgs = false; + constructDrv = buildTypstPackage; - src = fetchzip { - inherit hash; - url = "https://packages.typst.org/preview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - stripRoot = false; - }; + excludeDrvArgNames = [ + "description" + "hash" + "license" + "homepage" + "typstDeps" + ]; - typstDeps = builtins.filter (x: x != null) ( - lib.map (d: (lib.attrsets.attrByPath [ d ] null packages)) typstDeps - ); + extendDrvArgs = + finalAttrs: + { + pname, + version, + description, + hash, + license, + homepage ? null, + typstDeps ? [ ], + }: + { + src = fetchzip { + inherit hash; + url = "https://packages.typst.org/preview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + stripRoot = false; + }; - meta = { - inherit description; - maintainers = with lib.maintainers; [ cherrypiejam ]; - license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) license; - } - // (if homepage != null then { inherit homepage; } else { }); -}) + typstDeps = builtins.filter (x: x != null) ( + lib.map (d: (lib.attrsets.attrByPath [ d ] null typstPackages)) typstDeps + ); + + meta = { + inherit description; + maintainers = with lib.maintainers; [ + cherrypiejam + RossSmyth + ]; + license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) license; + } + // lib.optionalAttrs (homepage != null) { inherit homepage; }; + }; +} diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix index 841c44143de3..d8424763c1b5 100644 --- a/pkgs/by-name/ty/typst/typst-packages.nix +++ b/pkgs/by-name/ty/typst/typst-packages.nix @@ -9,6 +9,10 @@ let in lib.makeScope newScope ( self: + let + # Not public, so do not expose to the package set + buildUniversePackage = self.callPackage ./build-universe-package.nix { typstPackages = self; }; + in lib.foldlAttrs ( packageSet: pname: versionSet: packageSet @@ -16,7 +20,8 @@ lib.makeScope newScope ( subPackageSet: version: packageSpec: subPackageSet // { - ${toPackageName pname version} = self.callPackage ./build-universe-package.nix { + ${toPackageName pname version} = buildUniversePackage { + inherit pname version; inherit (packageSpec) hash description From 86f28f3ab70ddfcc4cb8f1f8d7197180ea192244 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 19 Nov 2025 16:01:58 -0500 Subject: [PATCH 128/542] typstPackages: Simplify the building expression --- pkgs/by-name/ty/typst/typst-packages.nix | 28 +++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix index d8424763c1b5..f32392272d20 100644 --- a/pkgs/by-name/ty/typst/typst-packages.nix +++ b/pkgs/by-name/ty/typst/typst-packages.nix @@ -13,14 +13,18 @@ lib.makeScope newScope ( # Not public, so do not expose to the package set buildUniversePackage = self.callPackage ./build-universe-package.nix { typstPackages = self; }; in - lib.foldlAttrs ( - packageSet: pname: versionSet: - packageSet - // (lib.foldlAttrs ( - subPackageSet: version: packageSpec: - subPackageSet - // { - ${toPackageName pname version} = buildUniversePackage { + lib.pipe (lib.importTOML ./typst-packages-from-universe.toml) [ + (lib.mapAttrsToListRecursive ( + path: packageSet: + let + # Path is always [ path version ] + pname = lib.head path; + version = lib.last path; + in + { + name = toPackageName pname version; + + value = buildUniversePackage { inherit pname version; inherit (packageSpec) hash @@ -31,9 +35,7 @@ lib.makeScope newScope ( ; }; } - ) { } versionSet) - // { - ${pname} = self.${toPackageName pname (lib.last (lib.attrNames versionSet))}; - } - ) { } (lib.importTOML ./typst-packages-from-universe.toml) + )) + lib.listToAttrs + ] ) From 4cb533cb2660e19b40e6d3be72b871738bb9c4df Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 19 Nov 2025 16:28:11 -0500 Subject: [PATCH 129/542] typstPackages: Simplify packageset creation --- pkgs/by-name/ty/typst/typst-packages.nix | 83 ++++++++++++++++-------- 1 file changed, 57 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix index f32392272d20..7f9673f5fc44 100644 --- a/pkgs/by-name/ty/typst/typst-packages.nix +++ b/pkgs/by-name/ty/typst/typst-packages.nix @@ -3,7 +3,6 @@ callPackage, newScope, }: - let toPackageName = name: version: "${name}_${lib.replaceStrings [ "." ] [ "_" ] version}"; in @@ -12,30 +11,62 @@ lib.makeScope newScope ( let # Not public, so do not expose to the package set buildUniversePackage = self.callPackage ./build-universe-package.nix { typstPackages = self; }; - in - lib.pipe (lib.importTOML ./typst-packages-from-universe.toml) [ - (lib.mapAttrsToListRecursive ( - path: packageSet: - let - # Path is always [ path version ] - pname = lib.head path; - version = lib.last path; - in - { - name = toPackageName pname version; - value = buildUniversePackage { - inherit pname version; - inherit (packageSpec) - hash - description - license - typstDeps - homepage - ; - }; - } - )) - lib.listToAttrs - ] + # Creates a versioned package out of a name, version, and packageSpec + makeVersionedPackage = pname: version: packageSpec: { + name = toPackageName pname version; + + value = buildUniversePackage { + inherit pname version; + inherit (packageSpec) + hash + description + license + typstDeps + homepage + ; + }; + }; + + # Create a derivation for each package. This is in the format of + # typstPackages.${package}_version + versionedPackages = lib.pipe (lib.importTOML ./typst-packages-from-universe.toml) [ + # 1. Create a list of versioned packages + # Only recurse 2 levels deep because the leaf attrs are the pkgspec attrs + (lib.mapAttrsToListRecursiveCond (path: _: (lib.length path) < 2) ( + path: packageSpec: + let + # Path is always [ path version ] + pname = lib.head path; + version = lib.last path; + in + { + name = toPackageName pname version; + value = makeVersionedPackage pname version packageSpec; + } + )) + # 2. Transform the list into a flat attrset + lib.listToAttrs + ]; + + # Take two version strings and return the newer one + selectNewerVersion = v1: v2: if lib.versionOlder v1 v2 then v2 else v1; + + # Select the latest version of each package to represent the + # unversioned derivation in the format of: + # typstPackages.${package} + latestPackages = lib.pipe (lib.importTOML ./typst-packages-from-universe.toml) [ + # Take in the attrset of each package and all its versions + # Compare each version and find the latest one. + # Then select it from the versioned package set + (lib.mapAttrs ( + pname: versions: + let + latestVersion = lib.foldl' selectNewerVersion "0.0.0" (lib.attrNames versions); + in + versionedPackages.${toPackageName pname latestVersion} + )) + ]; + in + versionedPackages // latestPackages ) From 58fec82686298f1313ea598effd310507855b84f Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 19 Nov 2025 15:51:06 +0000 Subject: [PATCH 130/542] versionCheckHook: Check for --version first More likely to find the version number in `--version` than `--help` so look for that first. --- doc/hooks/versionCheckHook.section.md | 2 +- pkgs/by-name/ve/versionCheckHook/hook.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md index 229aebc538a5..f2fa14bb07a5 100644 --- a/doc/hooks/versionCheckHook.section.md +++ b/doc/hooks/versionCheckHook.section.md @@ -30,7 +30,7 @@ The variables that this phase control are: - `dontVersionCheck`: Disable adding this hook to the [`preInstallCheckHooks`](#ssec-installCheck-phase). Useful if you do want to load the bash functions of the hook, but run them differently. - `versionCheckProgram`: The full path to the program that should print the `${version}` string. Defaults to using the first non-empty value `$binary` out of `${NIX_MAIN_PROGRAM}` and `${pname}`, in that order, to build roughly `${placeholder "out"}/bin/$binary`. `${NIX_MAIN_PROGRAM}`'s value comes from `meta.mainProgram`, and does not normally need to be set explicitly. When setting `versionCheckProgram`, using `$out` directly won't work, as environment variables from this variable are not expanded by the hook. Hence using `placeholder "out"` is unavoidable. -- `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--help` and then `--version`. Examples: `version`, `-V`, `-v`. +- `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--version` and then `--help`. Examples: `version`, `-V`, `-v`. - `versionCheckKeepEnvironment`: A list of environment variables to keep and pass to the command. Only those variables should be added to this list that are actually required for the version command to work. If it is not feasible to explicitly list all these environment variables you can set this parameter to the special value `"*"` to disable the `--ignore-environment` flag and thus keep all environment variables. - `preVersionCheck`: A hook to run before the check is done. - `postVersionCheck`: A hook to run after the check is done. diff --git a/pkgs/by-name/ve/versionCheckHook/hook.sh b/pkgs/by-name/ve/versionCheckHook/hook.sh index 4a977fe7a888..080aca4bd551 100644 --- a/pkgs/by-name/ve/versionCheckHook/hook.sh +++ b/pkgs/by-name/ve/versionCheckHook/hook.sh @@ -61,7 +61,7 @@ versionCheckHook(){ exit 2 fi if [[ -z "${versionCheckProgramArg}" ]]; then - for cmdArg in "--help" "--version"; do + for cmdArg in "--version" "--help"; do echoPrefix="$(_handleCmdOutput "$cmdProgram" "$cmdArg" "$versionCheckKeepEnvironment")" if [[ "$echoPrefix" == "Successfully managed to" ]]; then break From 116036d574992ee61d97d16c4b065dca3f871974 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 20 Nov 2025 10:26:35 +0000 Subject: [PATCH 131/542] treewide: Remove redundant `versionCheckProgramArg = "--version";` with: ```shell git grep -l -e 'versionCheckProgramArg = "--version";' -e 'versionCheckProgramArg = \[ "--version" \];' | while read f; do sed -i '/versionCheckProgramArg/d' "$f" sed -i '/^$/N;/\n$/D' "$f" done ``` --- pkgs/applications/blockchains/bitcoin-knots/default.nix | 1 - pkgs/applications/blockchains/bitcoin/default.nix | 1 - .../editors/vim/plugins/non-generated/cord-nvim/default.nix | 1 - .../networking/cluster/helm/plugins/helm-schema.nix | 1 - pkgs/applications/networking/cluster/k3s/builder.nix | 1 - .../networking/cluster/kubectl-view-allocations/default.nix | 1 - pkgs/applications/networking/irc/weechat/default.nix | 1 - pkgs/applications/networking/mullvad/mullvad.nix | 1 - pkgs/applications/virtualization/docker/default.nix | 1 - pkgs/applications/virtualization/singularity/generic.nix | 1 - pkgs/by-name/_1/_1password-cli/package.nix | 1 - pkgs/by-name/ae/aerc/package.nix | 1 - pkgs/by-name/ah/ahoy/package.nix | 2 -- pkgs/by-name/ai/aichat/package.nix | 1 - pkgs/by-name/ai/air-formatter/package.nix | 1 - pkgs/by-name/al/alertmanager-gotify-bridge/package.nix | 1 - pkgs/by-name/am/amazon-q-cli/package.nix | 1 - pkgs/by-name/am/ameba-ls/package.nix | 1 - pkgs/by-name/an/andcli/package.nix | 1 - pkgs/by-name/an/ansible-doctor/package.nix | 2 -- pkgs/by-name/ar/arp-scan-rs/package.nix | 2 -- pkgs/by-name/ar/arsenal/package.nix | 1 - pkgs/by-name/ar/arti/package.nix | 1 - pkgs/by-name/as/asciinema-agg/package.nix | 1 - pkgs/by-name/as/asciinema_3/package.nix | 1 - pkgs/by-name/as/ast-grep/package.nix | 1 - pkgs/by-name/as/astyle/package.nix | 1 - pkgs/by-name/au/automatic-timezoned/package.nix | 1 - pkgs/by-name/av/avalanche-cli/package.nix | 1 - pkgs/by-name/av/avro-cpp/package.nix | 1 - pkgs/by-name/aw/await/package.nix | 1 - pkgs/by-name/aw/aws-nuke/package.nix | 2 -- pkgs/by-name/aw/awsebcli/package.nix | 1 - pkgs/by-name/az/azurehound/package.nix | 2 -- pkgs/by-name/ba/bacon/package.nix | 1 - pkgs/by-name/ba/bagr/package.nix | 1 - pkgs/by-name/ba/bark/package.nix | 1 - pkgs/by-name/ba/basedpyright/package.nix | 1 - pkgs/by-name/ba/bashunit/package.nix | 1 - pkgs/by-name/ba/basilk/package.nix | 1 - pkgs/by-name/be/bento/package.nix | 1 - pkgs/by-name/bf/bfg-repo-cleaner/package.nix | 1 - pkgs/by-name/bi/bitwarden-cli/package.nix | 1 - pkgs/by-name/bm/bmputil/package.nix | 1 - pkgs/by-name/bo/bootdev-cli/package.nix | 1 - pkgs/by-name/bo/bottom/package.nix | 1 - pkgs/by-name/br/broot/package.nix | 1 - pkgs/by-name/br/brush-splat/package.nix | 1 - pkgs/by-name/br/brush/package.nix | 1 - pkgs/by-name/bs/bsky-cli/package.nix | 1 - pkgs/by-name/bt/btop/package.nix | 1 - pkgs/by-name/bu/buildah-unwrapped/package.nix | 1 - pkgs/by-name/bu/buildstream/package.nix | 1 - pkgs/by-name/bu/bulletty/package.nix | 1 - pkgs/by-name/bu/bumpp/package.nix | 1 - pkgs/by-name/bu/bunbun/package.nix | 1 - pkgs/by-name/bu/bundler/package.nix | 1 - pkgs/by-name/ca/camilladsp/package.nix | 1 - pkgs/by-name/ca/carapace-bridge/package.nix | 1 - pkgs/by-name/ca/cargo-aoc/package.nix | 1 - pkgs/by-name/ca/cargo-expand/package.nix | 1 - pkgs/by-name/ca/cargo-hakari/package.nix | 1 - pkgs/by-name/ca/cargo-modules/package.nix | 1 - pkgs/by-name/ca/cargo-seek/package.nix | 1 - pkgs/by-name/ca/catnip/package.nix | 1 - pkgs/by-name/cb/cbmc/package.nix | 1 - pkgs/by-name/cf/cfn-changeset-viewer/package.nix | 1 - pkgs/by-name/ch/chaos/package.nix | 2 -- pkgs/by-name/ch/chawan/package.nix | 1 - pkgs/by-name/ch/check50/package.nix | 1 - pkgs/by-name/cl/clang-uml/package.nix | 1 - pkgs/by-name/cl/clash-rs/package.nix | 1 - pkgs/by-name/cl/clashtui/package.nix | 2 -- pkgs/by-name/cl/claude-code/package.nix | 1 - pkgs/by-name/cl/cli50/package.nix | 1 - pkgs/by-name/cl/clive/package.nix | 1 - pkgs/by-name/cl/clorinde/package.nix | 1 - pkgs/by-name/cl/clouddrive2/package.nix | 1 - pkgs/by-name/cl/cloudflare-warp/package.nix | 1 - pkgs/by-name/cl/cloudlist/package.nix | 2 -- pkgs/by-name/cm/cmake-language-server/package.nix | 1 - pkgs/by-name/co/cobalt/package.nix | 1 - pkgs/by-name/co/codebook/package.nix | 1 - pkgs/by-name/co/codeium/package.nix | 1 - pkgs/by-name/co/codesnap/package.nix | 1 - pkgs/by-name/co/committed/package.nix | 1 - pkgs/by-name/co/compare50/package.nix | 1 - pkgs/by-name/co/composer-require-checker/package.nix | 1 - pkgs/by-name/co/conftest/package.nix | 1 - pkgs/by-name/co/container/package.nix | 1 - pkgs/by-name/co/conventional-changelog-cli/package.nix | 1 - pkgs/by-name/co/countryfetch/package.nix | 1 - pkgs/by-name/cp/cppcheck/package.nix | 1 - pkgs/by-name/cp/cpplint/package.nix | 1 - pkgs/by-name/cp/cppman/package.nix | 1 - pkgs/by-name/cr/criticality-score/package.nix | 1 - pkgs/by-name/cr/crusader/package.nix | 1 - pkgs/by-name/cr/crush/package.nix | 1 - pkgs/by-name/cs/csharp-ls/package.nix | 1 - pkgs/by-name/ct/ctags-lsp/package.nix | 1 - pkgs/by-name/cy/cyme/package.nix | 1 - pkgs/by-name/cz/czkawka/package.nix | 1 - pkgs/by-name/da/dae/package.nix | 2 -- pkgs/by-name/da/darktable/package.nix | 1 - pkgs/by-name/da/databricks-cli/package.nix | 1 - pkgs/by-name/db/dbx/package.nix | 1 - pkgs/by-name/dd/ddev/package.nix | 1 - pkgs/by-name/de/deepcool-digital-linux/package.nix | 1 - pkgs/by-name/de/deputy/package.nix | 1 - pkgs/by-name/de/deterministic-zip/package.nix | 1 - pkgs/by-name/di/difftastic/package.nix | 1 - pkgs/by-name/di/display3d/package.nix | 1 - pkgs/by-name/di/distant/package.nix | 1 - pkgs/by-name/dj/django-upgrade/package.nix | 2 -- pkgs/by-name/do/docker-language-server/package.nix | 1 - pkgs/by-name/do/dovi-tool/package.nix | 1 - pkgs/by-name/do/doxx/package.nix | 1 - pkgs/by-name/dp/dpkg/package.nix | 1 - pkgs/by-name/dp/dprint/package.nix | 1 - pkgs/by-name/du/dua/package.nix | 1 - pkgs/by-name/du/dunst/package.nix | 1 - pkgs/by-name/du/dust/package.nix | 1 - pkgs/by-name/dw/dwarf2json/package.nix | 1 - pkgs/by-name/dw/dwarfs/package.nix | 1 - pkgs/by-name/ec/ec2-instance-selector/package.nix | 1 - pkgs/by-name/ed/eddie/package.nix | 1 - pkgs/by-name/ek/eks-node-viewer/package.nix | 1 - pkgs/by-name/el/elm-land/package.nix | 1 - pkgs/by-name/em/emcee/package.nix | 1 - pkgs/by-name/em/emmylua-check/package.nix | 1 - pkgs/by-name/em/emmylua-doc-cli/package.nix | 1 - pkgs/by-name/em/emmylua-ls/package.nix | 1 - pkgs/by-name/en/encrypted-dns-server/package.nix | 1 - pkgs/by-name/en/envoy-bin/package.nix | 1 - pkgs/by-name/es/esphome/package.nix | 2 -- pkgs/by-name/eu/eukleides/package.nix | 1 - pkgs/by-name/ev/evil-winrm-py/package.nix | 1 - pkgs/by-name/fa/fahclient/package.nix | 1 - pkgs/by-name/fa/fastfetch/package.nix | 1 - pkgs/by-name/fe/feroxbuster/package.nix | 2 -- pkgs/by-name/fe/ferretdb/package.nix | 1 - pkgs/by-name/fe/ferron/package.nix | 1 - pkgs/by-name/fi/filen-cli/package.nix | 1 - pkgs/by-name/fi/fish/package.nix | 2 -- pkgs/by-name/fi/fishnet/package.nix | 1 - pkgs/by-name/fi/fishy/package.nix | 1 - pkgs/by-name/fl/flac/package.nix | 1 - pkgs/by-name/fl/fluent-bit/package.nix | 2 -- pkgs/by-name/fl/fluxcd-operator-mcp/package.nix | 1 - pkgs/by-name/fl/fluxcd-operator/package.nix | 1 - pkgs/by-name/fo/forgejo-runner/package.nix | 1 - pkgs/by-name/fo/fortran-fpm/package.nix | 1 - pkgs/by-name/fo/foundry/package.nix | 1 - pkgs/by-name/fx/fx/package.nix | 1 - pkgs/by-name/gd/gdscript-formatter/package.nix | 1 - pkgs/by-name/ge/gemmi/package.nix | 1 - pkgs/by-name/ge/geteduroam-cli/package.nix | 1 - pkgs/by-name/ge/geteduroam/package.nix | 1 - pkgs/by-name/gh/ghostty/package.nix | 3 --- pkgs/by-name/gi/git-cola/package.nix | 2 -- pkgs/by-name/gi/git-conventional-commits/package.nix | 1 - pkgs/by-name/gi/git-lfs/package.nix | 1 - pkgs/by-name/gi/github-distributed-owners/package.nix | 1 - pkgs/by-name/gi/github-mcp-server/package.nix | 1 - pkgs/by-name/gi/gitlab-runner/package.nix | 2 -- pkgs/by-name/gi/gitlint/package.nix | 1 - pkgs/by-name/gl/glance/package.nix | 1 - pkgs/by-name/gl/glauth/package.nix | 1 - pkgs/by-name/gl/glpi-agent/package.nix | 1 - pkgs/by-name/go/go-chromecast/package.nix | 2 -- pkgs/by-name/go/go-sendxmpp/package.nix | 1 - pkgs/by-name/go/go-task/package.nix | 1 - pkgs/by-name/go/gocovsh/package.nix | 1 - pkgs/by-name/go/gojq/package.nix | 1 - pkgs/by-name/go/gokapi/package.nix | 1 - pkgs/by-name/go/golds/package.nix | 1 - pkgs/by-name/go/golem/package.nix | 1 - pkgs/by-name/go/gomanagedocker/package.nix | 1 - pkgs/by-name/go/gonzo/package.nix | 1 - pkgs/by-name/go/gotestwaf/package.nix | 2 -- pkgs/by-name/go/gotip/package.nix | 1 - pkgs/by-name/gp/gping/package.nix | 2 -- pkgs/by-name/gp/gpt-cli/package.nix | 2 -- pkgs/by-name/gp/gpufetch/package.nix | 1 - pkgs/by-name/gr/grafanactl/package.nix | 1 - pkgs/by-name/gr/gren/package.nix | 1 - pkgs/by-name/gu/guesswidth/package.nix | 1 - pkgs/by-name/gu/gurk-rs/package.nix | 1 - pkgs/by-name/ha/har-to-k6/package.nix | 1 - pkgs/by-name/ha/hashrat/package.nix | 1 - pkgs/by-name/ha/hatch/package.nix | 2 -- pkgs/by-name/ha/hath-rust/package.nix | 1 - pkgs/by-name/ha/hatsu/package.nix | 1 - pkgs/by-name/hc/hcdiag/package.nix | 1 - pkgs/by-name/he/helix-db/package.nix | 1 - pkgs/by-name/he/helix/package.nix | 1 - pkgs/by-name/he/hexpatch/package.nix | 1 - pkgs/by-name/he/hexyl/package.nix | 1 - pkgs/by-name/hg/hgrep/package.nix | 1 - pkgs/by-name/hl/hl-log-viewer/package.nix | 1 - pkgs/by-name/ho/homebridge-config-ui-x/package.nix | 1 - pkgs/by-name/ho/honeycomb-refinery/package.nix | 1 - pkgs/by-name/ho/hot-resize/package.nix | 1 - pkgs/by-name/ht/http-prompt/package.nix | 2 -- pkgs/by-name/ht/httpyac/package.nix | 1 - pkgs/by-name/hy/hyfetch/package.nix | 1 - pkgs/by-name/hy/hyperrogue/package.nix | 2 -- pkgs/by-name/ia/iamb/package.nix | 1 - pkgs/by-name/is/isa-l/package.nix | 1 - pkgs/by-name/iw/iwe/package.nix | 1 - pkgs/by-name/ja/jacktrip/package.nix | 1 - pkgs/by-name/ja/jaq/package.nix | 1 - pkgs/by-name/ja/jazz2/package.nix | 1 - pkgs/by-name/jd/jdd/package.nix | 1 - pkgs/by-name/je/jellyfin-tui/package.nix | 1 - pkgs/by-name/je/jen/package.nix | 1 - pkgs/by-name/jn/jnv/package.nix | 1 - pkgs/by-name/jq/jql/package.nix | 1 - pkgs/by-name/js/json-schema-catalog-rs/package.nix | 1 - pkgs/by-name/js/jsonschema-cli/package.nix | 1 - pkgs/by-name/ju/jujutsu/package.nix | 1 - pkgs/by-name/ka/kanidm-provision/package.nix | 1 - pkgs/by-name/kd/kdlfmt/package.nix | 1 - pkgs/by-name/ke/kew/package.nix | 1 - pkgs/by-name/ko/koto/package.nix | 1 - pkgs/by-name/ku/kubernetes-validate/unwrapped.nix | 1 - pkgs/by-name/ku/kubexporter/package.nix | 1 - pkgs/by-name/ku/kuzu/package.nix | 1 - pkgs/by-name/la/labwc/package.nix | 1 - pkgs/by-name/la/laze/package.nix | 1 - pkgs/by-name/la/lazyjj/package.nix | 1 - pkgs/by-name/lc/lcov/package.nix | 2 -- pkgs/by-name/le/ledger/package.nix | 1 - pkgs/by-name/le/less/package.nix | 1 - pkgs/by-name/le/lexical/package.nix | 1 - pkgs/by-name/li/librep/package.nix | 1 - pkgs/by-name/li/lightning-terminal/package.nix | 1 - pkgs/by-name/li/lightningstream/package.nix | 1 - pkgs/by-name/li/ligolo-ng/package.nix | 1 - pkgs/by-name/li/lima/package.nix | 1 - pkgs/by-name/ll/llm-ls/package.nix | 1 - pkgs/by-name/ls/lsr/package.nix | 1 - pkgs/by-name/lu/lua-language-server/package.nix | 1 - pkgs/by-name/lu/luau-lsp/package.nix | 1 - pkgs/by-name/lu/lux-cli/package.nix | 1 - pkgs/by-name/ma/mactop/package.nix | 1 - pkgs/by-name/ma/magento-cloud/package.nix | 1 - pkgs/by-name/ma/mago/package.nix | 1 - pkgs/by-name/ma/markdown-code-runner/package.nix | 1 - pkgs/by-name/ma/mask/package.nix | 1 - pkgs/by-name/ma/maskprocessor/package.nix | 1 - pkgs/by-name/ma/materialize/package.nix | 1 - pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix | 1 - pkgs/by-name/ma/matrix-authentication-service/package.nix | 1 - pkgs/by-name/ma/mautrix-signal/package.nix | 1 - pkgs/by-name/ma/mautrix-slack/package.nix | 1 - pkgs/by-name/mb/mbake/package.nix | 1 - pkgs/by-name/mc/mcp-k8s-go/package.nix | 1 - pkgs/by-name/md/md-lsp/package.nix | 1 - pkgs/by-name/md/mdbook-plugins/package.nix | 1 - pkgs/by-name/md/mdbtools/package.nix | 1 - pkgs/by-name/md/mdq/package.nix | 1 - pkgs/by-name/me/meowlnir/package.nix | 1 - pkgs/by-name/me/mergiraf/package.nix | 2 -- pkgs/by-name/me/metal-cli/package.nix | 1 - pkgs/by-name/mi/migrate-to-uv/package.nix | 1 - pkgs/by-name/mi/minimap2/package.nix | 1 - pkgs/by-name/mi/minio-warp/package.nix | 1 - pkgs/by-name/mi/miniserve/package.nix | 1 - pkgs/by-name/mi/miro/package.nix | 1 - pkgs/by-name/mi/mistral-rs/package.nix | 1 - pkgs/by-name/mo/mold/package.nix | 1 - pkgs/by-name/mo/mongodb-ce/package.nix | 1 - pkgs/by-name/mo/mount-zip/package.nix | 1 - pkgs/by-name/mp/mpls/package.nix | 1 - pkgs/by-name/mp/mprocs/package.nix | 1 - pkgs/by-name/ms/msedit/package.nix | 1 - pkgs/by-name/mu/mubeng/package.nix | 1 - pkgs/by-name/mu/muffet/package.nix | 1 - pkgs/by-name/mu/mullvad-vpn/package.nix | 1 - pkgs/by-name/mu/multiqc/package.nix | 2 -- pkgs/by-name/n9/n98-magerun2/package.nix | 1 - pkgs/by-name/na/nak/package.nix | 1 - pkgs/by-name/na/natscli/package.nix | 1 - pkgs/by-name/nb/nbqa/package.nix | 1 - pkgs/by-name/nb/nbtscanner/package.nix | 2 -- pkgs/by-name/nc/ncdu/package.nix | 1 - pkgs/by-name/ne/neovim-node-client/package.nix | 1 - pkgs/by-name/ne/neovim-unwrapped/package.nix | 1 - pkgs/by-name/ne/netboot/package.nix | 1 - pkgs/by-name/ne/netcap/package.nix | 1 - pkgs/by-name/ng/nginx-language-server/package.nix | 1 - pkgs/by-name/ni/ni/package.nix | 1 - pkgs/by-name/ni/nickel/package.nix | 1 - pkgs/by-name/ni/niri/package.nix | 1 - pkgs/by-name/ni/nix-init/package.nix | 1 - pkgs/by-name/ni/nix-prefetch/package.nix | 1 - pkgs/by-name/ni/nixpkgs-review/package.nix | 1 - pkgs/by-name/no/noseyparker/package.nix | 1 - pkgs/by-name/nr/nrfutil/package.nix | 1 - pkgs/by-name/nu/numbat/package.nix | 1 - pkgs/by-name/nv/nvidia_oc/package.nix | 2 -- pkgs/by-name/nv/nvitop/package.nix | 1 - pkgs/by-name/nv/nvme-rs/package.nix | 1 - pkgs/by-name/nv/nvrh/package.nix | 1 - pkgs/by-name/oa/oauth2-proxy/package.nix | 1 - pkgs/by-name/ob/obj2tiles/package.nix | 1 - pkgs/by-name/ob/obs-do/package.nix | 1 - pkgs/by-name/oc/ocsp-server/package.nix | 1 - pkgs/by-name/ok/oklch-color-picker/package.nix | 1 - pkgs/by-name/ol/ollama/package.nix | 1 - pkgs/by-name/om/omnix/package.nix | 1 - pkgs/by-name/op/openapi-down-convert/package.nix | 1 - pkgs/by-name/op/openbao/package.nix | 1 - pkgs/by-name/op/openfortivpn/package.nix | 1 - pkgs/by-name/op/openscad-lsp/package.nix | 2 -- pkgs/by-name/op/opkssh/package.nix | 1 - pkgs/by-name/op/opnborg/package.nix | 1 - pkgs/by-name/or/orthanc/package.nix | 1 - pkgs/by-name/ot/otel-desktop-viewer/package.nix | 1 - pkgs/by-name/ot/oterm/package.nix | 1 - pkgs/by-name/ov/overpush/package.nix | 1 - pkgs/by-name/ox/ox/package.nix | 1 - pkgs/by-name/ox/oxlint/package.nix | 1 - pkgs/by-name/pa/pack/package.nix | 1 - pkgs/by-name/pa/packetry/package.nix | 1 - pkgs/by-name/pa/pakku/package.nix | 1 - pkgs/by-name/pa/paps/package.nix | 1 - pkgs/by-name/pa/paq/package.nix | 1 - pkgs/by-name/pa/paratest/package.nix | 1 - pkgs/by-name/pa/parseable/package.nix | 1 - pkgs/by-name/pa/patchy/package.nix | 1 - pkgs/by-name/pa/patroni/package.nix | 1 - pkgs/by-name/pd/pdepend/package.nix | 1 - pkgs/by-name/pd/pdftowrite/package.nix | 1 - pkgs/by-name/pf/pfetch/package.nix | 1 - pkgs/by-name/ph/phase-cli/package.nix | 1 - pkgs/by-name/ph/phel/package.nix | 1 - pkgs/by-name/ph/phpactor/package.nix | 1 - pkgs/by-name/ph/phpdocumentor/package.nix | 1 - pkgs/by-name/ph/phpunit/package.nix | 1 - pkgs/by-name/pi/pipenv/package.nix | 1 - pkgs/by-name/pi/piston-cli/package.nix | 1 - pkgs/by-name/pi/pixi-pack/package.nix | 1 - pkgs/by-name/pi/pixi/package.nix | 1 - pkgs/by-name/pm/pmbootstrap/package.nix | 2 -- pkgs/by-name/po/podman/package.nix | 1 - pkgs/by-name/po/pods/package.nix | 1 - pkgs/by-name/po/popsicle/package.nix | 1 - pkgs/by-name/pr/pre-commit/package.nix | 1 - pkgs/by-name/pr/presenterm/package.nix | 1 - pkgs/by-name/pr/prettier/package.nix | 1 - pkgs/by-name/pr/prmt/package.nix | 1 - pkgs/by-name/pr/procfd/package.nix | 1 - pkgs/by-name/pr/proksi/package.nix | 1 - pkgs/by-name/pr/prometheus-chrony-exporter/package.nix | 1 - pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix | 1 - pkgs/by-name/pr/prometheus-modbus-exporter/package.nix | 1 - pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix | 1 - pkgs/by-name/pr/prometheus-tibber-exporter/package.nix | 1 - pkgs/by-name/pr/protonmail-export/package.nix | 1 - pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix | 1 - pkgs/by-name/pr/proxyauth/package.nix | 1 - pkgs/by-name/pr/prs/package.nix | 1 - pkgs/by-name/ps/psysh/package.nix | 1 - pkgs/by-name/py/pylyzer/package.nix | 1 - pkgs/by-name/py/pyp/package.nix | 1 - pkgs/by-name/py/pyroscope/package.nix | 1 - pkgs/by-name/py/pytr/package.nix | 2 -- pkgs/by-name/q2/q2pro/package.nix | 1 - pkgs/by-name/qb/qbittorrent-cli/package.nix | 1 - pkgs/by-name/qd/qdrant/package.nix | 1 - pkgs/by-name/qo/qownnotes/package.nix | 1 - pkgs/by-name/qr/qr-backup/package.nix | 1 - pkgs/by-name/qu/quick-lint-js/package.nix | 1 - pkgs/by-name/ra/radicle-ci-broker/package.nix | 1 - pkgs/by-name/ra/radicle-job/package.nix | 1 - pkgs/by-name/ra/radicle-native-ci/package.nix | 1 - pkgs/by-name/ra/radicle-node/package.nix | 1 - pkgs/by-name/ra/rails-new/package.nix | 1 - pkgs/by-name/ra/rates/package.nix | 2 -- pkgs/by-name/ra/rattler-build/package.nix | 1 - pkgs/by-name/rc/rclip/package.nix | 1 - pkgs/by-name/rc/rcodesign/package.nix | 1 - pkgs/by-name/re/rebels-in-the-sky/package.nix | 1 - pkgs/by-name/re/rebuilderd/package.nix | 1 - pkgs/by-name/re/redis/package.nix | 1 - pkgs/by-name/re/regolith/package.nix | 1 - pkgs/by-name/re/remod/package.nix | 1 - pkgs/by-name/re/render50/package.nix | 1 - pkgs/by-name/re/renpy/package.nix | 1 - pkgs/by-name/re/repro-env/package.nix | 1 - pkgs/by-name/re/rerun/package.nix | 1 - pkgs/by-name/re/rescript-language-server/package.nix | 1 - pkgs/by-name/re/restate/package.nix | 1 - pkgs/by-name/ri/rich-cli/package.nix | 1 - pkgs/by-name/ro/roave-backward-compatibility-check/package.nix | 1 - pkgs/by-name/ro/robo/package.nix | 1 - pkgs/by-name/ro/rogcat/package.nix | 2 -- pkgs/by-name/ro/rojo/package.nix | 1 - pkgs/by-name/rq/rq/package.nix | 1 - pkgs/by-name/rs/rsnapshot/package.nix | 1 - pkgs/by-name/ru/ruff/package.nix | 1 - pkgs/by-name/ru/rumdl/package.nix | 1 - pkgs/by-name/ru/rundeck-cli/package.nix | 1 - pkgs/by-name/ru/rust-parallel/package.nix | 1 - pkgs/by-name/ru/rustpython/package.nix | 1 - pkgs/by-name/ru/rusty-man/package.nix | 1 - pkgs/by-name/rw/rwalk/package.nix | 1 - pkgs/by-name/ry/rye/package.nix | 1 - pkgs/by-name/s5/s5/package.nix | 2 -- pkgs/by-name/sa/salt-lint/package.nix | 2 -- pkgs/by-name/sa/samply/package.nix | 1 - pkgs/by-name/sa/sampo/package.nix | 1 - pkgs/by-name/sa/sawfish/package.nix | 1 - pkgs/by-name/sb/sbom-tool/package.nix | 1 - pkgs/by-name/sb/sbom4python/package.nix | 1 - pkgs/by-name/sc/scip/package.nix | 2 -- pkgs/by-name/sc/scmpuff/package.nix | 1 - pkgs/by-name/se/sea-orm-cli/package.nix | 1 - pkgs/by-name/se/seagoat/package.nix | 1 - pkgs/by-name/se/serpl/package.nix | 1 - pkgs/by-name/sh/shaperglot-cli/package.nix | 1 - pkgs/by-name/sh/shtris/package.nix | 1 - pkgs/by-name/si/sidekick/package.nix | 1 - pkgs/by-name/si/signal-cli/package.nix | 1 - pkgs/by-name/si/sigsum/package.nix | 1 - pkgs/by-name/si/similarity/package.nix | 1 - pkgs/by-name/si/siril/package.nix | 1 - pkgs/by-name/sk/sketchybar/package.nix | 1 - pkgs/by-name/sk/skhd/package.nix | 1 - pkgs/by-name/sl/slipshow/package.nix | 1 - pkgs/by-name/sl/slowlorust/package.nix | 2 -- pkgs/by-name/sl/slumber/package.nix | 1 - pkgs/by-name/sm/smeagol/package.nix | 1 - pkgs/by-name/sm/smpmgr/package.nix | 1 - pkgs/by-name/sn/snakefmt/package.nix | 1 - pkgs/by-name/sn/snakemake/package.nix | 2 -- pkgs/by-name/sn/sniffnet/package.nix | 1 - pkgs/by-name/sn/snx-rs/package.nix | 1 - pkgs/by-name/so/solana-cli/package.nix | 1 - pkgs/by-name/so/solc/package.nix | 3 --- pkgs/by-name/so/somo/package.nix | 1 - pkgs/by-name/so/sops/package.nix | 1 - pkgs/by-name/sp/spacetimedb/package.nix | 1 - pkgs/by-name/sp/spider/package.nix | 1 - pkgs/by-name/sq/sqld/package.nix | 1 - pkgs/by-name/sq/sqruff/package.nix | 1 - pkgs/by-name/ss/sscg/package.nix | 1 - pkgs/by-name/ss/ssh-vault/package.nix | 1 - pkgs/by-name/ss/sshocker/package.nix | 2 -- pkgs/by-name/st/stalwart-cli/package.nix | 1 - pkgs/by-name/st/star/package.nix | 1 - pkgs/by-name/st/stasis/package.nix | 1 - pkgs/by-name/st/strip-tags/package.nix | 1 - pkgs/by-name/st/style50/package.nix | 1 - pkgs/by-name/su/submit50/package.nix | 1 - pkgs/by-name/su/sudo-rs/package.nix | 1 - pkgs/by-name/su/sus-compiler/package.nix | 1 - pkgs/by-name/su/suspicious-package/package.nix | 1 - pkgs/by-name/sw/swaysome/package.nix | 2 -- pkgs/by-name/sy/sylkserver/package.nix | 1 - pkgs/by-name/sy/systemctl-tui/package.nix | 1 - pkgs/by-name/ta/tabby/package.nix | 1 - pkgs/by-name/ta/tahoe-lafs/package.nix | 2 -- pkgs/by-name/ta/tailspin/package.nix | 1 - pkgs/by-name/ta/taplo/package.nix | 1 - pkgs/by-name/ta/task-master-ai/package.nix | 1 - pkgs/by-name/ta/taze/package.nix | 1 - pkgs/by-name/te/teams-for-linux/package.nix | 2 -- pkgs/by-name/te/teamtype/package.nix | 1 - pkgs/by-name/te/telegram-bot-api/package.nix | 1 - pkgs/by-name/te/termshot/package.nix | 1 - pkgs/by-name/te/terraform-mcp-server/package.nix | 1 - pkgs/by-name/tf/tflint/package.nix | 2 -- pkgs/by-name/th/thanos/package.nix | 1 - pkgs/by-name/ti/timoni/package.nix | 1 - pkgs/by-name/tm/tmc-cli/package.nix | 1 - pkgs/by-name/tm/tmux-sessionizer/package.nix | 1 - pkgs/by-name/tm/tmuxai/package.nix | 1 - pkgs/by-name/to/tocaia/package.nix | 1 - pkgs/by-name/to/tofu-ls/package.nix | 1 - pkgs/by-name/to/tokei/package.nix | 1 - pkgs/by-name/to/tombl/package.nix | 1 - pkgs/by-name/to/toml-test/package.nix | 1 - pkgs/by-name/to/topiary/package.nix | 1 - pkgs/by-name/to/tor/package.nix | 1 - pkgs/by-name/tp/tpnote/package.nix | 1 - pkgs/by-name/tr/trufflehog/package.nix | 2 -- pkgs/by-name/tr/trurl/package.nix | 1 - pkgs/by-name/tr/trzsz-ssh/package.nix | 1 - pkgs/by-name/ts/tsukimi/package.nix | 1 - pkgs/by-name/ts/tsx/package.nix | 1 - pkgs/by-name/tt/tt-burnin/package.nix | 2 -- pkgs/by-name/tt/tt-smi/package.nix | 2 -- pkgs/by-name/tt/tt-topology/package.nix | 2 -- pkgs/by-name/tt/ttysvr/package.nix | 1 - pkgs/by-name/tu/tui-journal/package.nix | 1 - pkgs/by-name/tu/tuisky/package.nix | 1 - pkgs/by-name/tu/turn-rs/package.nix | 1 - pkgs/by-name/tu/turso/package.nix | 1 - pkgs/by-name/tu/tuxedo-rs/package.nix | 1 - pkgs/by-name/ty/ty/package.nix | 1 - pkgs/by-name/ty/typescript/package.nix | 1 - pkgs/by-name/ty/typespec/package.nix | 1 - pkgs/by-name/ty/typos/package.nix | 1 - pkgs/by-name/ty/typst/package.nix | 1 - pkgs/by-name/ty/typstyle/package.nix | 1 - pkgs/by-name/uc/ucon64/package.nix | 1 - pkgs/by-name/ui/uiua/package.nix | 1 - pkgs/by-name/un/unblob/package.nix | 2 -- pkgs/by-name/un/unftp/package.nix | 1 - pkgs/by-name/up/updog/package.nix | 1 - pkgs/by-name/ur/uradvd/package.nix | 1 - pkgs/by-name/us/usacloud/package.nix | 1 - pkgs/by-name/uu/uutils-coreutils/package.nix | 1 - pkgs/by-name/uu/uutils-findutils/package.nix | 1 - pkgs/by-name/uv/uv/package.nix | 1 - pkgs/by-name/va/vassal/package.nix | 1 - pkgs/by-name/vc/vcsi/package.nix | 1 - pkgs/by-name/ve/vector/package.nix | 1 - pkgs/by-name/vi/vi-mongo/package.nix | 1 - pkgs/by-name/vi/video2x/package.nix | 1 - pkgs/by-name/vi/vim-vint/package.nix | 1 - pkgs/by-name/vo/volta/package.nix | 1 - pkgs/by-name/vo/vorta/package.nix | 1 - pkgs/by-name/vs/vsce/package.nix | 1 - pkgs/by-name/wa/wapiti/package.nix | 2 -- pkgs/by-name/wa/wasm-language-tools/package.nix | 1 - pkgs/by-name/wa/wasmtime/package.nix | 1 - pkgs/by-name/wa/waybar-lyric/package.nix | 1 - pkgs/by-name/wa/waybar/package.nix | 1 - pkgs/by-name/wg/wget2/package.nix | 1 - pkgs/by-name/wi/wild-unwrapped/package.nix | 1 - pkgs/by-name/wk/wkg/package.nix | 1 - pkgs/by-name/wo/wofi-power-menu/package.nix | 1 - pkgs/by-name/wo/woke/package.nix | 1 - pkgs/by-name/ws/wstunnel/package.nix | 1 - pkgs/by-name/wt/wtfutil/package.nix | 1 - pkgs/by-name/xc/xcodegen/package.nix | 1 - pkgs/by-name/xd/xdvdfs-cli/package.nix | 1 - pkgs/by-name/xe/xee/package.nix | 1 - pkgs/by-name/xh/xh/package.nix | 1 - pkgs/by-name/xl/xlsxsql/package.nix | 1 - pkgs/by-name/xm/xmake/package.nix | 1 - pkgs/by-name/ya/yabai/package.nix | 1 - pkgs/by-name/ya/yaml2json/package.nix | 1 - pkgs/by-name/ya/yamlfmt/package.nix | 1 - pkgs/by-name/ya/yarr/package.nix | 1 - pkgs/by-name/ye/yek/package.nix | 1 - pkgs/by-name/yl/yle-dl/package.nix | 2 -- pkgs/by-name/yo/yodl/package.nix | 1 - pkgs/by-name/yt/ytcc/package.nix | 2 -- pkgs/by-name/yt/ytdl-sub/package.nix | 1 - pkgs/by-name/yu/yuhaiin/package.nix | 2 -- pkgs/by-name/za/zaparoo/package.nix | 1 - pkgs/by-name/ze/zed-editor/package.nix | 1 - pkgs/by-name/ze/zellij/package.nix | 1 - pkgs/by-name/zi/zig-zlint/package.nix | 1 - pkgs/by-name/zi/zipline/package.nix | 1 - pkgs/by-name/zu/zuban/package.nix | 1 - pkgs/by-name/zv/zvm/package.nix | 1 - pkgs/by-name/zx/zx/package.nix | 2 -- pkgs/development/compilers/dart/default.nix | 2 -- pkgs/development/interpreters/emilua/default.nix | 1 - pkgs/development/libraries/fontconfig/default.nix | 1 - pkgs/development/libraries/protobuf/generic.nix | 1 - pkgs/development/lua-modules/overrides.nix | 1 - pkgs/development/php-packages/box/default.nix | 1 - pkgs/development/php-packages/castor/default.nix | 1 - pkgs/development/php-packages/composer/default.nix | 1 - pkgs/development/php-packages/grumphp/default.nix | 1 - pkgs/development/php-packages/php-cs-fixer/default.nix | 1 - pkgs/development/php-packages/phpinsights/default.nix | 1 - pkgs/development/php-packages/phpmd/default.nix | 1 - pkgs/development/php-packages/phpstan/default.nix | 1 - pkgs/development/php-packages/psalm/default.nix | 1 - pkgs/development/python-modules/ansible-runner/default.nix | 1 - pkgs/development/python-modules/asn1tools/default.nix | 1 - pkgs/development/python-modules/bump-my-version/default.nix | 2 -- pkgs/development/python-modules/bundlewrap/default.nix | 1 - pkgs/development/python-modules/coiled/default.nix | 1 - pkgs/development/python-modules/crewai/default.nix | 2 -- pkgs/development/python-modules/cx-freeze/default.nix | 1 - pkgs/development/python-modules/dask/default.nix | 1 - pkgs/development/python-modules/deid/default.nix | 1 - pkgs/development/python-modules/dynaconf/default.nix | 2 -- pkgs/development/python-modules/files-to-prompt/default.nix | 2 -- pkgs/development/python-modules/fmpy/default.nix | 1 - pkgs/development/python-modules/granian/default.nix | 2 -- pkgs/development/python-modules/j2lint/default.nix | 1 - pkgs/development/python-modules/jupyterhub/default.nix | 1 - pkgs/development/python-modules/jupytext/default.nix | 1 - pkgs/development/python-modules/keymap-drawer/default.nix | 1 - pkgs/development/python-modules/manim/default.nix | 1 - pkgs/development/python-modules/marimo/default.nix | 1 - pkgs/development/python-modules/mat2/default.nix | 1 - pkgs/development/python-modules/mcdreforged/default.nix | 2 -- pkgs/development/python-modules/mercantile/default.nix | 1 - pkgs/development/python-modules/mike/default.nix | 1 - pkgs/development/python-modules/morecantile/default.nix | 1 - pkgs/development/python-modules/mypy-boto3-builder/default.nix | 2 -- pkgs/development/python-modules/optuna/default.nix | 1 - pkgs/development/python-modules/papermill/default.nix | 1 - pkgs/development/python-modules/periodiq/default.nix | 1 - pkgs/development/python-modules/pyannote-metrics/default.nix | 1 - pkgs/development/python-modules/pyannote-pipeline/default.nix | 1 - pkgs/development/python-modules/pyglossary/default.nix | 1 - pkgs/development/python-modules/python-lsp-server/default.nix | 1 - pkgs/development/python-modules/rasterio/default.nix | 1 - pkgs/development/python-modules/reflex/default.nix | 1 - pkgs/development/python-modules/rembg/default.nix | 1 - pkgs/development/python-modules/rns/default.nix | 1 - pkgs/development/python-modules/rq/default.nix | 1 - pkgs/development/python-modules/scspell/default.nix | 2 -- pkgs/development/python-modules/spsdk/default.nix | 1 - pkgs/development/python-modules/sqlfmt/default.nix | 1 - pkgs/development/python-modules/tensorboard/default.nix | 1 - pkgs/development/python-modules/toggl-cli/default.nix | 1 - pkgs/development/python-modules/ufmt/default.nix | 1 - pkgs/development/python-modules/wandb/default.nix | 2 -- pkgs/development/python-modules/watchfiles/default.nix | 1 - pkgs/development/python-modules/weasyprint/default.nix | 1 - pkgs/development/python-modules/yamlfix/default.nix | 1 - pkgs/development/tools/analysis/clazy/default.nix | 1 - pkgs/development/tools/misc/luarocks/default.nix | 1 - pkgs/os-specific/linux/conky/default.nix | 1 - pkgs/os-specific/linux/freeipa/default.nix | 1 - pkgs/os-specific/linux/projecteur/default.nix | 1 - pkgs/os-specific/linux/sssd/default.nix | 1 - pkgs/tools/security/gopass/default.nix | 1 - 631 files changed, 698 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index b83c55e12662..2f7bb835c4f2 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -187,7 +187,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bitcoin-cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 01ff36eae23a..6ce894f595b5 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -187,7 +187,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bitcoin-cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.tests = { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix index 9b458b7e3bfc..fb3bd413c594 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix @@ -32,7 +32,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = false; meta.mainProgram = "cord"; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix index 29bcb9a701a0..04489a1f013c 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix @@ -46,7 +46,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/helm-schema/bin/schema"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 2e002dd47777..3ca67f10228b 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -449,7 +449,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { inherit diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index e1cd0441551c..ee97df25bd4e 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "kubectl plugin to list allocations (cpu, memory, gpu,... X utilization, requested, limit, allocatable,...)"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index f7c4235b16a8..1761d89d2e4c 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -174,7 +174,6 @@ stdenv.mkDerivation rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = writeScript "update-weechat" '' #!/usr/bin/env nix-shell diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index bb64123d643e..7b52e2863cf4 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -110,7 +110,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 8f46a0930a58..c9492e1370f5 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -352,7 +352,6 @@ let doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix) diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 9b8be3879b2a..2f32733c46d8 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -277,7 +277,6 @@ in versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${projectName}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index 203aac1dbe54..59bccd4b84f4 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -80,7 +80,6 @@ stdenv.mkDerivation { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/op"; - versionCheckProgramArg = "--version"; passthru = { updateScript = ./update.sh; diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index 2c0e7597bbd1..401830d85a39 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -78,7 +78,6 @@ buildGoModule (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ah/ahoy/package.nix b/pkgs/by-name/ah/ahoy/package.nix index 58dee8bc3fd1..b51c95a77f5d 100644 --- a/pkgs/by-name/ah/ahoy/package.nix +++ b/pkgs/by-name/ah/ahoy/package.nix @@ -28,8 +28,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ai/aichat/package.nix b/pkgs/by-name/ai/aichat/package.nix index 9fd4ceeb20a4..128474f18c23 100644 --- a/pkgs/by-name/ai/aichat/package.nix +++ b/pkgs/by-name/ai/aichat/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix index e36ffb8c68c4..2f081926e983 100644 --- a/pkgs/by-name/ai/air-formatter/package.nix +++ b/pkgs/by-name/ai/air-formatter/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/air"; - versionCheckProgramArg = "--version"; doInstallCheck = true; cargoBuildFlags = [ "-p air" ]; diff --git a/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix b/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix index 09e19960b121..940f361fa7e3 100644 --- a/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix +++ b/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/alertmanager_gotify_bridge"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index 897522730b60..6a7435d68e94 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -72,7 +72,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/amazon-q"; - versionCheckProgramArg = "--version"; meta = { description = "Amazon Q Developer AI coding agent CLI"; diff --git a/pkgs/by-name/am/ameba-ls/package.nix b/pkgs/by-name/am/ameba-ls/package.nix index 3c6fbcbce3a1..80abfec72dfe 100644 --- a/pkgs/by-name/am/ameba-ls/package.nix +++ b/pkgs/by-name/am/ameba-ls/package.nix @@ -44,7 +44,6 @@ crystal.buildCrystalPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/ameba-ls"; - versionCheckProgramArg = "--version"; meta = { description = "Crystal language server powered by Ameba linter"; diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix index fa1c0a07e107..8cffa71c0ef6 100644 --- a/pkgs/by-name/an/andcli/package.nix +++ b/pkgs/by-name/an/andcli/package.nix @@ -32,7 +32,6 @@ buildGoModule (finalAttrs: { writableTmpDirAsHomeHook versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; doInstallCheck = true; diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index acd5622e1676..c5f5c0282fe5 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -48,8 +48,6 @@ python3Packages.buildPythonApplication rec { # ansible.errors.AnsibleError: Unable to create local directories(/private/var/empty/.ansible/tmp) nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Annotation based documentation for your Ansible roles"; mainProgram = "ansible-doctor"; diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix index 57e987790c8f..2eca53aff726 100644 --- a/pkgs/by-name/ar/arp-scan-rs/package.nix +++ b/pkgs/by-name/ar/arp-scan-rs/package.nix @@ -30,8 +30,6 @@ rustPlatform.buildRustPackage rec { versionCheckProgram = [ "${placeholder "out"}/bin/arp-scan" ]; - versionCheckProgramArg = "--version"; - doInstallCheck = true; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix index 09a79fca6808..8646e4ee7994 100644 --- a/pkgs/by-name/ar/arsenal/package.nix +++ b/pkgs/by-name/ar/arsenal/package.nix @@ -30,7 +30,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "arsenal" diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index 29daefe4e94e..e6dd7e667f31 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -63,7 +63,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix index 722988ea6fd6..863a84436d2c 100644 --- a/pkgs/by-name/as/asciinema-agg/package.nix +++ b/pkgs/by-name/as/asciinema-agg/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder"; diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix index 2803cd784ab2..4a3c65905ea4 100644 --- a/pkgs/by-name/as/asciinema_3/package.nix +++ b/pkgs/by-name/as/asciinema_3/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://asciinema.org/"; diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 108bc700447c..a6ca33407a78 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix index afb4a3537142..58428c6be3e5 100644 --- a/pkgs/by-name/as/astyle/package.nix +++ b/pkgs/by-name/as/astyle/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = !asLibrary; meta = with lib; { diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index cb8883eb91d7..18e9ef2ecbf6 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/av/avalanche-cli/package.nix b/pkgs/by-name/av/avalanche-cli/package.nix index ffe4a5928830..2099270dac74 100644 --- a/pkgs/by-name/av/avalanche-cli/package.nix +++ b/pkgs/by-name/av/avalanche-cli/package.nix @@ -73,7 +73,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/avalanche"; - versionCheckProgramArg = "--version"; doCheck = false; diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix index df6a4b80d39c..5a357067d1dd 100644 --- a/pkgs/by-name/av/avro-cpp/package.nix +++ b/pkgs/by-name/av/avro-cpp/package.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/avrogencpp"; - versionCheckProgramArg = "--version"; meta = { description = "C++ library which implements parts of the Avro Specification"; diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix index 836d04605c63..96ed6abc9e31 100644 --- a/pkgs/by-name/aw/await/package.nix +++ b/pkgs/by-name/aw/await/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/slavaGanzin/await/releases/tag/${version}"; diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix index 14c387f45645..1bf2eca1c8cf 100644 --- a/pkgs/by-name/aw/aws-nuke/package.nix +++ b/pkgs/by-name/aw/aws-nuke/package.nix @@ -52,8 +52,6 @@ buildGoModule rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - postInstallCheck = '' $out/bin/aws-nuke resource-types | grep "IAMUser" ''; diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 2008cb72faa7..64311c3f5310 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -72,7 +72,6 @@ python.pkgs.buildPythonApplication rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; enabledTestPaths = [ "tests/unit" diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index 65598aeaebdc..3bafd21160ea 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -29,8 +29,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Azure Data Exporter for BloodHound"; homepage = "https://github.com/SpecterOps/AzureHound"; diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 046523ada179..afa9290b95fb 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = lib.optionals withSound soundDependencies; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; postInstall = diff --git a/pkgs/by-name/ba/bagr/package.nix b/pkgs/by-name/ba/bagr/package.nix index 68eb4aede9e0..89fb229ab1e5 100644 --- a/pkgs/by-name/ba/bagr/package.nix +++ b/pkgs/by-name/ba/bagr/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Command line utility for interacting with BagIt bags (RFC 8493)"; diff --git a/pkgs/by-name/ba/bark/package.nix b/pkgs/by-name/ba/bark/package.nix index 2bfb51195593..ae9588cf4b46 100644 --- a/pkgs/by-name/ba/bark/package.nix +++ b/pkgs/by-name/ba/bark/package.nix @@ -45,7 +45,6 @@ rustPlatform.buildRustPackage (final: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 86c3f0249fa8..0e41aab8104e 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -52,7 +52,6 @@ buildNpmPackage rec { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix index bce78ee9efeb..861a598f0bec 100644 --- a/pkgs/by-name/ba/bashunit/package.nix +++ b/pkgs/by-name/ba/bashunit/package.nix @@ -62,7 +62,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ba/basilk/package.nix b/pkgs/by-name/ba/basilk/package.nix index 1f39c3fdcde5..f7eb232f7163 100644 --- a/pkgs/by-name/ba/basilk/package.nix +++ b/pkgs/by-name/ba/basilk/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 6be77b9f5eef..572193529354 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -33,7 +33,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix index 9a9dea4594d3..b5071144c796 100644 --- a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix +++ b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = with lib; { homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index d615787792b2..685d1eba010f 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -91,7 +91,6 @@ buildNpmPackage (finalAttrs: { versionCheckHook ]; versionCheckKeepEnvironment = [ "HOME" ]; - versionCheckProgramArg = "--version"; passthru = { tests = { diff --git a/pkgs/by-name/bm/bmputil/package.nix b/pkgs/by-name/bm/bmputil/package.nix index e9401655ff70..b45e846db04d 100644 --- a/pkgs/by-name/bm/bmputil/package.nix +++ b/pkgs/by-name/bm/bmputil/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook udevCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix index f4051cc380cb..6d24483fffe0 100644 --- a/pkgs/by-name/bo/bootdev-cli/package.nix +++ b/pkgs/by-name/bo/bootdev-cli/package.nix @@ -41,7 +41,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bootdev"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index 45dd64fb0c90..7504dfd77495 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -47,7 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: { writableTmpDirAsHomeHook ]; versionCheckProgram = "${placeholder "out"}/bin/btm"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 4a8a6839e94c..f94275ed6859 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -79,7 +79,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/br/brush-splat/package.nix b/pkgs/by-name/br/brush-splat/package.nix index 452c72360efe..d53edccbb667 100644 --- a/pkgs/by-name/br/brush-splat/package.nix +++ b/pkgs/by-name/br/brush-splat/package.nix @@ -59,7 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/br/brush/package.nix b/pkgs/by-name/br/brush/package.nix index c5452f7a8f06..dcc4c28679b5 100644 --- a/pkgs/by-name/br/brush/package.nix +++ b/pkgs/by-name/br/brush/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; # Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; diff --git a/pkgs/by-name/bs/bsky-cli/package.nix b/pkgs/by-name/bs/bsky-cli/package.nix index 7b2feeec25eb..905be6a65b4c 100644 --- a/pkgs/by-name/bs/bsky-cli/package.nix +++ b/pkgs/by-name/bs/bsky-cli/package.nix @@ -30,7 +30,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/bsky"; - versionCheckProgramArg = "--version"; nativeBuildInputs = [ versionCheckHook ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix index 89a6d5ef271d..53c8ee7fc3a7 100644 --- a/pkgs/by-name/bt/btop/package.nix +++ b/pkgs/by-name/bt/btop/package.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix index ae9a75e7828c..2b70222fc2a2 100644 --- a/pkgs/by-name/bu/buildah-unwrapped/package.nix +++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix @@ -74,7 +74,6 @@ buildGoModule (finalAttrs: { writableTmpDirAsHomeHook versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; meta = { diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix index cd9f2d3a1d1f..3d740abff6c0 100644 --- a/pkgs/by-name/bu/buildstream/package.nix +++ b/pkgs/by-name/bu/buildstream/package.nix @@ -111,7 +111,6 @@ python3Packages.buildPythonApplication rec { ]; versionCheckProgram = "${placeholder "out"}/bin/bst"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/bulletty/package.nix b/pkgs/by-name/bu/bulletty/package.nix index a8d20c579b7d..0967e63903f6 100644 --- a/pkgs/by-name/bu/bulletty/package.nix +++ b/pkgs/by-name/bu/bulletty/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index 694c250318fe..b310af746da8 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index 66a390b0c9d0..039b8e8ae09c 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/bu/bundler/package.nix b/pkgs/by-name/bu/bundler/package.nix index 07f1b71d99dc..7a35a7ace0b5 100644 --- a/pkgs/by-name/bu/bundler/package.nix +++ b/pkgs/by-name/bu/bundler/package.nix @@ -25,7 +25,6 @@ buildRubyGem rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bundler"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ca/camilladsp/package.nix b/pkgs/by-name/ca/camilladsp/package.nix index 61a915021c63..03c96de960de 100644 --- a/pkgs/by-name/ca/camilladsp/package.nix +++ b/pkgs/by-name/ca/camilladsp/package.nix @@ -44,7 +44,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Flexible cross-platform IIR and FIR engine for crossovers, room correction etc"; diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index a49ac279ace5..f536f0d642a9 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -28,7 +28,6 @@ buildGoModule (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-aoc/package.nix b/pkgs/by-name/ca/cargo-aoc/package.nix index 53872b744128..c2a0bb2c9768 100644 --- a/pkgs/by-name/ca/cargo-aoc/package.nix +++ b/pkgs/by-name/ca/cargo-aoc/package.nix @@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-q0kpo6DNR+8129+vJSLoOC/bUYjlfaB77YTht6+kT00="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 5aca7c581568..11a3cea1ab35 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-Di7Nnp8qYqpTkKmmUYoKxSkntepG80vVF2AkaN5yW+U="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix index a03ee537c969..18bce576ee7e 100644 --- a/pkgs/by-name/ca/cargo-hakari/package.nix +++ b/pkgs/by-name/ca/cargo-hakari/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix index b98c0b3538ea..8196b5a9bcf7 100644 --- a/pkgs/by-name/ca/cargo-modules/package.nix +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Cargo plugin for showing a tree-like overview of a crate's modules"; diff --git a/pkgs/by-name/ca/cargo-seek/package.nix b/pkgs/by-name/ca/cargo-seek/package.nix index 30cfdc3e53f1..40c2fe80f0fe 100644 --- a/pkgs/by-name/ca/cargo-seek/package.nix +++ b/pkgs/by-name/ca/cargo-seek/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix index 84033d22dfe9..fb0355986bff 100644 --- a/pkgs/by-name/ca/catnip/package.nix +++ b/pkgs/by-name/ca/catnip/package.nix @@ -37,7 +37,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index bee94b36009f..5d965a11fb70 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -105,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/cbmc"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { extraArgs = [ diff --git a/pkgs/by-name/cf/cfn-changeset-viewer/package.nix b/pkgs/by-name/cf/cfn-changeset-viewer/package.nix index d6e768ba44b8..4d0e0403b7ca 100644 --- a/pkgs/by-name/cf/cfn-changeset-viewer/package.nix +++ b/pkgs/by-name/cf/cfn-changeset-viewer/package.nix @@ -24,7 +24,6 @@ buildNpmPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ch/chaos/package.nix b/pkgs/by-name/ch/chaos/package.nix index d3a5d44bb67b..fc17052d90e5 100644 --- a/pkgs/by-name/ch/chaos/package.nix +++ b/pkgs/by-name/ch/chaos/package.nix @@ -29,8 +29,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Tool to communicate with Chaos DNS API"; homepage = "https://github.com/projectdiscovery/chaos-client"; diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index a1ea2d0cbc56..d053bb82dda8 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -78,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/by-name/ch/check50/package.nix b/pkgs/by-name/ch/check50/package.nix index f82720beca02..c2335ee90a3d 100644 --- a/pkgs/by-name/ch/check50/package.nix +++ b/pkgs/by-name/ch/check50/package.nix @@ -37,7 +37,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "check50" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no python tests diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix index fd1871133b14..dd5021f048c5 100644 --- a/pkgs/by-name/cl/clang-uml/package.nix +++ b/pkgs/by-name/cl/clang-uml/package.nix @@ -79,7 +79,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Customizable automatic UML diagram generator for C++ based on Clang"; diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index 4ce8bb9bbd8f..a20ca9ad0da5 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { extraArgs = [ diff --git a/pkgs/by-name/cl/clashtui/package.nix b/pkgs/by-name/cl/clashtui/package.nix index 086aec1809be..54081266a062 100644 --- a/pkgs/by-name/cl/clashtui/package.nix +++ b/pkgs/by-name/cl/clashtui/package.nix @@ -30,8 +30,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 971a3c8e9d0a..4aad3193c607 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -39,7 +39,6 @@ buildNpmPackage (finalAttrs: { versionCheckHook ]; versionCheckKeepEnvironment = [ "HOME" ]; - versionCheckProgramArg = "--version"; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/cl/cli50/package.nix b/pkgs/by-name/cl/cli50/package.nix index 08b849ae1fdc..52ce04e440b4 100644 --- a/pkgs/by-name/cl/cli50/package.nix +++ b/pkgs/by-name/cl/cli50/package.nix @@ -31,7 +31,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "cli50" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no python tests diff --git a/pkgs/by-name/cl/clive/package.nix b/pkgs/by-name/cl/clive/package.nix index 37f904d2f3f8..65ba3cbbab92 100644 --- a/pkgs/by-name/cl/clive/package.nix +++ b/pkgs/by-name/cl/clive/package.nix @@ -43,7 +43,6 @@ buildGoModule rec { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doinstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index 177ec1179405..2ef0f91ee0c8 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = finalAttrs.cargoBuildFlags; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 04fe6bdf3e8b..51955b668180 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckPhaseInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index 4bd56963bca8..1715759a7690 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -130,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: { ''; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru = { inherit sources; diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix index af10f9c3bf07..43f2eea7fa7e 100644 --- a/pkgs/by-name/cl/cloudlist/package.nix +++ b/pkgs/by-name/cl/cloudlist/package.nix @@ -29,8 +29,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Tool for listing assets from multiple cloud providers"; homepage = "https://github.com/projectdiscovery/cloudlist"; diff --git a/pkgs/by-name/cm/cmake-language-server/package.nix b/pkgs/by-name/cm/cmake-language-server/package.nix index d03a6abe72bd..c28f5967b5a9 100644 --- a/pkgs/by-name/cm/cmake-language-server/package.nix +++ b/pkgs/by-name/cm/cmake-language-server/package.nix @@ -51,7 +51,6 @@ python3Packages.buildPythonApplication rec { pytest-datadir pytestCheckHook ]); - versionCheckProgramArg = "--version"; # version.py generated by pdm, no idea why it's not present in test phase # https://github.com/regen100/cmake-language-server/blob/v0.1.11/pyproject.toml#L35-L36 diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix index d361b95dbdeb..ccb3e73b713a 100644 --- a/pkgs/by-name/co/cobalt/package.nix +++ b/pkgs/by-name/co/cobalt/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-x4cnwCpbDYvUhlp8Fw2//NC9Z/kbv/hGF7MqKAft8bU="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index 455de0a48643..8a66aa32fd40 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Unholy spellchecker for code"; diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index a3121bf19eb2..b40238c1a992 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/codeium_language_server"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix index ff773fb4d6fa..797f5412cb56 100644 --- a/pkgs/by-name/co/codesnap/package.nix +++ b/pkgs/by-name/co/codesnap/package.nix @@ -36,7 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix index bd306fcbdfb4..8900b8fd69ff 100644 --- a/pkgs/by-name/co/committed/package.nix +++ b/pkgs/by-name/co/committed/package.nix @@ -45,7 +45,6 @@ rustPlatform.buildRustPackage { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/co/compare50/package.nix b/pkgs/by-name/co/compare50/package.nix index e1fa66017524..4d02e49000c2 100644 --- a/pkgs/by-name/co/compare50/package.nix +++ b/pkgs/by-name/co/compare50/package.nix @@ -49,7 +49,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "compare50" ]; - versionCheckProgramArg = "--version"; nativeCheckInputs = [ versionCheckHook ]; # repo does not use pytest diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index 5989b16545b5..7c737a724c02 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -20,7 +20,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies"; diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix index a2ec0d24a996..a20bd9201fda 100644 --- a/pkgs/by-name/co/conftest/package.nix +++ b/pkgs/by-name/co/conftest/package.nix @@ -56,7 +56,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Write tests against structured configuration data"; diff --git a/pkgs/by-name/co/container/package.nix b/pkgs/by-name/co/container/package.nix index 68ab9fb6a6eb..535134667b2b 100644 --- a/pkgs/by-name/co/container/package.nix +++ b/pkgs/by-name/co/container/package.nix @@ -46,7 +46,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix index e00c38f09ca1..bd8c4ce76600 100644 --- a/pkgs/by-name/co/conventional-changelog-cli/package.nix +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/co/countryfetch/package.nix b/pkgs/by-name/co/countryfetch/package.nix index 16b5763fb051..560276cfffe6 100644 --- a/pkgs/by-name/co/countryfetch/package.nix +++ b/pkgs/by-name/co/countryfetch/package.nix @@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=countryfetch" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index 58cd3ea21d74..c86f39c30123 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix index 20fc80c99e5f..7574b441bbc6 100644 --- a/pkgs/by-name/cp/cpplint/package.nix +++ b/pkgs/by-name/cp/cpplint/package.nix @@ -35,7 +35,6 @@ python3Packages.buildPythonApplication rec { testfixtures versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://github.com/cpplint/cpplint"; diff --git a/pkgs/by-name/cp/cppman/package.nix b/pkgs/by-name/cp/cppman/package.nix index b0ed1eacf92a..176f2979bc2a 100644 --- a/pkgs/by-name/cp/cppman/package.nix +++ b/pkgs/by-name/cp/cppman/package.nix @@ -55,7 +55,6 @@ python3Packages.buildPythonApplication rec { ]; # Writable $HOME is required for `cppman --version` to work versionCheckKeepEnvironment = "HOME"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cr/criticality-score/package.nix b/pkgs/by-name/cr/criticality-score/package.nix index 9d1409248466..274d541b7ffc 100644 --- a/pkgs/by-name/cr/criticality-score/package.nix +++ b/pkgs/by-name/cr/criticality-score/package.nix @@ -41,7 +41,6 @@ buildGo124Module rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { description = "Gives criticality score for an open source project"; diff --git a/pkgs/by-name/cr/crusader/package.nix b/pkgs/by-name/cr/crusader/package.nix index db8a5e5ec3d5..71b20108a88c 100644 --- a/pkgs/by-name/cr/crusader/package.nix +++ b/pkgs/by-name/cr/crusader/package.nix @@ -70,7 +70,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index e2e9daddb5e9..33999c40e9a1 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -42,7 +42,6 @@ buildGoModule (finalAttrs: { nativeCheckInputs = [ writableTmpDirAsHomeHook ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index dfcc8738343e..5a3bb73c571a 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -21,7 +21,6 @@ buildDotnetGlobalTool rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ct/ctags-lsp/package.nix b/pkgs/by-name/ct/ctags-lsp/package.nix index 590553a82ec6..49493e7f58e2 100644 --- a/pkgs/by-name/ct/ctags-lsp/package.nix +++ b/pkgs/by-name/ct/ctags-lsp/package.nix @@ -42,7 +42,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index ed6d28d92875..11df621889ee 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index 592bbf2f1e71..496d56dda6ce 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -71,7 +71,6 @@ let versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/czkawka_cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 67e802908d7a..9c40cd6b4d9e 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -54,8 +54,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru = { tests = { inherit (nixosTests) dae; diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index ebd9a93d58c1..c4a2ca1b88ff 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -198,7 +198,6 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = gitUpdater { diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index 38813b474450..ceb5acadf01f 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -84,7 +84,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/databricks"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/db/dbx/package.nix b/pkgs/by-name/db/dbx/package.nix index 29d90cd8eafa..e803dc6302fa 100644 --- a/pkgs/by-name/db/dbx/package.nix +++ b/pkgs/by-name/db/dbx/package.nix @@ -129,7 +129,6 @@ python.pkgs.buildPythonApplication rec { pytest-xdist pytestCheckHook ]); - versionCheckProgramArg = "--version"; disabledTests = [ # Fails because of dbfs CLI wrong call diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix index 3e20e9b33b5e..761a69f21eb4 100644 --- a/pkgs/by-name/dd/ddev/package.nix +++ b/pkgs/by-name/dd/ddev/package.nix @@ -50,7 +50,6 @@ buildGoModule rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; meta = with lib; { diff --git a/pkgs/by-name/de/deepcool-digital-linux/package.nix b/pkgs/by-name/de/deepcool-digital-linux/package.nix index 427b8393a67a..ddcd9c19c3b3 100644 --- a/pkgs/by-name/de/deepcool-digital-linux/package.nix +++ b/pkgs/by-name/de/deepcool-digital-linux/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = false; # FIXME: version cmd returns 0.8.3, set to true when we switch to a stable version nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/de/deputy/package.nix b/pkgs/by-name/de/deputy/package.nix index 53d43df4c988..67687d15a77a 100644 --- a/pkgs/by-name/de/deputy/package.nix +++ b/pkgs/by-name/de/deputy/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-TezOv07Dl99jw8FIqJvx6F8X8Au/aMPC/CXDYLkQDnE="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/de/deterministic-zip/package.nix b/pkgs/by-name/de/deterministic-zip/package.nix index 527ea94d2025..601d99c494b0 100644 --- a/pkgs/by-name/de/deterministic-zip/package.nix +++ b/pkgs/by-name/de/deterministic-zip/package.nix @@ -23,7 +23,6 @@ buildGoModule (finalAttrs: { "-X github.com/timo-reymann/deterministic-zip/pkg/buildinfo.Version=${finalAttrs.version}" ]; - versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix index 9d40a1637f34..6b68aceb60f1 100644 --- a/pkgs/by-name/di/difftastic/package.nix +++ b/pkgs/by-name/di/difftastic/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/difft"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/di/display3d/package.nix b/pkgs/by-name/di/display3d/package.nix index 6b9667d82059..90d4121dd9a1 100644 --- a/pkgs/by-name/di/display3d/package.nix +++ b/pkgs/by-name/di/display3d/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/di/distant/package.nix b/pkgs/by-name/di/distant/package.nix index 6573d5e9fbc8..6f51d4a6589c 100644 --- a/pkgs/by-name/di/distant/package.nix +++ b/pkgs/by-name/di/distant/package.nix @@ -66,7 +66,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix index 228db44bb066..4e047a1130ab 100644 --- a/pkgs/by-name/dj/django-upgrade/package.nix +++ b/pkgs/by-name/dj/django-upgrade/package.nix @@ -26,8 +26,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - pythonImportsCheck = [ "django_upgrade" ]; meta = { diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix index c0d8db509963..7fe0a09825c1 100644 --- a/pkgs/by-name/do/docker-language-server/package.nix +++ b/pkgs/by-name/do/docker-language-server/package.nix @@ -51,7 +51,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/do/dovi-tool/package.nix b/pkgs/by-name/do/dovi-tool/package.nix index b3b8244785a8..9cf19591cc63 100644 --- a/pkgs/by-name/do/dovi-tool/package.nix +++ b/pkgs/by-name/do/dovi-tool/package.nix @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/dovi_tool"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/do/doxx/package.nix b/pkgs/by-name/do/doxx/package.nix index b12464d65a31..e68a101187f0 100644 --- a/pkgs/by-name/do/doxx/package.nix +++ b/pkgs/by-name/do/doxx/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix index e076bae05cdc..5b61d9ebf543 100644 --- a/pkgs/by-name/dp/dpkg/package.nix +++ b/pkgs/by-name/dp/dpkg/package.nix @@ -125,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; setupHook = ./setup-hook.sh; diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 713aac13f0bf..1a44ecb6ee1d 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/dprint"; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; passthru = { diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index e9192fecaf46..d86c9a566447 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index 57ac6d47ccb4..ee2838fa65d3 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -106,7 +106,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index 35d3afef4632..537c4af17314 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -48,7 +48,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/dust"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/dw/dwarf2json/package.nix b/pkgs/by-name/dw/dwarf2json/package.nix index 7b910440c0ce..34f8851e84e4 100644 --- a/pkgs/by-name/dw/dwarf2json/package.nix +++ b/pkgs/by-name/dw/dwarf2json/package.nix @@ -20,7 +20,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = with lib; { homepage = "https://github.com/volatilityfoundation/dwarf2json"; diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index a43824fd2e87..8669f2eb3dde 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -112,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/dwarfs"; meta = { diff --git a/pkgs/by-name/ec/ec2-instance-selector/package.nix b/pkgs/by-name/ec/ec2-instance-selector/package.nix index a4fa861e10d2..4ffd67515d39 100644 --- a/pkgs/by-name/ec/ec2-instance-selector/package.nix +++ b/pkgs/by-name/ec/ec2-instance-selector/package.nix @@ -32,7 +32,6 @@ buildGoModule (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; doInstallCheck = true; diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix index 6dd1b1b9aa2f..977c49caeff9 100644 --- a/pkgs/by-name/ed/eddie/package.nix +++ b/pkgs/by-name/ed/eddie/package.nix @@ -130,7 +130,6 @@ buildDotnetModule (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/eddie-cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ek/eks-node-viewer/package.nix b/pkgs/by-name/ek/eks-node-viewer/package.nix index f52d258e7dbb..95cc6a51eb0e 100644 --- a/pkgs/by-name/ek/eks-node-viewer/package.nix +++ b/pkgs/by-name/ek/eks-node-viewer/package.nix @@ -31,7 +31,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/el/elm-land/package.nix b/pkgs/by-name/el/elm-land/package.nix index 07b4c59f6a9b..ee5de487db36 100644 --- a/pkgs/by-name/el/elm-land/package.nix +++ b/pkgs/by-name/el/elm-land/package.nix @@ -40,7 +40,6 @@ buildNpmPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = writeShellScript "update-elm-land" '' diff --git a/pkgs/by-name/em/emcee/package.nix b/pkgs/by-name/em/emcee/package.nix index a487d0784bbe..0352f28b2099 100644 --- a/pkgs/by-name/em/emcee/package.nix +++ b/pkgs/by-name/em/emcee/package.nix @@ -29,7 +29,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix index a973b97fa508..c6535f045d99 100644 --- a/pkgs/by-name/em/emmylua-check/package.nix +++ b/pkgs/by-name/em/emmylua-check/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/emmylua_check"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index b0c4642ead5e..762bffbbe2a3 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/emmylua_doc_cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix index 3fbeb620266c..be9ba37a1251 100644 --- a/pkgs/by-name/em/emmylua-ls/package.nix +++ b/pkgs/by-name/em/emmylua-ls/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/emmylua_ls"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/en/encrypted-dns-server/package.nix b/pkgs/by-name/en/encrypted-dns-server/package.nix index a9ecc66bd25c..e54414f1f649 100644 --- a/pkgs/by-name/en/encrypted-dns-server/package.nix +++ b/pkgs/by-name/en/encrypted-dns-server/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/encrypted-dns"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/DNSCrypt/encrypted-dns-server/releases/tag/${version}"; diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index f927672f4213..3eb821a79bf8 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/envoy"; - versionCheckProgramArg = "--version"; passthru = { tests.envoy-bin = nixosTests.envoy-bin; diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 93c366b2e72a..d6ef3a0d3542 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -174,8 +174,6 @@ python.pkgs.buildPythonApplication rec { "test_run_platformio_cli_sets_environment_variables" ]; - versionCheckProgramArg = "--version"; - passthru = { dashboard = python.pkgs.esphome-dashboard; updateScript = callPackage ./update.nix { }; diff --git a/pkgs/by-name/eu/eukleides/package.nix b/pkgs/by-name/eu/eukleides/package.nix index c36f0e313a86..dfa528afce27 100644 --- a/pkgs/by-name/eu/eukleides/package.nix +++ b/pkgs/by-name/eu/eukleides/package.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Geometry Drawing Language"; diff --git a/pkgs/by-name/ev/evil-winrm-py/package.nix b/pkgs/by-name/ev/evil-winrm-py/package.nix index 8b54b252b938..41027b972cc6 100644 --- a/pkgs/by-name/ev/evil-winrm-py/package.nix +++ b/pkgs/by-name/ev/evil-winrm-py/package.nix @@ -41,7 +41,6 @@ python3Packages.buildPythonApplication rec { buildInputs = lib.optionals enableKerberos [ libkrb5 ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fa/fahclient/package.nix b/pkgs/by-name/fa/fahclient/package.nix index a4bb29661727..3d5ffd2a41d4 100644 --- a/pkgs/by-name/fa/fahclient/package.nix +++ b/pkgs/by-name/fa/fahclient/package.nix @@ -73,7 +73,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; }; diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 4677d48ea5ae..87f15551c8d3 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -257,7 +257,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fe/feroxbuster/package.nix b/pkgs/by-name/fe/feroxbuster/package.nix index 0066b5c86ada..68a8c726c9d3 100644 --- a/pkgs/by-name/fe/feroxbuster/package.nix +++ b/pkgs/by-name/fe/feroxbuster/package.nix @@ -36,8 +36,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/fe/ferretdb/package.nix b/pkgs/by-name/fe/ferretdb/package.nix index 6dbd19811140..0ee90dac7fad 100644 --- a/pkgs/by-name/fe/ferretdb/package.nix +++ b/pkgs/by-name/fe/ferretdb/package.nix @@ -34,7 +34,6 @@ buildGoModule (finalAttrs: { # the binary panics if something required wasn't set during compilation doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.tests = nixosTests.ferretdb; diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix index 834339f6e076..75157cba714f 100644 --- a/pkgs/by-name/fe/ferron/package.nix +++ b/pkgs/by-name/fe/ferron/package.nix @@ -36,7 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix index 3a89fbaa1b0d..102847390664 100644 --- a/pkgs/by-name/fi/filen-cli/package.nix +++ b/pkgs/by-name/fi/filen-cli/package.nix @@ -64,7 +64,6 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/filen"; - versionCheckProgramArg = "--version"; # Writes $HOME/Library/Application Support on darwin doInstallCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 61d3dbcd4295..36d51faf2fbb 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -115,7 +115,6 @@ let # Note that at this point in evaluation, there is nothing whatsoever on the # fish_function_path. That means we don't have most fish builtins, e.g., `eval`. - # additional profiles are expected in order of precedence, which means the reverse of the # NIX_PROFILES variable (same as config.environment.profiles) set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1] @@ -356,7 +355,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; # Ensure that we don't vendor libpcre2, but instead link against the one from nixpkgs diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix index b14ef5d13137..8bab8ff4b807 100644 --- a/pkgs/by-name/fi/fishnet/package.nix +++ b/pkgs/by-name/fi/fishnet/package.nix @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru = { updateScript = lib.getExe (writeShellApplication { diff --git a/pkgs/by-name/fi/fishy/package.nix b/pkgs/by-name/fi/fishy/package.nix index 87633558cb7e..302525450f3c 100644 --- a/pkgs/by-name/fi/fishy/package.nix +++ b/pkgs/by-name/fi/fishy/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fl/flac/package.nix b/pkgs/by-name/fl/flac/package.nix index bcd2df459fc1..d8a654779866 100644 --- a/pkgs/by-name/fl/flac/package.nix +++ b/pkgs/by-name/fl/flac/package.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 61d88c37e69d..9357b35f71bc 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -113,8 +113,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru = { tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) fluent-bit; diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix index d6383e9ef221..b42a49615920 100644 --- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix @@ -32,7 +32,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/flux-operator-mcp"; - versionCheckProgramArg = "--version"; doInstallCheck = true; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix index 8d86b54fb5be..a4818bf64109 100644 --- a/pkgs/by-name/fl/fluxcd-operator/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator/package.nix @@ -32,7 +32,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/flux-operator"; - versionCheckProgramArg = "--version"; doInstallCheck = true; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 121c3ece070d..7e00b707eef8 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -82,7 +82,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fo/fortran-fpm/package.nix b/pkgs/by-name/fo/fortran-fpm/package.nix index 225684d8cd45..6f02474dbb84 100644 --- a/pkgs/by-name/fo/fortran-fpm/package.nix +++ b/pkgs/by-name/fo/fortran-fpm/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index 8db1a61165df..481b6a205b88 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/forge"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix index 9639ef699484..69c0bc0bc327 100644 --- a/pkgs/by-name/fx/fx/package.nix +++ b/pkgs/by-name/fx/fx/package.nix @@ -38,7 +38,6 @@ buildGoModule (finalAttrs: { ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; meta = { diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix index 065d50c50d1e..78cc3f0b6dd9 100644 --- a/pkgs/by-name/gd/gdscript-formatter/package.nix +++ b/pkgs/by-name/gd/gdscript-formatter/package.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix index ba1e841b18cb..c32476534282 100644 --- a/pkgs/by-name/ge/gemmi/package.nix +++ b/pkgs/by-name/ge/gemmi/package.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { addBinToPathHook versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Numerical precision error diff --git a/pkgs/by-name/ge/geteduroam-cli/package.nix b/pkgs/by-name/ge/geteduroam-cli/package.nix index e38a24fd4b7b..c662ecdec1f2 100644 --- a/pkgs/by-name/ge/geteduroam-cli/package.nix +++ b/pkgs/by-name/ge/geteduroam-cli/package.nix @@ -26,7 +26,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/geteduroam-cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix index fd4c0218b897..0b77dd2f1a20 100644 --- a/pkgs/by-name/ge/geteduroam/package.nix +++ b/pkgs/by-name/ge/geteduroam/package.nix @@ -61,7 +61,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/geteduroam-gui"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index 3c7ad6786dde..7c14a55ba528 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/share/vim ln -s $vim $out/share/vim-plugins - remove-references-to -t ${finalAttrs.deps} $out/bin/.ghostty-wrapped ''; @@ -152,8 +151,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; - versionCheckProgramArg = "--version"; - passthru = { tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) allTerminfo; diff --git a/pkgs/by-name/gi/git-cola/package.nix b/pkgs/by-name/gi/git-cola/package.nix index 23eea9932438..b4a486588a0a 100644 --- a/pkgs/by-name/gi/git-cola/package.nix +++ b/pkgs/by-name/gi/git-cola/package.nix @@ -54,8 +54,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - disabledTestPaths = [ "qtpy/" "contrib/win32" diff --git a/pkgs/by-name/gi/git-conventional-commits/package.nix b/pkgs/by-name/gi/git-conventional-commits/package.nix index 954247d554f4..d4191bd7715c 100644 --- a/pkgs/by-name/gi/git-conventional-commits/package.nix +++ b/pkgs/by-name/gi/git-conventional-commits/package.nix @@ -28,7 +28,6 @@ buildNpmPackage { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix index dc17e1f8fbcd..3b6135ba5d46 100644 --- a/pkgs/by-name/gi/git-lfs/package.nix +++ b/pkgs/by-name/gi/git-lfs/package.nix @@ -94,7 +94,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gi/github-distributed-owners/package.nix b/pkgs/by-name/gi/github-distributed-owners/package.nix index 4d8c8500e6d1..cd5523cf1b89 100644 --- a/pkgs/by-name/gi/github-distributed-owners/package.nix +++ b/pkgs/by-name/gi/github-distributed-owners/package.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-pt/GoXF/uSU78pZqG8PgFe+tlbwZH2qpGQD7jgC52NM="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index ce2b3267390d..aca298b95460 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -31,7 +31,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index 0592229902ec..c46291eeab87 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -101,8 +101,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/gi/gitlint/package.nix b/pkgs/by-name/gi/gitlint/package.nix index a66dc6a866da..c880cf699c87 100644 --- a/pkgs/by-name/gi/gitlint/package.nix +++ b/pkgs/by-name/gi/gitlint/package.nix @@ -39,7 +39,6 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "gitlint" diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 7e3ef73d83d2..ca6aab816ade 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -27,7 +27,6 @@ buildGoModule (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix index 5f07e0f79d90..435c6f6c8247 100644 --- a/pkgs/by-name/gl/glauth/package.nix +++ b/pkgs/by-name/gl/glauth/package.nix @@ -40,7 +40,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = with lib; { description = "Lightweight LDAP server for development, home use, or CI"; diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix index e6aef1932490..7cfbc3b72d42 100644 --- a/pkgs/by-name/gl/glpi-agent/package.nix +++ b/pkgs/by-name/gl/glpi-agent/package.nix @@ -118,7 +118,6 @@ perlPackages.buildPerlPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix index 64de2292f07e..43c06c1312b7 100644 --- a/pkgs/by-name/go/go-chromecast/package.nix +++ b/pkgs/by-name/go/go-chromecast/package.nix @@ -38,8 +38,6 @@ buildGoModule rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' installShellCompletion --cmd go-chromecast \ --bash <($out/bin/go-chromecast completion bash) \ diff --git a/pkgs/by-name/go/go-sendxmpp/package.nix b/pkgs/by-name/go/go-sendxmpp/package.nix index 449b57cd5175..90b9358b34b2 100644 --- a/pkgs/by-name/go/go-sendxmpp/package.nix +++ b/pkgs/by-name/go/go-sendxmpp/package.nix @@ -28,7 +28,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Tool to send messages or files to an XMPP contact or MUC"; diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix index d02c3588692e..96005d6033ec 100644 --- a/pkgs/by-name/go/go-task/package.nix +++ b/pkgs/by-name/go/go-task/package.nix @@ -48,7 +48,6 @@ buildGoModule (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/task"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/gocovsh/package.nix b/pkgs/by-name/go/gocovsh/package.nix index d99fb8934d2e..929ce06968c4 100644 --- a/pkgs/by-name/go/gocovsh/package.nix +++ b/pkgs/by-name/go/gocovsh/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix index bc9946df3589..9dfaa0eb0a93 100644 --- a/pkgs/by-name/go/gojq/package.nix +++ b/pkgs/by-name/go/gojq/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; postInstallCheck = '' $out/bin/gojq --help > /dev/null $out/bin/gojq --raw-output '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null diff --git a/pkgs/by-name/go/gokapi/package.nix b/pkgs/by-name/go/gokapi/package.nix index 89e095fd5618..24334cd1f953 100644 --- a/pkgs/by-name/go/gokapi/package.nix +++ b/pkgs/by-name/go/gokapi/package.nix @@ -49,7 +49,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index 618952753b36..2dd2752690ee 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -27,7 +27,6 @@ buildGoModule rec { ldflags = [ "-s" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/golem/package.nix b/pkgs/by-name/go/golem/package.nix index 0df59871d0c6..527d1d69ea48 100644 --- a/pkgs/by-name/go/golem/package.nix +++ b/pkgs/by-name/go/golem/package.nix @@ -60,7 +60,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = [ "${placeholder "out"}/bin/golem-cli" ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix index 04b7afaf56ee..d370035add3b 100644 --- a/pkgs/by-name/go/gomanagedocker/package.nix +++ b/pkgs/by-name/go/gomanagedocker/package.nix @@ -48,7 +48,6 @@ buildGoModule { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/go/gonzo/package.nix b/pkgs/by-name/go/gonzo/package.nix index c6b6b6ba69c4..521cac0a5512 100644 --- a/pkgs/by-name/go/gonzo/package.nix +++ b/pkgs/by-name/go/gonzo/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "TUI log analysis tool"; diff --git a/pkgs/by-name/go/gotestwaf/package.nix b/pkgs/by-name/go/gotestwaf/package.nix index 2d96a832aa7c..6538101bcc4a 100644 --- a/pkgs/by-name/go/gotestwaf/package.nix +++ b/pkgs/by-name/go/gotestwaf/package.nix @@ -31,8 +31,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Tool for API and OWASP attack simulation"; homepage = "https://github.com/wallarm/gotestwaf"; diff --git a/pkgs/by-name/go/gotip/package.nix b/pkgs/by-name/go/gotip/package.nix index 9b1356181f9d..be48b42590bc 100644 --- a/pkgs/by-name/go/gotip/package.nix +++ b/pkgs/by-name/go/gotip/package.nix @@ -26,7 +26,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gp/gping/package.nix b/pkgs/by-name/gp/gping/package.nix index dbad6a8f032b..4dd42e54ce94 100644 --- a/pkgs/by-name/gp/gping/package.nix +++ b/pkgs/by-name/gp/gping/package.nix @@ -41,8 +41,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/gp/gpt-cli/package.nix b/pkgs/by-name/gp/gpt-cli/package.nix index d0bcb4129d6f..d8215eead6ca 100644 --- a/pkgs/by-name/gp/gpt-cli/package.nix +++ b/pkgs/by-name/gp/gpt-cli/package.nix @@ -51,8 +51,6 @@ python3Packages.buildPythonApplication rec { versionCheckProgram = "${placeholder "out"}/bin/gpt"; - versionCheckProgramArg = "--version"; - meta = { description = "Command-line interface for ChatGPT, Claude and Bard"; homepage = "https://github.com/kharvd/gpt-cli"; diff --git a/pkgs/by-name/gp/gpufetch/package.nix b/pkgs/by-name/gp/gpufetch/package.nix index 123dbe399224..79a8e051a7a8 100644 --- a/pkgs/by-name/gp/gpufetch/package.nix +++ b/pkgs/by-name/gp/gpufetch/package.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gr/grafanactl/package.nix b/pkgs/by-name/gr/grafanactl/package.nix index 81f057479a2e..8103469ba0e8 100644 --- a/pkgs/by-name/gr/grafanactl/package.nix +++ b/pkgs/by-name/gr/grafanactl/package.nix @@ -37,7 +37,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gr/gren/package.nix b/pkgs/by-name/gr/gren/package.nix index d7e41e12eab3..197d69c5858d 100644 --- a/pkgs/by-name/gr/gren/package.nix +++ b/pkgs/by-name/gr/gren/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/gren"; - versionCheckProgramArg = "--version"; passthru = { backend = haskellPackages.callPackage ./generated-backend-package.nix { }; diff --git a/pkgs/by-name/gu/guesswidth/package.nix b/pkgs/by-name/gu/guesswidth/package.nix index 92ad7241f369..69500e618912 100644 --- a/pkgs/by-name/gu/guesswidth/package.nix +++ b/pkgs/by-name/gu/guesswidth/package.nix @@ -45,7 +45,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix index 6a9852570abf..3c9fdb9c3d3a 100644 --- a/pkgs/by-name/gu/gurk-rs/package.nix +++ b/pkgs/by-name/gu/gurk-rs/package.nix @@ -55,7 +55,6 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/har-to-k6/package.nix b/pkgs/by-name/ha/har-to-k6/package.nix index e7e1ff22ac46..e6bdb12bb62d 100644 --- a/pkgs/by-name/ha/har-to-k6/package.nix +++ b/pkgs/by-name/ha/har-to-k6/package.nix @@ -22,7 +22,6 @@ buildNpmPackage rec { npmDepsHash = "sha256-RuK3CzcMkPt5MFEZpYBDtMMShHTT/115pRk1CmRkiek="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/hashrat/package.nix b/pkgs/by-name/ha/hashrat/package.nix index 9f4fd90d8c62..e8947b1ad201 100644 --- a/pkgs/by-name/ha/hashrat/package.nix +++ b/pkgs/by-name/ha/hashrat/package.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index 4b3f0c4ebbc2..3014652af4fb 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -70,8 +70,6 @@ python3Packages.buildPythonApplication rec { darwin.ps ]; - versionCheckProgramArg = "--version"; - disabledTests = [ # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0) "test_default" diff --git a/pkgs/by-name/ha/hath-rust/package.nix b/pkgs/by-name/ha/hath-rust/package.nix index caba2f932eb2..afa5f497a380 100644 --- a/pkgs/by-name/ha/hath-rust/package.nix +++ b/pkgs/by-name/ha/hath-rust/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-eoki+QXqBC26PC7qNlOLlgkXxc6Fsx7T4o9GIbAaO8Y="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix index 2b864119dc71..c0aaacbe6de3 100644 --- a/pkgs/by-name/ha/hatsu/package.nix +++ b/pkgs/by-name/ha/hatsu/package.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5c6boVdq0XXbtVHqmIGoxJGQRh8lvn2jbmALPuOSMs4="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hc/hcdiag/package.nix b/pkgs/by-name/hc/hcdiag/package.nix index 9f6fde89862e..a924a7fc676c 100644 --- a/pkgs/by-name/hc/hcdiag/package.nix +++ b/pkgs/by-name/hc/hcdiag/package.nix @@ -22,7 +22,6 @@ buildGoModule rec { nativeInstallCheckHooks = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/he/helix-db/package.nix b/pkgs/by-name/he/helix-db/package.nix index 9905469d2a10..e891584f98af 100644 --- a/pkgs/by-name/he/helix-db/package.nix +++ b/pkgs/by-name/he/helix-db/package.nix @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix index 24807a948a21..0320fd18c8ae 100644 --- a/pkgs/by-name/he/helix/package.nix +++ b/pkgs/by-name/he/helix/package.nix @@ -45,7 +45,6 @@ rustPlatform.buildRustPackage (final: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/hx"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index f740a2dadd21..f765181dd649 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix index c01266c629c7..c0096251de06 100644 --- a/pkgs/by-name/he/hexyl/package.nix +++ b/pkgs/by-name/he/hexyl/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hg/hgrep/package.nix b/pkgs/by-name/hg/hgrep/package.nix index 2fb66a2f19b5..35cac23994ba 100644 --- a/pkgs/by-name/hg/hgrep/package.nix +++ b/pkgs/by-name/hg/hgrep/package.nix @@ -25,7 +25,6 @@ rustPlatform.buildRustPackage { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix index aefbaea2efde..fee3d31028d6 100644 --- a/pkgs/by-name/hl/hl-log-viewer/package.nix +++ b/pkgs/by-name/hl/hl-log-viewer/package.nix @@ -36,7 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/hl"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix index 641245ea7fb6..14eb3dbe889b 100644 --- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix +++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix @@ -58,7 +58,6 @@ buildNpmPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Configure Homebridge, monitor and backup from a browser"; diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix index ec9643d7c686..596b7fbc8c4a 100644 --- a/pkgs/by-name/ho/honeycomb-refinery/package.nix +++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix @@ -44,7 +44,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ho/hot-resize/package.nix b/pkgs/by-name/ho/hot-resize/package.nix index 8a8101fb009e..4e2a6f867edd 100644 --- a/pkgs/by-name/ho/hot-resize/package.nix +++ b/pkgs/by-name/ho/hot-resize/package.nix @@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ht/http-prompt/package.nix b/pkgs/by-name/ht/http-prompt/package.nix index 48277e40c773..bb1a41a9255c 100644 --- a/pkgs/by-name/ht/http-prompt/package.nix +++ b/pkgs/by-name/ht/http-prompt/package.nix @@ -70,8 +70,6 @@ python.pkgs.buildPythonApplication rec { "test_vi_mode" ]; - versionCheckProgramArg = "--version"; - meta = { description = "Interactive command-line HTTP client featuring autocomplete and syntax highlighting"; mainProgram = "http-prompt"; diff --git a/pkgs/by-name/ht/httpyac/package.nix b/pkgs/by-name/ht/httpyac/package.nix index 22cd263adb51..8742f7775cb0 100644 --- a/pkgs/by-name/ht/httpyac/package.nix +++ b/pkgs/by-name/ht/httpyac/package.nix @@ -22,7 +22,6 @@ buildNpmPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index a258372f80fe..5d9479b93e30 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "PATH" ]; doInstallCheck = true; diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix index 7992aa8dddfa..d213abef5867 100644 --- a/pkgs/by-name/hy/hyperrogue/package.nix +++ b/pkgs/by-name/hy/hyperrogue/package.nix @@ -102,8 +102,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = "--version"; - doInstallCheck = !stdenv.hostPlatform.isDarwin; passthru = { diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix index 6db78442252e..714c9c8f5f93 100644 --- a/pkgs/by-name/ia/iamb/package.nix +++ b/pkgs/by-name/ia/iamb/package.nix @@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/is/isa-l/package.nix b/pkgs/by-name/is/isa-l/package.nix index 122d62c7e5d8..220948ac4eb4 100644 --- a/pkgs/by-name/is/isa-l/package.nix +++ b/pkgs/by-name/is/isa-l/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/igzip"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/iw/iwe/package.nix b/pkgs/by-name/iw/iwe/package.nix index 11d9a01bb761..3284f866935c 100644 --- a/pkgs/by-name/iw/iwe/package.nix +++ b/pkgs/by-name/iw/iwe/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/ja/jacktrip/package.nix b/pkgs/by-name/ja/jacktrip/package.nix index 6e9b6dfa2290..7bb63f730996 100644 --- a/pkgs/by-name/ja/jacktrip/package.nix +++ b/pkgs/by-name/ja/jacktrip/package.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix index 5a67ffa753d5..177f98179091 100644 --- a/pkgs/by-name/ja/jaq/package.nix +++ b/pkgs/by-name/ja/jaq/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index 72fcde7dfc7d..c4a12b766ef6 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/jd/jdd/package.nix b/pkgs/by-name/jd/jdd/package.nix index 0fbecb95bcd2..9d61d4509041 100644 --- a/pkgs/by-name/jd/jdd/package.nix +++ b/pkgs/by-name/jd/jdd/package.nix @@ -22,7 +22,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Johnny Decimal daemon for automatically organizing files into the correct drawer using their filename"; diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index 25276ee178ae..d50d4173f88a 100644 --- a/pkgs/by-name/je/jellyfin-tui/package.nix +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec { writableTmpDirAsHomeHook versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; preInstallCheck = '' mkdir -p "$HOME/${ diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index dbcfb71f6c39..ab7426a8677d 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index 148c728a990c..fc5f995c0a90 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-dR9cb3TBxrRGP3BFYro/nGe5XVEfJuTZbQLo+FUfFNs="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix index bddd524cf6e0..e9467c3ddf59 100644 --- a/pkgs/by-name/jq/jql/package.nix +++ b/pkgs/by-name/jq/jql/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/js/json-schema-catalog-rs/package.nix b/pkgs/by-name/js/json-schema-catalog-rs/package.nix index b441646e7283..cd96aa37bfa8 100644 --- a/pkgs/by-name/js/json-schema-catalog-rs/package.nix +++ b/pkgs/by-name/js/json-schema-catalog-rs/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/json-schema-catalog"; - versionCheckProgramArg = "--version"; passthru = { tests = { diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index 8615db218854..46e27a19cd7e 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 62c50c0bb234..cdc432d7add5 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/jj"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix index 0aebc3b28495..7e90468dac00 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-dPTrIc/hTbMlFDXYMk/dTjqaNECazldfW43egDOwyLM="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 084068f0e28b..92ddd77e52c7 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index 418e999bcbc6..f1e3c5990cd9 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -88,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ko/koto/package.nix b/pkgs/by-name/ko/koto/package.nix index 5ae56e34cbd5..3c9cf26a59eb 100644 --- a/pkgs/by-name/ko/koto/package.nix +++ b/pkgs/by-name/ko/koto/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=koto_cli" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix index 7b55b7f76acf..fdfd92a84dfb 100644 --- a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix +++ b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix @@ -39,7 +39,6 @@ buildPythonPackage rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "kubernetes_validate" ]; diff --git a/pkgs/by-name/ku/kubexporter/package.nix b/pkgs/by-name/ku/kubexporter/package.nix index 934b843ec25c..46c5f0fe21af 100644 --- a/pkgs/by-name/ku/kubexporter/package.nix +++ b/pkgs/by-name/ku/kubexporter/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ku/kuzu/package.nix b/pkgs/by-name/ku/kuzu/package.nix index 056efc08c68c..e63600462c99 100644 --- a/pkgs/by-name/ku/kuzu/package.nix +++ b/pkgs/by-name/ku/kuzu/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; meta = { changelog = "https://github.com/kuzudb/kuzu/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 181f5ef31551..7c7c9bc4db8a 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -79,7 +79,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru = { providedSessions = [ "labwc" ]; diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix index 51597f740649..758faf417a7d 100644 --- a/pkgs/by-name/la/laze/package.nix +++ b/pkgs/by-name/la/laze/package.nix @@ -46,7 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix index 64e3a0a57499..9a79af2c7ed8 100644 --- a/pkgs/by-name/la/lazyjj/package.nix +++ b/pkgs/by-name/la/lazyjj/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/lc/lcov/package.nix b/pkgs/by-name/lc/lcov/package.nix index dbb78518612d..084152895912 100644 --- a/pkgs/by-name/lc/lcov/package.nix +++ b/pkgs/by-name/lc/lcov/package.nix @@ -62,8 +62,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; - versionCheckProgramArg = "--version"; - nativeInstallCheckInputs = [ versionCheckHook ]; meta = { diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix index e3a4acd82250..233e6c9c7caf 100644 --- a/pkgs/by-name/le/ledger/package.nix +++ b/pkgs/by-name/le/ledger/package.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index 7ce41595e4ac..21f8d5737533 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix index 5f3ebdeed22c..fd386e4b87a6 100644 --- a/pkgs/by-name/le/lexical/package.nix +++ b/pkgs/by-name/le/lexical/package.nix @@ -43,7 +43,6 @@ beamPackages.mixRelease rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/li/librep/package.nix b/pkgs/by-name/li/librep/package.nix index 795d43eea991..bc6b148962ff 100644 --- a/pkgs/by-name/li/librep/package.nix +++ b/pkgs/by-name/li/librep/package.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; meta = { diff --git a/pkgs/by-name/li/lightning-terminal/package.nix b/pkgs/by-name/li/lightning-terminal/package.nix index 6943c8a28ef5..4410bfa9d613 100644 --- a/pkgs/by-name/li/lightning-terminal/package.nix +++ b/pkgs/by-name/li/lightning-terminal/package.nix @@ -95,7 +95,6 @@ buildGoModule rec { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/litcli"; - versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/li/lightningstream/package.nix b/pkgs/by-name/li/lightningstream/package.nix index 94f19ca2d3c6..25a6c4d1d1d7 100644 --- a/pkgs/by-name/li/lightningstream/package.nix +++ b/pkgs/by-name/li/lightningstream/package.nix @@ -53,7 +53,6 @@ buildGoModule { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix index d7571b1435ce..50b59a1fa42a 100644 --- a/pkgs/by-name/li/ligolo-ng/package.nix +++ b/pkgs/by-name/li/ligolo-ng/package.nix @@ -43,7 +43,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/ligolo-agent"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix index f4231043c34f..55c4f1f44327 100644 --- a/pkgs/by-name/li/lima/package.nix +++ b/pkgs/by-name/li/lima/package.nix @@ -95,7 +95,6 @@ buildGoModule (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/limactl"; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; installCheckPhase = '' diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix index b60cc62023b8..821a8a11a8a2 100644 --- a/pkgs/by-name/ll/llm-ls/package.nix +++ b/pkgs/by-name/ll/llm-ls/package.nix @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ls/lsr/package.nix b/pkgs/by-name/ls/lsr/package.nix index bbce9432aae4..ba458cf30419 100644 --- a/pkgs/by-name/ls/lsr/package.nix +++ b/pkgs/by-name/ls/lsr/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://tangled.sh/@rockorager.dev/lsr"; diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index f9916365136c..4324e237fd52 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -122,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index 176a8c7532a2..b8a17a8d6f08 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index fef9c52bbb6c..6e8b26202118 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix index 6d984640b4d5..55ee34bf4fdc 100644 --- a/pkgs/by-name/ma/mactop/package.nix +++ b/pkgs/by-name/ma/mactop/package.nix @@ -25,7 +25,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Terminal-based monitoring tool 'top' designed to display real-time metrics for Apple Silicon chips"; diff --git a/pkgs/by-name/ma/magento-cloud/package.nix b/pkgs/by-name/ma/magento-cloud/package.nix index 15ba8a455f98..5f5298c5411b 100644 --- a/pkgs/by-name/ma/magento-cloud/package.nix +++ b/pkgs/by-name/ma/magento-cloud/package.nix @@ -39,7 +39,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; passthru = { diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 315685e76a36..40d240405eca 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/carthage-software/mago/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/by-name/ma/markdown-code-runner/package.nix b/pkgs/by-name/ma/markdown-code-runner/package.nix index 098c0b25a1e5..9b402a080538 100644 --- a/pkgs/by-name/ma/markdown-code-runner/package.nix +++ b/pkgs/by-name/ma/markdown-code-runner/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Configurable Markdown code runner that executes and optionally replaces code blocks using external commands"; diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index b82b4f42df79..a50c8d0246c3 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^mask/(.*)$" ]; }; diff --git a/pkgs/by-name/ma/maskprocessor/package.nix b/pkgs/by-name/ma/maskprocessor/package.nix index a146421a5982..08265f683b2f 100644 --- a/pkgs/by-name/ma/maskprocessor/package.nix +++ b/pkgs/by-name/ma/maskprocessor/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index 9f924166b63e..c410ee1d2ee3 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -168,7 +168,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/environmentd"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index b1d1ac5416bf..d83a474c6db3 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -29,7 +29,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 23aecd1079ca..234fd3e81cf7 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -87,7 +87,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { extraArgs = [ diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix index c9075fdefe4c..2411cc597726 100644 --- a/pkgs/by-name/ma/mautrix-signal/package.nix +++ b/pkgs/by-name/ma/mautrix-signal/package.nix @@ -67,7 +67,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = with lib; { homepage = "https://github.com/mautrix/signal"; diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix index aa30a179f011..9cc6f55e48e2 100644 --- a/pkgs/by-name/ma/mautrix-slack/package.nix +++ b/pkgs/by-name/ma/mautrix-slack/package.nix @@ -30,7 +30,6 @@ buildGoModule rec { tags = lib.optional withGoolm "goolm"; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; ldflags = [ diff --git a/pkgs/by-name/mb/mbake/package.nix b/pkgs/by-name/mb/mbake/package.nix index a9e69f8e4146..4f6b295178a0 100644 --- a/pkgs/by-name/mb/mbake/package.nix +++ b/pkgs/by-name/mb/mbake/package.nix @@ -40,7 +40,6 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "mbake" ]; diff --git a/pkgs/by-name/mc/mcp-k8s-go/package.nix b/pkgs/by-name/mc/mcp-k8s-go/package.nix index 131cd879243a..7b1096d835c5 100644 --- a/pkgs/by-name/mc/mcp-k8s-go/package.nix +++ b/pkgs/by-name/mc/mcp-k8s-go/package.nix @@ -30,7 +30,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "MCP server connecting to Kubernetes"; diff --git a/pkgs/by-name/md/md-lsp/package.nix b/pkgs/by-name/md/md-lsp/package.nix index 670f57f85754..37fc33ab9c9b 100644 --- a/pkgs/by-name/md/md-lsp/package.nix +++ b/pkgs/by-name/md/md-lsp/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-YS7ANZlxlRpl4ww/EJM57MTb+5WAW4mH6cQoziFCv18="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { diff --git a/pkgs/by-name/md/mdbook-plugins/package.nix b/pkgs/by-name/md/mdbook-plugins/package.nix index 4ab03088820b..206fc84d7d05 100644 --- a/pkgs/by-name/md/mdbook-plugins/package.nix +++ b/pkgs/by-name/md/mdbook-plugins/package.nix @@ -40,7 +40,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/md/mdbtools/package.nix b/pkgs/by-name/md/mdbtools/package.nix index 9a581078b72a..1fe9a359e224 100644 --- a/pkgs/by-name/md/mdbtools/package.nix +++ b/pkgs/by-name/md/mdbtools/package.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/mdb-ver"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/md/mdq/package.nix b/pkgs/by-name/md/mdq/package.nix index 046b1a37a8bb..d91c0553c703 100644 --- a/pkgs/by-name/md/mdq/package.nix +++ b/pkgs/by-name/md/mdq/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Like jq but for Markdown: find specific elements in a md doc"; diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index 77ffecd8c3b6..e4beba4f9230 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -25,7 +25,6 @@ buildGoModule rec { doCheck = true; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 4c40ea86e905..8945328f808b 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -28,8 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - cargoBuildFlags = [ # don't install the `mgf_dev` "--bin" diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix index a8080e0219ca..a60334a4f63b 100644 --- a/pkgs/by-name/me/metal-cli/package.nix +++ b/pkgs/by-name/me/metal-cli/package.nix @@ -42,7 +42,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/metal"; - versionCheckProgramArg = "--version"; meta = { description = "Official Equinix Metal CLI"; diff --git a/pkgs/by-name/mi/migrate-to-uv/package.nix b/pkgs/by-name/mi/migrate-to-uv/package.nix index 8271b2a187ea..7f6f75941c69 100644 --- a/pkgs/by-name/mi/migrate-to-uv/package.nix +++ b/pkgs/by-name/mi/migrate-to-uv/package.nix @@ -34,7 +34,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix index 863f3be16dae..7231b801d7b6 100644 --- a/pkgs/by-name/mi/minimap2/package.nix +++ b/pkgs/by-name/mi/minimap2/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix index 1ac108ceb8af..cb50680ab54e 100644 --- a/pkgs/by-name/mi/minio-warp/package.nix +++ b/pkgs/by-name/mi/minio-warp/package.nix @@ -36,7 +36,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index bc621976bb1d..1dd14eee2dd7 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: { __darwinAllowLocalNetworking = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix index 3543f9f9baec..69877851fcd2 100644 --- a/pkgs/by-name/mi/miro/package.nix +++ b/pkgs/by-name/mi/miro/package.nix @@ -46,7 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 3bfbd81c62d4..83f5f4946376 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -177,7 +177,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/mistralrs-server"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index 19d73b4ac2f2..27d1ffaad8fe 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index aaa611dffaf6..860120429424 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = stdenv.hostPlatform.isDarwin; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/mongod"; - versionCheckProgramArg = "--version"; passthru = { sources = { diff --git a/pkgs/by-name/mo/mount-zip/package.nix b/pkgs/by-name/mo/mount-zip/package.nix index 037bc80413c0..633a19fd9f1c 100644 --- a/pkgs/by-name/mo/mount-zip/package.nix +++ b/pkgs/by-name/mo/mount-zip/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index 3cab390e3e83..ce7229790821 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix index 072d2583f287..2fa38aff2929 100644 --- a/pkgs/by-name/mp/mprocs/package.nix +++ b/pkgs/by-name/mp/mprocs/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ms/msedit/package.nix b/pkgs/by-name/ms/msedit/package.nix index 3c20016fcb0e..8b9a2ed13745 100644 --- a/pkgs/by-name/ms/msedit/package.nix +++ b/pkgs/by-name/ms/msedit/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = false; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/edit"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mu/mubeng/package.nix b/pkgs/by-name/mu/mubeng/package.nix index 00371de9e1ad..34c1984f756e 100644 --- a/pkgs/by-name/mu/mubeng/package.nix +++ b/pkgs/by-name/mu/mubeng/package.nix @@ -28,7 +28,6 @@ buildGoModule rec { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Proxy checker and IP rotator"; diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index af6e38d4cf17..640a837fcdbd 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -20,7 +20,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Website link checker which scrapes and inspects all pages in a website recursively"; diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index 94000803e2f7..cb7b6eaf8871 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -147,7 +147,6 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix index 3e119e11187a..cc164f0588d6 100644 --- a/pkgs/by-name/mu/multiqc/package.nix +++ b/pkgs/by-name/mu/multiqc/package.nix @@ -119,8 +119,6 @@ python3Packages.buildPythonApplication rec { addBinToPathHook ]; - versionCheckProgramArg = "--version"; - disabledTests = # On darwin, kaleido fails to starts lib.optionals (stdenv.hostPlatform.isDarwin) [ diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index 82615f1db76d..ca61ba16713c 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -19,7 +19,6 @@ php83.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-0Bk01aU3vicwk9swkv+8VZxcPdaEMOOtp9niNfPfQyA="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix index c7b7cd357616..2ae499f2fd05 100644 --- a/pkgs/by-name/na/nak/package.nix +++ b/pkgs/by-name/na/nak/package.nix @@ -30,7 +30,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix index 14f3fee1db43..39b6d185c02d 100644 --- a/pkgs/by-name/na/natscli/package.nix +++ b/pkgs/by-name/na/natscli/package.nix @@ -36,7 +36,6 @@ buildGoModule rec { ''; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "NATS Command Line Interface"; diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix index f9dd52c2f360..854fb4a9c6af 100644 --- a/pkgs/by-name/nb/nbqa/package.nix +++ b/pkgs/by-name/nb/nbqa/package.nix @@ -75,7 +75,6 @@ let addBinToPathHook versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # Test data not found diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix index 179e92ff781d..c8315d24b689 100644 --- a/pkgs/by-name/nb/nbtscanner/package.nix +++ b/pkgs/by-name/nb/nbtscanner/package.nix @@ -32,8 +32,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "NetBIOS scanner written in Rust"; homepage = "https://github.com/jonkgrimes/nbtscanner"; diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix index 8e9003322412..f1cc506086fb 100644 --- a/pkgs/by-name/nc/ncdu/package.nix +++ b/pkgs/by-name/nc/ncdu/package.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/ne/neovim-node-client/package.nix b/pkgs/by-name/ne/neovim-node-client/package.nix index 87e645bedd53..06efddae9cfa 100644 --- a/pkgs/by-name/ne/neovim-node-client/package.nix +++ b/pkgs/by-name/ne/neovim-node-client/package.nix @@ -38,7 +38,6 @@ buildNpmPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/neovim-node-host"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 15efa3d48212..a8b69e3bba2f 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -236,7 +236,6 @@ stdenv.mkDerivation ( versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/nvim"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ne/netboot/package.nix b/pkgs/by-name/ne/netboot/package.nix index 48c427cb4134..fea31de59dcc 100644 --- a/pkgs/by-name/ne/netboot/package.nix +++ b/pkgs/by-name/ne/netboot/package.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/nbdbtool"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ne/netcap/package.nix b/pkgs/by-name/ne/netcap/package.nix index da71033b90e1..f08dfe02bcfa 100644 --- a/pkgs/by-name/ne/netcap/package.nix +++ b/pkgs/by-name/ne/netcap/package.nix @@ -74,7 +74,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/net"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ng/nginx-language-server/package.nix b/pkgs/by-name/ng/nginx-language-server/package.nix index cb7aee0da561..84f38ac203db 100644 --- a/pkgs/by-name/ng/nginx-language-server/package.nix +++ b/pkgs/by-name/ng/nginx-language-server/package.nix @@ -39,7 +39,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index 106d7f35d54c..9ab6593983a0 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 03f9ef85d661..f91f4c5ef3d1 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -76,7 +76,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 14da6fdc6326..ff4868d16490 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -124,7 +124,6 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ "--skip=::egl" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix index 5504e02a8ddc..e6a84d96ea5e 100644 --- a/pkgs/by-name/ni/nix-init/package.nix +++ b/pkgs/by-name/ni/nix-init/package.nix @@ -85,7 +85,6 @@ rustPlatform.buildRustPackage (finalAttrs: { }; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/nix-prefetch/package.nix b/pkgs/by-name/ni/nix-prefetch/package.nix index 4a58d1905095..91b4aa3f8feb 100644 --- a/pkgs/by-name/ni/nix-prefetch/package.nix +++ b/pkgs/by-name/ni/nix-prefetch/package.nix @@ -107,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix index 4759c8248966..3e8a5a3bb53c 100644 --- a/pkgs/by-name/ni/nixpkgs-review/package.nix +++ b/pkgs/by-name/ni/nixpkgs-review/package.nix @@ -50,7 +50,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; makeWrapperArgs = let diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index 0c792869e96f..02e7b34175de 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -81,7 +81,6 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/noseyparker-cli"; - versionCheckProgramArg = "--version"; meta = { description = "Find secrets and sensitive information in textual data"; diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix index 0001d94b374c..0b87203b8cf7 100644 --- a/pkgs/by-name/nr/nrfutil/package.nix +++ b/pkgs/by-name/nr/nrfutil/package.nix @@ -81,7 +81,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = sharedMeta // { mainProgram = name; diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 74568d49b6ad..21fb513d6b35 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nv/nvidia_oc/package.nix b/pkgs/by-name/nv/nvidia_oc/package.nix index 92af62a522a9..8335c908661b 100644 --- a/pkgs/by-name/nv/nvidia_oc/package.nix +++ b/pkgs/by-name/nv/nvidia_oc/package.nix @@ -29,8 +29,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Simple command line tool to overclock Nvidia GPUs using the NVML library on Linux"; homepage = "https://github.com/Dreaming-Codes/nvidia_oc"; diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index 4e1fe6fb06f1..28480ce8c960 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "nvitop" ]; diff --git a/pkgs/by-name/nv/nvme-rs/package.nix b/pkgs/by-name/nv/nvme-rs/package.nix index 9e1a6c941959..021f719af309 100644 --- a/pkgs/by-name/nv/nvme-rs/package.nix +++ b/pkgs/by-name/nv/nvme-rs/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix index cc731edd50d3..19897468082b 100644 --- a/pkgs/by-name/nv/nvrh/package.nix +++ b/pkgs/by-name/nv/nvrh/package.nix @@ -35,7 +35,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index 63b989a8a30b..c2457c6f11ac 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -22,7 +22,6 @@ buildGoModule rec { ldflags = [ "-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=v${version}" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = with lib; { diff --git a/pkgs/by-name/ob/obj2tiles/package.nix b/pkgs/by-name/ob/obj2tiles/package.nix index ceb363537724..7ee5817026c2 100644 --- a/pkgs/by-name/ob/obj2tiles/package.nix +++ b/pkgs/by-name/ob/obj2tiles/package.nix @@ -19,7 +19,6 @@ buildDotnetModule (finalAttrs: { nugetDeps = ./deps.json; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/Obj2Tiles"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { description = "Converts OBJ files to OGC 3D tiles by performing splitting, decimation and conversion"; diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix index ad5b86abb5d1..dc9d533531ed 100644 --- a/pkgs/by-name/ob/obs-do/package.nix +++ b/pkgs/by-name/ob/obs-do/package.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-LOoMtzIRaoAg02gY7EWj9A8vsjdUyEnxNy38Z5dFs+4="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/oc/ocsp-server/package.nix b/pkgs/by-name/oc/ocsp-server/package.nix index 4679f16def11..02b7bda379ee 100644 --- a/pkgs/by-name/oc/ocsp-server/package.nix +++ b/pkgs/by-name/oc/ocsp-server/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ok/oklch-color-picker/package.nix b/pkgs/by-name/ok/oklch-color-picker/package.nix index 10d643676f05..201ea4ed7d66 100644 --- a/pkgs/by-name/ok/oklch-color-picker/package.nix +++ b/pkgs/by-name/ok/oklch-color-picker/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index a386c5a81dca..60c4ad06d14e 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -261,7 +261,6 @@ goBuild (finalAttrs: { writableTmpDirAsHomeHook ]; versionCheckKeepEnvironment = "HOME"; - versionCheckProgramArg = "--version"; passthru = { tests = { diff --git a/pkgs/by-name/om/omnix/package.nix b/pkgs/by-name/om/omnix/package.nix index 31f363258f1f..8c9b417100c7 100644 --- a/pkgs/by-name/om/omnix/package.nix +++ b/pkgs/by-name/om/omnix/package.nix @@ -114,7 +114,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/om"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/op/openapi-down-convert/package.nix b/pkgs/by-name/op/openapi-down-convert/package.nix index 03ef6be0ed82..559fdc47d5da 100644 --- a/pkgs/by-name/op/openapi-down-convert/package.nix +++ b/pkgs/by-name/op/openapi-down-convert/package.nix @@ -29,7 +29,6 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix index 7fafe1f938b9..4222ed613854 100644 --- a/pkgs/by-name/op/openbao/package.nix +++ b/pkgs/by-name/op/openbao/package.nix @@ -57,7 +57,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bao"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/op/openfortivpn/package.nix b/pkgs/by-name/op/openfortivpn/package.nix index fc57a566c3fd..3bb3e6081f90 100644 --- a/pkgs/by-name/op/openfortivpn/package.nix +++ b/pkgs/by-name/op/openfortivpn/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/op/openscad-lsp/package.nix b/pkgs/by-name/op/openscad-lsp/package.nix index a3961988b61e..a0710c666c06 100644 --- a/pkgs/by-name/op/openscad-lsp/package.nix +++ b/pkgs/by-name/op/openscad-lsp/package.nix @@ -24,8 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix index a433db6cf822..91194e4ef660 100644 --- a/pkgs/by-name/op/opkssh/package.nix +++ b/pkgs/by-name/op/opkssh/package.nix @@ -24,7 +24,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/op/opnborg/package.nix b/pkgs/by-name/op/opnborg/package.nix index 2002a48e8d5a..821742994cfe 100644 --- a/pkgs/by-name/op/opnborg/package.nix +++ b/pkgs/by-name/op/opnborg/package.nix @@ -30,7 +30,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/opnborg"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/paepckehh/opnborg/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix index 10be6a1e2d21..ca8e98654831 100644 --- a/pkgs/by-name/or/orthanc/package.nix +++ b/pkgs/by-name/or/orthanc/package.nix @@ -112,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix index 931e7b19bbbd..f9c24dd77bc5 100644 --- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix +++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix @@ -40,7 +40,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 395807daf684..41db6d9d651e 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -61,7 +61,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ov/overpush/package.nix b/pkgs/by-name/ov/overpush/package.nix index d7f6cc8a4579..114de0299538 100644 --- a/pkgs/by-name/ov/overpush/package.nix +++ b/pkgs/by-name/ov/overpush/package.nix @@ -34,7 +34,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix index d9252d2d35a0..b1603cac0eb2 100644 --- a/pkgs/by-name/ox/ox/package.nix +++ b/pkgs/by-name/ox/ox/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index f604e36a4aec..5d8dd15b89c4 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = finalAttrs.cargoBuildFlags; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix index 570ba547d382..79c1fa0877c5 100644 --- a/pkgs/by-name/pa/pack/package.nix +++ b/pkgs/by-name/pa/pack/package.nix @@ -37,7 +37,6 @@ buildGoModule (finalAttrs: { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; meta = { diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix index a012d6ed43df..ee6085b37d11 100644 --- a/pkgs/by-name/pa/packetry/package.nix +++ b/pkgs/by-name/pa/packetry/package.nix @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; # packetry-cli is only necessary on windows https://github.com/greatscottgadgets/packetry/pull/154 diff --git a/pkgs/by-name/pa/pakku/package.nix b/pkgs/by-name/pa/pakku/package.nix index aca01a279a31..09974b1d8b11 100644 --- a/pkgs/by-name/pa/pakku/package.nix +++ b/pkgs/by-name/pa/pakku/package.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/pa/paps/package.nix b/pkgs/by-name/pa/paps/package.nix index 20d66b612011..9f3d41284934 100644 --- a/pkgs/by-name/pa/paps/package.nix +++ b/pkgs/by-name/pa/paps/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/pa/paq/package.nix b/pkgs/by-name/pa/paq/package.nix index 2111ec6d502b..784d3da81ef9 100644 --- a/pkgs/by-name/pa/paq/package.nix +++ b/pkgs/by-name/pa/paq/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-PpwYqwetylyYh6DKn2WiZrMOJmbnkv/cY5u51AVNVno="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix index 343b4c79c470..15c73ff7ebe3 100644 --- a/pkgs/by-name/pa/paratest/package.nix +++ b/pkgs/by-name/pa/paratest/package.nix @@ -23,7 +23,6 @@ nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix index e2cb1d62730f..0603a50d5cd5 100644 --- a/pkgs/by-name/pa/parseable/package.nix +++ b/pkgs/by-name/pa/parseable/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "rdkafka/dynamic-linking" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/patchy/package.nix b/pkgs/by-name/pa/patchy/package.nix index af0b7f3d1a68..cdeb2f959bf0 100644 --- a/pkgs/by-name/pa/patchy/package.nix +++ b/pkgs/by-name/pa/patchy/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-QaFIu7YVixQsDGL5fjQ3scKMyr0hw8lEWVc80EMTBB8="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix index 771ffae430c5..bfc0ef13296d 100644 --- a/pkgs/by-name/pa/patroni/package.nix +++ b/pkgs/by-name/pa/patroni/package.nix @@ -50,7 +50,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix index d8bd332f8fbe..c084a646f8d2 100644 --- a/pkgs/by-name/pd/pdepend/package.nix +++ b/pkgs/by-name/pd/pdepend/package.nix @@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/pdepend/pdepend/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/by-name/pd/pdftowrite/package.nix b/pkgs/by-name/pd/pdftowrite/package.nix index 700efbdde5ba..6d4bd9bebeef 100644 --- a/pkgs/by-name/pd/pdftowrite/package.nix +++ b/pkgs/by-name/pd/pdftowrite/package.nix @@ -78,7 +78,6 @@ python3Packages.buildPythonApplication rec { ''; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/pf/pfetch/package.nix b/pkgs/by-name/pf/pfetch/package.nix index 700c6778e6a3..6e4b44fe5302 100644 --- a/pkgs/by-name/pf/pfetch/package.nix +++ b/pkgs/by-name/pf/pfetch/package.nix @@ -26,7 +26,6 @@ stdenvNoCC.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ph/phase-cli/package.nix b/pkgs/by-name/ph/phase-cli/package.nix index c748ee0a0952..2ee1db1e2a3b 100644 --- a/pkgs/by-name/ph/phase-cli/package.nix +++ b/pkgs/by-name/ph/phase-cli/package.nix @@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { description = "Securely manage and sync environment variables with Phase"; diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index 8a440d57ab02..34711632c945 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -20,7 +20,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/phel-lang/phel-lang/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 6be056dd7b52..f015577f5af4 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -27,7 +27,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/phpactor/phpactor/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index 6026aacb1073..0488b79d1f97 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -31,7 +31,6 @@ php.buildComposerProject2 (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index a8e416a7f962..f6c5c8a5fa81 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -28,7 +28,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; diff --git a/pkgs/by-name/pi/pipenv/package.nix b/pkgs/by-name/pi/pipenv/package.nix index 5f93b3d9f897..cbcf649a5115 100644 --- a/pkgs/by-name/pi/pipenv/package.nix +++ b/pkgs/by-name/pi/pipenv/package.nix @@ -74,7 +74,6 @@ buildPythonApplication rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # this test wants access to the internet diff --git a/pkgs/by-name/pi/piston-cli/package.nix b/pkgs/by-name/pi/piston-cli/package.nix index 8484f6523357..d4a91d0ee319 100644 --- a/pkgs/by-name/pi/piston-cli/package.nix +++ b/pkgs/by-name/pi/piston-cli/package.nix @@ -48,7 +48,6 @@ python3Packages.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/piston"; pythonImportsCheck = [ "piston" ]; diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix index 591fafd8ba92..29377a5e5c24 100644 --- a/pkgs/by-name/pi/pixi-pack/package.nix +++ b/pkgs/by-name/pi/pixi-pack/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index daea4b4409c6..fa7807f7538a 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 4e4c90d5a183..0c1f46855451 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -62,8 +62,6 @@ python3Packages.buildPythonApplication rec { "test_valid_chroots" ]; - versionCheckProgramArg = "--version"; - makeWrapperArgs = [ "--prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 4b71a8464bae..5c7e64684c3d 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -175,7 +175,6 @@ buildGoModule rec { writableTmpDirAsHomeHook ]; versionCheckKeepEnvironment = [ "HOME" ]; - versionCheckProgramArg = "--version"; passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) podman; diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix index be04adea7108..ff150bdfa99d 100644 --- a/pkgs/by-name/po/pods/package.nix +++ b/pkgs/by-name/po/pods/package.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix index c0267f44fd3d..57c132588ff1 100644 --- a/pkgs/by-name/po/popsicle/package.nix +++ b/pkgs/by-name/po/popsicle/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Multiple USB File Flasher"; diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index 31ffa0a866c6..e9bc6007928c 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -85,7 +85,6 @@ python3Packages.buildPythonApplication rec { # Node.js-related tests that are currently disabled on i686-linux. nodejs ]; - versionCheckProgramArg = "--version"; postPatch = '' substituteInPlace pre_commit/resources/hook-tmpl \ diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index f316c383b442..b0eef6e5731e 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -63,7 +63,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix index c9886eb4fff8..71f43ec18168 100644 --- a/pkgs/by-name/pr/prettier/package.nix +++ b/pkgs/by-name/pr/prettier/package.nix @@ -170,7 +170,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/pr/prmt/package.nix b/pkgs/by-name/pr/prmt/package.nix index d4232f7f9a97..cf3559eda659 100644 --- a/pkgs/by-name/pr/prmt/package.nix +++ b/pkgs/by-name/pr/prmt/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/procfd/package.nix b/pkgs/by-name/pr/procfd/package.nix index 538741ab28a6..baf6d9131422 100644 --- a/pkgs/by-name/pr/procfd/package.nix +++ b/pkgs/by-name/pr/procfd/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/pr/proksi/package.nix b/pkgs/by-name/pr/proksi/package.nix index c3fc6d5901a0..584c43497f90 100644 --- a/pkgs/by-name/pr/proksi/package.nix +++ b/pkgs/by-name/pr/proksi/package.nix @@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: { }; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=proksi-v(.*)" ]; }; diff --git a/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix b/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix index 276bc19a58b8..875eec783e12 100644 --- a/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix @@ -44,7 +44,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/chrony_exporter"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/superq/chrony_exporter/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix index 9075e350ec6d..12ed985a6260 100644 --- a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix @@ -66,7 +66,6 @@ buildGoModule.override { stdenv = clangStdenv; } (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix b/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix index 626a95d76ccd..d9f2b017b10d 100644 --- a/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/richih/modbus_exporter/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix index d326c422b492..bfee635449bb 100644 --- a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/paepckehh/solaredge_exporter/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix b/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix index 7f17a0b70019..e52f456a1fc2 100644 --- a/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix @@ -47,7 +47,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/tibber-exporter"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/terjesannum/tibber-exporter/releases/tag/tibber-exporter-${finalAttrs.version}"; diff --git a/pkgs/by-name/pr/protonmail-export/package.nix b/pkgs/by-name/pr/protonmail-export/package.nix index 5197b511a2dd..403f6f41f789 100644 --- a/pkgs/by-name/pr/protonmail-export/package.nix +++ b/pkgs/by-name/pr/protonmail-export/package.nix @@ -92,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/proton-mail-export-cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix index 362470ee6c92..2ace65fd7142 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix @@ -46,7 +46,6 @@ rustPlatform.buildRustPackage { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Tool to prepare a Proxmox installation ISO for automated installations"; diff --git a/pkgs/by-name/pr/proxyauth/package.nix b/pkgs/by-name/pr/proxyauth/package.nix index cb118fa5e625..a624eb2f30df 100644 --- a/pkgs/by-name/pr/proxyauth/package.nix +++ b/pkgs/by-name/pr/proxyauth/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix index 3bafbb2615d2..3ad7be627cd4 100644 --- a/pkgs/by-name/pr/prs/package.nix +++ b/pkgs/by-name/pr/prs/package.nix @@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ps/psysh/package.nix b/pkgs/by-name/ps/psysh/package.nix index a286afa171f5..2d2970140c78 100644 --- a/pkgs/by-name/ps/psysh/package.nix +++ b/pkgs/by-name/ps/psysh/package.nix @@ -50,7 +50,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/bobthecow/psysh/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 16f006bc92a8..fa326d936b99 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix index 74fdc2f64af2..0822f93a9d43 100644 --- a/pkgs/by-name/py/pyp/package.nix +++ b/pkgs/by-name/py/pyp/package.nix @@ -38,7 +38,6 @@ let jq versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "pyp" diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix index 18f2bf17ecff..98dcb16a7d04 100644 --- a/pkgs/by-name/py/pyroscope/package.nix +++ b/pkgs/by-name/py/pyroscope/package.nix @@ -39,7 +39,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index 667997735be3..28962f77696c 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -50,8 +50,6 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook ]; - versionCheckProgramArg = "--version"; - pythonImportsCheck = [ "pytr" ]; meta = { diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index 8370fa110e02..a0e121ef8f69 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -107,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; preVersionCheck = '' export version='${finalAttrs.internalVersion}' ''; diff --git a/pkgs/by-name/qb/qbittorrent-cli/package.nix b/pkgs/by-name/qb/qbittorrent-cli/package.nix index a58a8bbe7282..908da9522a56 100644 --- a/pkgs/by-name/qb/qbittorrent-cli/package.nix +++ b/pkgs/by-name/qb/qbittorrent-cli/package.nix @@ -38,7 +38,6 @@ buildDotnetModule { ]; versionCheckProgram = "${placeholder "out"}/bin/qbt"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/qd/qdrant/package.nix b/pkgs/by-name/qd/qdrant/package.nix index 2232b2761d77..c27d11345d05 100644 --- a/pkgs/by-name/qd/qdrant/package.nix +++ b/pkgs/by-name/qd/qdrant/package.nix @@ -47,7 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 671c194a0f49..6517628158db 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/qr/qr-backup/package.nix b/pkgs/by-name/qr/qr-backup/package.nix index 0d59ac4044b3..9f4b620a71e0 100644 --- a/pkgs/by-name/qr/qr-backup/package.nix +++ b/pkgs/by-name/qr/qr-backup/package.nix @@ -85,7 +85,6 @@ python3Packages.buildPythonApplication rec { runHook postInstallCheck ''; - versionCheckProgramArg = [ "--version" ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/qu/quick-lint-js/package.nix b/pkgs/by-name/qu/quick-lint-js/package.nix index b83a7a164ca5..bbdcb9dfeae9 100644 --- a/pkgs/by-name/qu/quick-lint-js/package.nix +++ b/pkgs/by-name/qu/quick-lint-js/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix index 0c5882a63770..7dc4bca0df99 100644 --- a/pkgs/by-name/ra/radicle-ci-broker/package.nix +++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix @@ -53,7 +53,6 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ "--skip=acceptance_criteria_for_upgrades" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix index 681a4295ec4e..005817420272 100644 --- a/pkgs/by-name/ra/radicle-job/package.nix +++ b/pkgs/by-name/ra/radicle-job/package.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/ra/radicle-native-ci/package.nix b/pkgs/by-name/ra/radicle-native-ci/package.nix index 6fb5de3a329b..c17da970c09a 100644 --- a/pkgs/by-name/ra/radicle-native-ci/package.nix +++ b/pkgs/by-name/ra/radicle-native-ci/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index ee91336d5ada..994a52af29a2 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -86,7 +86,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; postFixup = '' diff --git a/pkgs/by-name/ra/rails-new/package.nix b/pkgs/by-name/ra/rails-new/package.nix index a181e923e727..c7edad231ed2 100644 --- a/pkgs/by-name/ra/rails-new/package.nix +++ b/pkgs/by-name/ra/rails-new/package.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-FrndtE9hjP1WswfOYJM4LW1UsE8S9QXthYO7P3nzs2I="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix index a73acc3d78f1..06d881833e7d 100644 --- a/pkgs/by-name/ra/rates/package.nix +++ b/pkgs/by-name/ra/rates/package.nix @@ -22,8 +22,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "CLI tool that brings currency exchange rates right into your terminal"; homepage = "https://github.com/lunush/rates"; diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index ec847d4fce2f..6643399462b9 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -54,7 +54,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index 9495eb01fea6..e2d53e5f21de 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -46,7 +46,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ] ++ (with python3Packages; [ pytestCheckHook ]); - versionCheckProgramArg = "--version"; disabledTestPaths = [ # requires network diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix index 617f899ec9a7..90e4b5d6d5af 100644 --- a/pkgs/by-name/rc/rcodesign/package.nix +++ b/pkgs/by-name/rc/rcodesign/package.nix @@ -53,7 +53,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix index 633a78f640e3..51699a7e6c9e 100644 --- a/pkgs/by-name/re/rebels-in-the-sky/package.nix +++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix @@ -47,7 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rebels"; - versionCheckProgramArg = "--version"; # Darwin: "Error: Operation not permitted (os error 1)" doInstallCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix index a5fadbf38160..bd2880e22895 100644 --- a/pkgs/by-name/re/rebuilderd/package.nix +++ b/pkgs/by-name/re/rebuilderd/package.nix @@ -100,7 +100,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.tests = { diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index b445c08bb5aa..f1e5e31df87a 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -114,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/redis-server"; - versionCheckProgramArg = "--version"; passthru = { tests.redis = nixosTests.redis; diff --git a/pkgs/by-name/re/regolith/package.nix b/pkgs/by-name/re/regolith/package.nix index 6d8576eb90ed..843427b5eb55 100644 --- a/pkgs/by-name/re/regolith/package.nix +++ b/pkgs/by-name/re/regolith/package.nix @@ -27,7 +27,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/re/remod/package.nix b/pkgs/by-name/re/remod/package.nix index 699cbe74a842..3a51f585a1e3 100644 --- a/pkgs/by-name/re/remod/package.nix +++ b/pkgs/by-name/re/remod/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; diff --git a/pkgs/by-name/re/render50/package.nix b/pkgs/by-name/re/render50/package.nix index 22d62f2db5e1..cde655ee408d 100644 --- a/pkgs/by-name/re/render50/package.nix +++ b/pkgs/by-name/re/render50/package.nix @@ -36,7 +36,6 @@ python3Packages.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no pytest checks diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index 103aef1baf65..22e835c7b1c9 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -128,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/re/repro-env/package.nix b/pkgs/by-name/re/repro-env/package.nix index e34a2860868b..1790ecffc6e0 100644 --- a/pkgs/by-name/re/repro-env/package.nix +++ b/pkgs/by-name/re/repro-env/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/kpcyrd/repro-env/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 91c336fc7d3c..6ece4f6a55f9 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -186,7 +186,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/re/rescript-language-server/package.nix b/pkgs/by-name/re/rescript-language-server/package.nix index 8e65671dd9e7..b988e1dd5874 100644 --- a/pkgs/by-name/re/rescript-language-server/package.nix +++ b/pkgs/by-name/re/rescript-language-server/package.nix @@ -54,7 +54,6 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 9d049aaac69c..1e2704d0ce4d 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -114,7 +114,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ri/rich-cli/package.nix b/pkgs/by-name/ri/rich-cli/package.nix index 7b98a06d3f89..1dddef1895c6 100644 --- a/pkgs/by-name/ri/rich-cli/package.nix +++ b/pkgs/by-name/ri/rich-cli/package.nix @@ -56,7 +56,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rich"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix index cf2f87d731a9..fbf03b2a782d 100644 --- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix +++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix @@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix index 8a707bfba15a..6912fda7f6ab 100644 --- a/pkgs/by-name/ro/robo/package.nix +++ b/pkgs/by-name/ro/robo/package.nix @@ -21,7 +21,6 @@ php82.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ro/rogcat/package.nix b/pkgs/by-name/ro/rogcat/package.nix index f09fd79acb99..06577483ef77 100644 --- a/pkgs/by-name/ro/rogcat/package.nix +++ b/pkgs/by-name/ro/rogcat/package.nix @@ -35,8 +35,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Adb logcat wrapper"; homepage = "https://github.com/flxo/rogcat"; diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index f5f0ad6415a2..6641cd8af4ef 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rojo"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix index 47fa08a9fdb8..7bce79ada864 100644 --- a/pkgs/by-name/rq/rq/package.nix +++ b/pkgs/by-name/rq/rq/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/rs/rsnapshot/package.nix b/pkgs/by-name/rs/rsnapshot/package.nix index 575e0278ce6b..185028327c88 100644 --- a/pkgs/by-name/rs/rsnapshot/package.nix +++ b/pkgs/by-name/rs/rsnapshot/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 78619c4d6bee..590dfa8df6c9 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index b056bef021d4..f46e80d6fff0 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -41,7 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix index 7133be4c9825..0460f469e6f1 100644 --- a/pkgs/by-name/ru/rundeck-cli/package.nix +++ b/pkgs/by-name/ru/rundeck-cli/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rd"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix index 6ec4f01d2e87..a0689d8d5779 100644 --- a/pkgs/by-name/ru/rust-parallel/package.nix +++ b/pkgs/by-name/ru/rust-parallel/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rustpython/package.nix b/pkgs/by-name/ru/rustpython/package.nix index 36bb063c07d4..ff9ccff266b6 100644 --- a/pkgs/by-name/ru/rustpython/package.nix +++ b/pkgs/by-name/ru/rustpython/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix index 1ff58f933b6d..bdac57fd6f7b 100644 --- a/pkgs/by-name/ru/rusty-man/package.nix +++ b/pkgs/by-name/ru/rusty-man/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-ZIRwp5AJugMDxg3DyFIH5VlD0m4Si2tJdspKE5QEB4M="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index f877eec94f6f..8b11def63bcf 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ry/rye/package.nix b/pkgs/by-name/ry/rye/package.nix index 2bde52b68d42..d435206ece67 100644 --- a/pkgs/by-name/ry/rye/package.nix +++ b/pkgs/by-name/ry/rye/package.nix @@ -93,7 +93,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/s5/s5/package.nix b/pkgs/by-name/s5/s5/package.nix index e8e5c46a11cc..917e798186ca 100644 --- a/pkgs/by-name/s5/s5/package.nix +++ b/pkgs/by-name/s5/s5/package.nix @@ -30,8 +30,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = with lib; { description = "Cipher/decipher text within a file"; mainProgram = "s5"; diff --git a/pkgs/by-name/sa/salt-lint/package.nix b/pkgs/by-name/sa/salt-lint/package.nix index 859a84ee7d3f..b538d7b69b60 100644 --- a/pkgs/by-name/sa/salt-lint/package.nix +++ b/pkgs/by-name/sa/salt-lint/package.nix @@ -31,8 +31,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Command-line utility that checks for best practices in SaltStack"; homepage = "https://salt-lint.readthedocs.io/en/latest/"; diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index 01051d19a4dd..9ff815ea6c3d 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-mQykzO9Ldokd3PZ1fY4pK/GtLmYMVas2iHj1Pqi9WqQ="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sa/sampo/package.nix b/pkgs/by-name/sa/sampo/package.nix index 97c632438477..d4bdc781f31c 100644 --- a/pkgs/by-name/sa/sampo/package.nix +++ b/pkgs/by-name/sa/sampo/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix index 3bca8006e213..aa1e8290dc70 100644 --- a/pkgs/by-name/sa/sawfish/package.nix +++ b/pkgs/by-name/sa/sawfish/package.nix @@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; meta = { diff --git a/pkgs/by-name/sb/sbom-tool/package.nix b/pkgs/by-name/sb/sbom-tool/package.nix index f30b5e1ff01d..8fa92ca6f0e7 100644 --- a/pkgs/by-name/sb/sbom-tool/package.nix +++ b/pkgs/by-name/sb/sbom-tool/package.nix @@ -37,7 +37,6 @@ buildDotnetModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix index d45186882529..86d54abd0e0a 100644 --- a/pkgs/by-name/sb/sbom4python/package.nix +++ b/pkgs/by-name/sb/sbom4python/package.nix @@ -36,7 +36,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "sbom4python" diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix index e7f552274ce8..5e5fe6178ffd 100644 --- a/pkgs/by-name/sc/scip/package.nix +++ b/pkgs/by-name/sc/scip/package.nix @@ -47,8 +47,6 @@ buildGo124Module (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "SCIP Code Intelligence Protocol CLI"; mainProgram = "scip"; diff --git a/pkgs/by-name/sc/scmpuff/package.nix b/pkgs/by-name/sc/scmpuff/package.nix index 563b839475bf..96d1b182b359 100644 --- a/pkgs/by-name/sc/scmpuff/package.nix +++ b/pkgs/by-name/sc/scmpuff/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = with lib; { description = "Numeric file shortcuts for common git commands"; diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix index 18d89bda4ff6..27ba7d4a5d9e 100644 --- a/pkgs/by-name/se/sea-orm-cli/package.nix +++ b/pkgs/by-name/se/sea-orm-cli/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AqrS+5y3bKuqAVvbmWDO3V0OBVSkW6212WQeY1hixsk="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix index 2d0550823c09..9745ac054492 100644 --- a/pkgs/by-name/se/seagoat/package.nix +++ b/pkgs/by-name/se/seagoat/package.nix @@ -68,7 +68,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; disabledTests = import ./failing_tests.nix; diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix index 3b57bb465256..2f59b87f87f3 100644 --- a/pkgs/by-name/se/serpl/package.nix +++ b/pkgs/by-name/se/serpl/package.nix @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/serpl"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sh/shaperglot-cli/package.nix b/pkgs/by-name/sh/shaperglot-cli/package.nix index b04135fde4c5..dbefda1670f8 100644 --- a/pkgs/by-name/sh/shaperglot-cli/package.nix +++ b/pkgs/by-name/sh/shaperglot-cli/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/by-name/sh/shtris/package.nix b/pkgs/by-name/sh/shtris/package.nix index ee70c6eea6ef..269fee615f29 100644 --- a/pkgs/by-name/sh/shtris/package.nix +++ b/pkgs/by-name/sh/shtris/package.nix @@ -29,7 +29,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/si/sidekick/package.nix b/pkgs/by-name/si/sidekick/package.nix index 3ff0b4340c44..c63dc1e22aa7 100644 --- a/pkgs/by-name/si/sidekick/package.nix +++ b/pkgs/by-name/si/sidekick/package.nix @@ -42,7 +42,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Command-line tool designed to simplify the process of deploying and managing applications on a VPS"; diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix index 3f9db37f9e08..f4797f9349bb 100644 --- a/pkgs/by-name/si/signal-cli/package.nix +++ b/pkgs/by-name/si/signal-cli/package.nix @@ -63,7 +63,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { doInstallCheck = stdenvNoCC.hostPlatform.isLinux; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://github.com/AsamK/signal-cli"; diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix index acf609234b0b..8c5c0b3d8169 100644 --- a/pkgs/by-name/si/sigsum/package.nix +++ b/pkgs/by-name/si/sigsum/package.nix @@ -35,7 +35,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/sigsum-key"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/si/similarity/package.nix b/pkgs/by-name/si/similarity/package.nix index 3ad4c9c5072d..7ee56ceacbf2 100644 --- a/pkgs/by-name/si/similarity/package.nix +++ b/pkgs/by-name/si/similarity/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.pname}-ts"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/si/siril/package.nix b/pkgs/by-name/si/siril/package.nix index afae29ab2724..3b9cd0ec3eb7 100644 --- a/pkgs/by-name/si/siril/package.nix +++ b/pkgs/by-name/si/siril/package.nix @@ -91,7 +91,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index e8f8ce09677a..d1b47969597e 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix index ba6762548460..a08f8aa039c3 100644 --- a/pkgs/by-name/sk/skhd/package.nix +++ b/pkgs/by-name/sk/skhd/package.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sl/slipshow/package.nix b/pkgs/by-name/sl/slipshow/package.nix index 66d644eb5cb7..3091a2a3454c 100644 --- a/pkgs/by-name/sl/slipshow/package.nix +++ b/pkgs/by-name/sl/slipshow/package.nix @@ -47,7 +47,6 @@ ocamlPackages.buildDunePackage rec { doCheck = true; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix index 984ca77783f2..55ddccfcf4ff 100644 --- a/pkgs/by-name/sl/slowlorust/package.nix +++ b/pkgs/by-name/sl/slowlorust/package.nix @@ -28,8 +28,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Lightweight slowloris (HTTP DoS) tool"; homepage = "https://github.com/MJVL/slowlorust"; diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index f412ef12f5e0..fd412547d2d9 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sm/smeagol/package.nix b/pkgs/by-name/sm/smeagol/package.nix index 52aa642aee0a..b886431d0caa 100644 --- a/pkgs/by-name/sm/smeagol/package.nix +++ b/pkgs/by-name/sm/smeagol/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/smeagol-wiki"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix index 5f12c784daa9..eaca530d5e34 100644 --- a/pkgs/by-name/sm/smpmgr/package.nix +++ b/pkgs/by-name/sm/smpmgr/package.nix @@ -37,7 +37,6 @@ python3Packages.buildPythonApplication rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "smpmgr" ]; diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix index 9aa688267d78..ee7cf904e451 100644 --- a/pkgs/by-name/sn/snakefmt/package.nix +++ b/pkgs/by-name/sn/snakefmt/package.nix @@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "snakefmt" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index d91a307ba777..41ae6381de8b 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -87,8 +87,6 @@ python3Packages.buildPythonApplication rec { ]) ++ [ writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; - enabledTestPaths = [ "tests/tests.py" "tests/test_expand.py" diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index 6da62da38bc4..d092483c5c25 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -88,7 +88,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 174570077430..50b56e2dedf4 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; - versionCheckProgramArg = "--version"; meta = { description = "Open source Linux client for Checkpoint VPN tunnels"; diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index f42fd64de891..01007c910205 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -81,7 +81,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/solana"; - versionCheckProgramArg = "--version"; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd solana \ diff --git a/pkgs/by-name/so/solc/package.nix b/pkgs/by-name/so/solc/package.nix index 0edaea143d2a..141795a126a2 100644 --- a/pkgs/by-name/so/solc/package.nix +++ b/pkgs/by-name/so/solc/package.nix @@ -32,7 +32,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { @@ -55,7 +54,6 @@ let pname version nativeInstallCheckInputs - versionCheckProgramArg doInstallCheck meta ; @@ -158,7 +156,6 @@ let pname version nativeInstallCheckInputs - versionCheckProgramArg doInstallCheck meta ; diff --git a/pkgs/by-name/so/somo/package.nix b/pkgs/by-name/so/somo/package.nix index b12fd045d89b..1bcfe1518e86 100644 --- a/pkgs/by-name/so/somo/package.nix +++ b/pkgs/by-name/so/somo/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index 5b9f8c8977a1..bdf11b100e4d 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -42,7 +42,6 @@ buildGoModule (final: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix index ddda40733761..998cf534eb0b 100644 --- a/pkgs/by-name/sp/spacetimedb/package.nix +++ b/pkgs/by-name/sp/spacetimedb/package.nix @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/spacetime"; - versionCheckProgramArg = "--version"; postInstall = '' mv $out/bin/spacetimedb-cli $out/bin/spacetime diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index f6a2da6310f6..a50549f80ff5 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -66,7 +66,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sq/sqld/package.nix b/pkgs/by-name/sq/sqld/package.nix index 2f12436bb919..8254f81468b0 100644 --- a/pkgs/by-name/sq/sqld/package.nix +++ b/pkgs/by-name/sq/sqld/package.nix @@ -65,7 +65,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index 954e095ef2ab..a9f3bd29dd16 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec { ''; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix index 5e31229127d7..a35bbc9f6eff 100644 --- a/pkgs/by-name/ss/sscg/package.nix +++ b/pkgs/by-name/ss/sscg/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = gitUpdater { rev-prefix = "sscg-"; }; diff --git a/pkgs/by-name/ss/ssh-vault/package.nix b/pkgs/by-name/ss/ssh-vault/package.nix index c64780fb1cdf..27edcdf1f0cd 100644 --- a/pkgs/by-name/ss/ssh-vault/package.nix +++ b/pkgs/by-name/ss/ssh-vault/package.nix @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix index 4fccfd958c81..d524843c902d 100644 --- a/pkgs/by-name/ss/sshocker/package.nix +++ b/pkgs/by-name/ss/sshocker/package.nix @@ -28,8 +28,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Tool for SSH, reverse sshfs and port forwarder"; homepage = "https://github.com/lima-vm/sshocker"; diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index e0fdbb09050e..4c9d813e7a2f 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # Prerelease reports incorrect version dontVersionCheck = true; diff --git a/pkgs/by-name/st/star/package.nix b/pkgs/by-name/st/star/package.nix index e5e701b9b496..55fe3d61aba4 100644 --- a/pkgs/by-name/st/star/package.nix +++ b/pkgs/by-name/st/star/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/STAR"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix index e6a3029dc41c..22496a17e3fd 100644 --- a/pkgs/by-name/st/stasis/package.nix +++ b/pkgs/by-name/st/stasis/package.nix @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/st/strip-tags/package.nix b/pkgs/by-name/st/strip-tags/package.nix index 8f3343bb94fe..1387d5f6f3b8 100644 --- a/pkgs/by-name/st/strip-tags/package.nix +++ b/pkgs/by-name/st/strip-tags/package.nix @@ -32,7 +32,6 @@ python3Packages.buildPythonApplication rec { pyyaml versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "CLI tool for stripping tags from HTML"; diff --git a/pkgs/by-name/st/style50/package.nix b/pkgs/by-name/st/style50/package.nix index 034f7428aa4e..b72831d5d7f8 100644 --- a/pkgs/by-name/st/style50/package.nix +++ b/pkgs/by-name/st/style50/package.nix @@ -51,7 +51,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "style50" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no python tests diff --git a/pkgs/by-name/su/submit50/package.nix b/pkgs/by-name/su/submit50/package.nix index 6c6ddcb451bf..646cd5831241 100644 --- a/pkgs/by-name/su/submit50/package.nix +++ b/pkgs/by-name/su/submit50/package.nix @@ -32,7 +32,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "submit50" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no python tests diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix index 83edf63ce93a..f666f5e76253 100644 --- a/pkgs/by-name/su/sudo-rs/package.nix +++ b/pkgs/by-name/su/sudo-rs/package.nix @@ -72,7 +72,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; # sudo binary fails because it checks if it is suid 0 versionCheckProgram = "${placeholder "out"}/bin/su"; - versionCheckProgramArg = "--version"; postInstallCheck = '' [ -e ${placeholder "out"}/share/man/man8/sudo.8.gz ] || \ diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix index 5c4c7e7bbdfa..cd06a419ba49 100644 --- a/pkgs/by-name/su/sus-compiler/package.nix +++ b/pkgs/by-name/su/sus-compiler/package.nix @@ -61,7 +61,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/sus_compiler"; - versionCheckProgramArg = "--version"; updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; diff --git a/pkgs/by-name/su/suspicious-package/package.nix b/pkgs/by-name/su/suspicious-package/package.nix index b757bccd6715..63ba2be0c032 100644 --- a/pkgs/by-name/su/suspicious-package/package.nix +++ b/pkgs/by-name/su/suspicious-package/package.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/sw/swaysome/package.nix b/pkgs/by-name/sw/swaysome/package.nix index 30a4a003359a..7fde0706582f 100644 --- a/pkgs/by-name/sw/swaysome/package.nix +++ b/pkgs/by-name/sw/swaysome/package.nix @@ -25,8 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Helper to make sway behave more like awesomewm"; homepage = "https://gitlab.com/hyask/swaysome"; diff --git a/pkgs/by-name/sy/sylkserver/package.nix b/pkgs/by-name/sy/sylkserver/package.nix index 154cfcdb3db5..8f8fce608f9f 100644 --- a/pkgs/by-name/sy/sylkserver/package.nix +++ b/pkgs/by-name/sy/sylkserver/package.nix @@ -48,7 +48,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/sylk-server"; - versionCheckProgramArg = "--version"; meta = { description = "SIP/XMPP/WebRTC Application Server"; diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 997429a47dde..fedb8b541814 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index ff1efef04cde..328af70e0ec9 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -141,7 +141,6 @@ rustPlatform.buildRustPackage { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix index 0850840ca3fb..406ef554b90e 100644 --- a/pkgs/by-name/ta/tahoe-lafs/package.nix +++ b/pkgs/by-name/ta/tahoe-lafs/package.nix @@ -125,8 +125,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix index 6663fe67a9f7..40eee21c2f35 100644 --- a/pkgs/by-name/ta/tailspin/package.nix +++ b/pkgs/by-name/ta/tailspin/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/tspin"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index c866d85ee39f..93ca61d8640e 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -55,7 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ta/task-master-ai/package.nix b/pkgs/by-name/ta/task-master-ai/package.nix index 23643f7f4a89..68e13fb64623 100644 --- a/pkgs/by-name/ta/task-master-ai/package.nix +++ b/pkgs/by-name/ta/task-master-ai/package.nix @@ -40,7 +40,6 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/task-master"; - versionCheckProgramArg = "--version"; meta = with lib; { description = "Node.js agentic AI workflow orchestrator"; diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index 6ad11e238957..e23176602d9c 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 2f3e3e1843fe..d0c9a35d41f6 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -120,8 +120,6 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { }; - versionCheckProgramArg = "--version"; - meta = { description = "Unofficial Microsoft Teams client for Linux"; mainProgram = "teams-for-linux"; diff --git a/pkgs/by-name/te/teamtype/package.nix b/pkgs/by-name/te/teamtype/package.nix index 8ef60ecc8cfd..539f9a503049 100644 --- a/pkgs/by-name/te/teamtype/package.nix +++ b/pkgs/by-name/te/teamtype/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix index 56d99458b46d..2c40c961f145 100644 --- a/pkgs/by-name/te/telegram-bot-api/package.nix +++ b/pkgs/by-name/te/telegram-bot-api/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Telegram Bot API server"; diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix index 0680c614457d..4c99b73ff6ca 100644 --- a/pkgs/by-name/te/termshot/package.nix +++ b/pkgs/by-name/te/termshot/package.nix @@ -28,7 +28,6 @@ buildGoModule (finalAttrs: { checkFlags = [ "-skip=^TestPtexec$" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix index 904523ee8470..2e2bff1a0912 100644 --- a/pkgs/by-name/te/terraform-mcp-server/package.nix +++ b/pkgs/by-name/te/terraform-mcp-server/package.nix @@ -28,7 +28,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Terraform Model Context Protocol (MCP) Server"; diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix index 0c164ffb3d5b..91c6e88e3246 100644 --- a/pkgs/by-name/tf/tflint/package.nix +++ b/pkgs/by-name/tf/tflint/package.nix @@ -36,8 +36,6 @@ buildGo125Module (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.withPlugins = plugins: let diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index b56882f7d653..5ab5c6a01b55 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -49,7 +49,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ti/timoni/package.nix b/pkgs/by-name/ti/timoni/package.nix index b5940eb3a44b..a6cd04268d3a 100644 --- a/pkgs/by-name/ti/timoni/package.nix +++ b/pkgs/by-name/ti/timoni/package.nix @@ -42,7 +42,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tm/tmc-cli/package.nix b/pkgs/by-name/tm/tmc-cli/package.nix index 21d407b6729a..84913922d3d4 100644 --- a/pkgs/by-name/tm/tmc-cli/package.nix +++ b/pkgs/by-name/tm/tmc-cli/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix index 725c8e0a430f..e2959e1b4e1c 100644 --- a/pkgs/by-name/tm/tmux-sessionizer/package.nix +++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/tm/tmuxai/package.nix b/pkgs/by-name/tm/tmuxai/package.nix index 538f734e86c1..d5684ba350c3 100644 --- a/pkgs/by-name/tm/tmuxai/package.nix +++ b/pkgs/by-name/tm/tmuxai/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { ]; versionCheckKeepEnvironment = [ "HOME" ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/to/tocaia/package.nix b/pkgs/by-name/to/tocaia/package.nix index 1ba0b6493120..3c52e4d5271f 100644 --- a/pkgs/by-name/to/tocaia/package.nix +++ b/pkgs/by-name/to/tocaia/package.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/to/tofu-ls/package.nix b/pkgs/by-name/to/tofu-ls/package.nix index f70f4b693e15..58b7bc8df1f7 100644 --- a/pkgs/by-name/to/tofu-ls/package.nix +++ b/pkgs/by-name/to/tofu-ls/package.nix @@ -42,7 +42,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix index dc6d97745131..a26ba58fcad1 100644 --- a/pkgs/by-name/to/tokei/package.nix +++ b/pkgs/by-name/to/tokei/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = [ "all" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; diff --git a/pkgs/by-name/to/tombl/package.nix b/pkgs/by-name/to/tombl/package.nix index 6ceb7edd459b..d2f54cb6e440 100644 --- a/pkgs/by-name/to/tombl/package.nix +++ b/pkgs/by-name/to/tombl/package.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-A3zdDzmwX2gdTLLWnUGeiqY1R5PBKZRmEHdIi1Uveaw="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/to/toml-test/package.nix b/pkgs/by-name/to/toml-test/package.nix index 14cbd6b129fe..128822162c26 100644 --- a/pkgs/by-name/to/toml-test/package.nix +++ b/pkgs/by-name/to/toml-test/package.nix @@ -26,7 +26,6 @@ buildGoModule (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix index 0fcab6db3f9c..a3e8dffd4746 100644 --- a/pkgs/by-name/to/topiary/package.nix +++ b/pkgs/by-name/to/topiary/package.nix @@ -81,7 +81,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/to/tor/package.nix b/pkgs/by-name/to/tor/package.nix index ab5d0e8b7bd9..578b7277514d 100644 --- a/pkgs/by-name/to/tor/package.nix +++ b/pkgs/by-name/to/tor/package.nix @@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { tests = { diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 06f44f3036fc..a16817aefddc 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -48,7 +48,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index b3a42ccd952a..329e40e51eb0 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -42,8 +42,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = with lib; { description = "Find credentials all over the place"; homepage = "https://github.com/trufflesecurity/trufflehog"; diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix index 8d0dcad7b22e..d9f7b7d9442b 100644 --- a/pkgs/by-name/tr/trurl/package.nix +++ b/pkgs/by-name/tr/trurl/package.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Command line tool for URL parsing and manipulation"; diff --git a/pkgs/by-name/tr/trzsz-ssh/package.nix b/pkgs/by-name/tr/trzsz-ssh/package.nix index 8194ae38e2f1..9feafa7fb7cb 100644 --- a/pkgs/by-name/tr/trzsz-ssh/package.nix +++ b/pkgs/by-name/tr/trzsz-ssh/package.nix @@ -27,7 +27,6 @@ buildGoModule (finalAttrs: { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index 5e0b84586d11..1688c044550b 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { ]); nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix index e17dabd445a2..70d568cd6051 100644 --- a/pkgs/by-name/ts/tsx/package.nix +++ b/pkgs/by-name/ts/tsx/package.nix @@ -81,7 +81,6 @@ stdenv.mkDerivation rec { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "TypeScript Execute (tsx): The easiest way to run TypeScript in Node.js"; diff --git a/pkgs/by-name/tt/tt-burnin/package.nix b/pkgs/by-name/tt/tt-burnin/package.nix index fff3cb24c36e..453f3752c257 100644 --- a/pkgs/by-name/tt/tt-burnin/package.nix +++ b/pkgs/by-name/tt/tt-burnin/package.nix @@ -36,8 +36,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { mainProgram = "tt-burnin"; description = "Command line utility to run a high power consumption workload on TT devices"; diff --git a/pkgs/by-name/tt/tt-smi/package.nix b/pkgs/by-name/tt/tt-smi/package.nix index fad569cf70db..d0a10ed363d5 100644 --- a/pkgs/by-name/tt/tt-smi/package.nix +++ b/pkgs/by-name/tt/tt-smi/package.nix @@ -42,8 +42,6 @@ python3Packages.buildPythonApplication rec { # Fails due to having no tests dontUsePytestCheck = true; - versionCheckProgramArg = "--version"; - meta = { mainProgram = "tt-smi"; description = "Tenstorrent console based hardware information program"; diff --git a/pkgs/by-name/tt/tt-topology/package.nix b/pkgs/by-name/tt/tt-topology/package.nix index 0ae7af8deccb..239f5c9e6ff8 100644 --- a/pkgs/by-name/tt/tt-topology/package.nix +++ b/pkgs/by-name/tt/tt-topology/package.nix @@ -54,8 +54,6 @@ python3Packages.buildPythonApplication rec { # Tests are broken dontUsePytestCheck = true; - versionCheckProgramArg = "--version"; - meta = { mainProgram = "tt-topology"; description = "Command line utility used to flash multiple NB cards on a system to use specific eth routing configurations"; diff --git a/pkgs/by-name/tt/ttysvr/package.nix b/pkgs/by-name/tt/ttysvr/package.nix index 64779dc217c1..1e445ffa6b84 100644 --- a/pkgs/by-name/tt/ttysvr/package.nix +++ b/pkgs/by-name/tt/ttysvr/package.nix @@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index 5c377cc73405..1f8c85e31b3b 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ versionCheckHook ]; meta = { diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix index 0409eb13f390..4aaeee7869f8 100644 --- a/pkgs/by-name/tu/tuisky/package.nix +++ b/pkgs/by-name/tu/tuisky/package.nix @@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index a386f18e687d..f6cac261265e 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/turn-server"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tu/turso/package.nix b/pkgs/by-name/tu/turso/package.nix index f2315e5499a8..17f653dfe44a 100644 --- a/pkgs/by-name/tu/turso/package.nix +++ b/pkgs/by-name/tu/turso/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tu/tuxedo-rs/package.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix index d784b3541422..88e5bb9e7ea7 100644 --- a/pkgs/by-name/tu/tuxedo-rs/package.nix +++ b/pkgs/by-name/tu/tuxedo-rs/package.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; postInstall = '' install -Dm444 tailord/com.tux.Tailor.conf -t $out/share/dbus-1/system.d diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index de44217f7b80..42d2d0dcafb5 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -57,7 +57,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix index 792bad6e71f7..d7083e498969 100644 --- a/pkgs/by-name/ty/typescript/package.nix +++ b/pkgs/by-name/ty/typescript/package.nix @@ -28,7 +28,6 @@ buildNpmPackage (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/tsc"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix index 2a06e30892ea..5b3ce7875b77 100644 --- a/pkgs/by-name/ty/typespec/package.nix +++ b/pkgs/by-name/ty/typespec/package.nix @@ -95,7 +95,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { extraArgs = [ ''--version-regex=typespec-stable@(\d+\.\d+\.\d+)'' ]; diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index ac726251b661..d50162baddab 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Source code spell checker"; diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index cf9bad1243b7..19d2b58ecaca 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 4c132b3d4e6e..ab55601b3741 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/uc/ucon64/package.nix b/pkgs/by-name/uc/ucon64/package.nix index 7f5551fd7108..d1045d1b946a 100644 --- a/pkgs/by-name/uc/ucon64/package.nix +++ b/pkgs/by-name/uc/ucon64/package.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index dfc61152edf7..c68cc0dd19b2 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -73,7 +73,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = versionInfo.updateScript; diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index dc45542e7cd7..a2cb8c016542 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -122,8 +122,6 @@ python3.pkgs.buildPythonApplication rec { ] ++ runtimeDeps; - versionCheckProgramArg = "--version"; - pytestFlags = [ "--no-cov" ]; diff --git a/pkgs/by-name/un/unftp/package.nix b/pkgs/by-name/un/unftp/package.nix index 8b8d40608aca..105a6d2ae83d 100644 --- a/pkgs/by-name/un/unftp/package.nix +++ b/pkgs/by-name/un/unftp/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/up/updog/package.nix b/pkgs/by-name/up/updog/package.nix index af3b627f4c4b..cf5cd839c175 100644 --- a/pkgs/by-name/up/updog/package.nix +++ b/pkgs/by-name/up/updog/package.nix @@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no python tests diff --git a/pkgs/by-name/ur/uradvd/package.nix b/pkgs/by-name/ur/uradvd/package.nix index 12d12905b3b6..71a0729b5541 100644 --- a/pkgs/by-name/ur/uradvd/package.nix +++ b/pkgs/by-name/ur/uradvd/package.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix index 6111d773cefe..84db6dddf93f 100644 --- a/pkgs/by-name/us/usacloud/package.nix +++ b/pkgs/by-name/us/usacloud/package.nix @@ -27,7 +27,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index d7a865719001..7f0cc68eca07 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -103,7 +103,6 @@ stdenv.mkDerivation (finalAttrs: { prefix' = lib.optionalString (prefix != null) prefix; in "${placeholder "out"}/bin/${prefix'}ls"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/uu/uutils-findutils/package.nix b/pkgs/by-name/uu/uutils-findutils/package.nix index 4ca34b96f303..b072ad7ef08f 100644 --- a/pkgs/by-name/uu/uutils-findutils/package.nix +++ b/pkgs/by-name/uu/uutils-findutils/package.nix @@ -30,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/find"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 6d848d7cb933..88c2d7fb2c1e 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ); nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix index cc8effc37674..916c908ea14a 100644 --- a/pkgs/by-name/va/vassal/package.nix +++ b/pkgs/by-name/va/vassal/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/vassal"; - versionCheckProgramArg = "--version"; meta = with lib; { description = "Free, open-source boardgame engine"; diff --git a/pkgs/by-name/vc/vcsi/package.nix b/pkgs/by-name/vc/vcsi/package.nix index 24ad702e6607..4123f5a5d7ea 100644 --- a/pkgs/by-name/vc/vcsi/package.nix +++ b/pkgs/by-name/vc/vcsi/package.nix @@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec { ++ (with python3Packages; [ pytestCheckHook ]); - versionCheckProgramArg = "--version"; meta = { description = "Create video contact sheets"; diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix index 02361a3dd717..e32d6009add5 100644 --- a/pkgs/by-name/ve/vector/package.nix +++ b/pkgs/by-name/ve/vector/package.nix @@ -115,7 +115,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/vi/vi-mongo/package.nix b/pkgs/by-name/vi/vi-mongo/package.nix index 5505e9fb82fd..09c033ade782 100644 --- a/pkgs/by-name/vi/vi-mongo/package.nix +++ b/pkgs/by-name/vi/vi-mongo/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/vi/video2x/package.nix b/pkgs/by-name/vi/video2x/package.nix index 9a2edb4387fc..15553dde300c 100644 --- a/pkgs/by-name/vi/video2x/package.nix +++ b/pkgs/by-name/vi/video2x/package.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/vi/vim-vint/package.nix b/pkgs/by-name/vi/vim-vint/package.nix index b1bf0757f078..4264afe26bac 100644 --- a/pkgs/by-name/vi/vim-vint/package.nix +++ b/pkgs/by-name/vi/vim-vint/package.nix @@ -51,7 +51,6 @@ python3Packages.buildPythonApplication rec { pytestCheckHook pytest-cov-stub ]); - versionCheckProgramArg = "--version"; meta = { description = "Fast and Highly Extensible Vim script Language Lint implemented by Python"; diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix index ab000b32cf96..803df92f8ddc 100644 --- a/pkgs/by-name/vo/volta/package.nix +++ b/pkgs/by-name/vo/volta/package.nix @@ -42,7 +42,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # Tries to create /var/empty/.volta as $HOME is not writable doInstallCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/vo/vorta/package.nix b/pkgs/by-name/vo/vorta/package.nix index ac1911cbe607..bfa1e009f797 100644 --- a/pkgs/by-name/vo/vorta/package.nix +++ b/pkgs/by-name/vo/vorta/package.nix @@ -68,7 +68,6 @@ python3Packages.buildPythonApplication rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; preCheck = let diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index 4002ec7f627d..05afff4dacb7 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -40,7 +40,6 @@ buildNpmPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix index d3d750f0a16b..96cd974c7489 100644 --- a/pkgs/by-name/wa/wapiti/package.nix +++ b/pkgs/by-name/wa/wapiti/package.nix @@ -70,8 +70,6 @@ python3Packages.buildPythonApplication rec { writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; - disabledTests = [ # Tests requires network access "test_attr" diff --git a/pkgs/by-name/wa/wasm-language-tools/package.nix b/pkgs/by-name/wa/wasm-language-tools/package.nix index 862a4f4c3fcf..8ceead09e1a5 100644 --- a/pkgs/by-name/wa/wasm-language-tools/package.nix +++ b/pkgs/by-name/wa/wasm-language-tools/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/wat_server"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index 3788dee242c9..927ec4ea9bd7 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -91,7 +91,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/wa/waybar-lyric/package.nix b/pkgs/by-name/wa/waybar-lyric/package.nix index 046aa48bedcb..7151e8dccd7d 100644 --- a/pkgs/by-name/wa/waybar-lyric/package.nix +++ b/pkgs/by-name/wa/waybar-lyric/package.nix @@ -20,7 +20,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "XDG_CACHE_HOME" ]; preInstallCheck = '' # ERROR Failed to find cache directory diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index d915092c3346..1d166b8de1f0 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -193,7 +193,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index b573d532ea4b..8e02b1141b68 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -102,7 +102,6 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { description = "Successor of GNU Wget, a file and recursive website downloader"; diff --git a/pkgs/by-name/wi/wild-unwrapped/package.nix b/pkgs/by-name/wi/wild-unwrapped/package.nix index 312917e35780..453d810cd079 100644 --- a/pkgs/by-name/wi/wild-unwrapped/package.nix +++ b/pkgs/by-name/wi/wild-unwrapped/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wk/wkg/package.nix b/pkgs/by-name/wk/wkg/package.nix index 379cd83a0275..7c9dccb8dd73 100644 --- a/pkgs/by-name/wk/wkg/package.nix +++ b/pkgs/by-name/wk/wkg/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix index e1188885c8ea..e0e1b3836589 100644 --- a/pkgs/by-name/wo/wofi-power-menu/package.nix +++ b/pkgs/by-name/wo/wofi-power-menu/package.nix @@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wo/woke/package.nix b/pkgs/by-name/wo/woke/package.nix index 0d13c7ff25c8..d28f60f9b5ca 100644 --- a/pkgs/by-name/wo/woke/package.nix +++ b/pkgs/by-name/wo/woke/package.nix @@ -34,7 +34,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/woke"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/get-woke/woke/releases/tag/${src.tag}"; diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index 90229c95b91d..78a9cfc51068 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package wstunnel-cli" ]; nativeBuildInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; checkFlags = [ diff --git a/pkgs/by-name/wt/wtfutil/package.nix b/pkgs/by-name/wt/wtfutil/package.nix index dd7839a15793..1504e919c1b3 100644 --- a/pkgs/by-name/wt/wtfutil/package.nix +++ b/pkgs/by-name/wt/wtfutil/package.nix @@ -46,7 +46,6 @@ buildGoModule rec { doInstallCheck = true; # Darwin Error: mkdir /var/empty: file exists nativeInstallCheckInputs = lib.optional (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xc/xcodegen/package.nix b/pkgs/by-name/xc/xcodegen/package.nix index 17ace827e11b..dff37b0ff870 100644 --- a/pkgs/by-name/xc/xcodegen/package.nix +++ b/pkgs/by-name/xc/xcodegen/package.nix @@ -55,7 +55,6 @@ swiftPackages.stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/xd/xdvdfs-cli/package.nix b/pkgs/by-name/xd/xdvdfs-cli/package.nix index 02c6e312b1e4..6a3f7769a99c 100644 --- a/pkgs/by-name/xd/xdvdfs-cli/package.nix +++ b/pkgs/by-name/xd/xdvdfs-cli/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/xdvdfs"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xe/xee/package.nix b/pkgs/by-name/xe/xee/package.nix index e8d4eca6fc60..7e88d94aec89 100644 --- a/pkgs/by-name/xe/xee/package.nix +++ b/pkgs/by-name/xe/xee/package.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "XML Execution Engine written in Rust"; diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index c7dc146bbf62..e22e7c6d4055 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -61,7 +61,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xl/xlsxsql/package.nix b/pkgs/by-name/xl/xlsxsql/package.nix index 55de4d353cd5..69a2d7810154 100644 --- a/pkgs/by-name/xl/xlsxsql/package.nix +++ b/pkgs/by-name/xl/xlsxsql/package.nix @@ -45,7 +45,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xm/xmake/package.nix b/pkgs/by-name/xm/xmake/package.nix index 6fd39bef9a3a..7c008daefb16 100644 --- a/pkgs/by-name/xm/xmake/package.nix +++ b/pkgs/by-name/xm/xmake/package.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index d93a92167b64..c1d168820230 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ya/yaml2json/package.nix b/pkgs/by-name/ya/yaml2json/package.nix index fcd2943e52e7..531a2744b45b 100644 --- a/pkgs/by-name/ya/yaml2json/package.nix +++ b/pkgs/by-name/ya/yaml2json/package.nix @@ -27,7 +27,6 @@ buildGoModule (finalAttrs: { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix index fce075e3f7aa..1b2e238e2e38 100644 --- a/pkgs/by-name/ya/yamlfmt/package.nix +++ b/pkgs/by-name/ya/yamlfmt/package.nix @@ -41,7 +41,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Extensible command line tool or library to format yaml files"; diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix index 1968875a61e6..4a38b0aab144 100644 --- a/pkgs/by-name/ya/yarr/package.nix +++ b/pkgs/by-name/ya/yarr/package.nix @@ -35,7 +35,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ye/yek/package.nix b/pkgs/by-name/ye/yek/package.nix index 800212911cbc..23fe911c5e3f 100644 --- a/pkgs/by-name/ye/yek/package.nix +++ b/pkgs/by-name/ye/yek/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/yl/yle-dl/package.nix b/pkgs/by-name/yl/yle-dl/package.nix index 0856afcfc7f2..aa579c1ba014 100644 --- a/pkgs/by-name/yl/yle-dl/package.nix +++ b/pkgs/by-name/yl/yle-dl/package.nix @@ -41,8 +41,6 @@ python3Packages.buildPythonApplication { # python3Packages.pytestCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; homepage = "https://aajanki.github.io/yle-dl/"; diff --git a/pkgs/by-name/yo/yodl/package.nix b/pkgs/by-name/yo/yodl/package.nix index 5e074c5fc7be..7e284a61bedc 100644 --- a/pkgs/by-name/yo/yodl/package.nix +++ b/pkgs/by-name/yo/yodl/package.nix @@ -83,7 +83,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/yt/ytcc/package.nix b/pkgs/by-name/yt/ytcc/package.nix index 9e2288d7c48a..61064f552f68 100644 --- a/pkgs/by-name/yt/ytcc/package.nix +++ b/pkgs/by-name/yt/ytcc/package.nix @@ -45,8 +45,6 @@ python3Packages.buildPythonApplication { ] ++ [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - # Disable tests that touch network or shell out to commands disabledTests = [ "get_channels" diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 2815ce3114d6..c88a740756f7 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -46,7 +46,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook python3Packages.pytestCheckHook ]; - versionCheckProgramArg = "--version"; env = { YTDL_SUB_FFMPEG_PATH = "${lib.getExe' ffmpeg_7 "ffmpeg"}"; diff --git a/pkgs/by-name/yu/yuhaiin/package.nix b/pkgs/by-name/yu/yuhaiin/package.nix index f662cd6b9467..b4653c9de3d3 100644 --- a/pkgs/by-name/yu/yuhaiin/package.nix +++ b/pkgs/by-name/yu/yuhaiin/package.nix @@ -37,8 +37,6 @@ buildGoModule rec { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; - meta = { description = "Proxy kit for Linux/Windows/MacOS"; homepage = "https://github.com/yuhaiin/yuhaiin"; diff --git a/pkgs/by-name/za/zaparoo/package.nix b/pkgs/by-name/za/zaparoo/package.nix index ce6e16edf6a5..da271137b42d 100644 --- a/pkgs/by-name/za/zaparoo/package.nix +++ b/pkgs/by-name/za/zaparoo/package.nix @@ -66,7 +66,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 68a326af3afb..a88657833569 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -306,7 +306,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/zeditor"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index 5bdeba8e0fad..ce80c2fc802d 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -54,7 +54,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; # Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs diff --git a/pkgs/by-name/zi/zig-zlint/package.nix b/pkgs/by-name/zi/zig-zlint/package.nix index 2fb60a954eb3..cfce73d35be6 100644 --- a/pkgs/by-name/zi/zig-zlint/package.nix +++ b/pkgs/by-name/zi/zig-zlint/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/zlint"; - versionCheckProgramArg = "--version"; # `zig build` produces a lot more artifacts, just copy over the ones we want installPhase = '' diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index ba65f44c4cc1..2a71b988907b 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -117,7 +117,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/ziplinectl"; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "DATABASE_URL" ]; doInstallCheck = true; diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix index f072b38cec86..f764cbde71ec 100644 --- a/pkgs/by-name/zu/zuban/package.nix +++ b/pkgs/by-name/zu/zuban/package.nix @@ -25,7 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/zv/zvm/package.nix b/pkgs/by-name/zv/zvm/package.nix index 88710b5a9cde..7d56f4a7629b 100644 --- a/pkgs/by-name/zv/zvm/package.nix +++ b/pkgs/by-name/zv/zvm/package.nix @@ -20,7 +20,6 @@ buildGoModule rec { vendorHash = "sha256-wo+vA9AYXIjv6SGb7hNY6ZIVMyJ5enMd8gpQ6u3F7To="; doInstallCheck = true; - versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ versionCheckHook ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix index c990625106ff..ada370da25cd 100644 --- a/pkgs/by-name/zx/zx/package.nix +++ b/pkgs/by-name/zx/zx/package.nix @@ -55,8 +55,6 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index 217bbeab0c46..6c77a83cfaa4 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -41,8 +41,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru = { updateScript = ./update.sh; tests = { diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 4b4c9e0c0aac..344713d4e341 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 81041136d662..fc17cd46d380 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -98,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "bin"}/bin/fc-list"; - versionCheckProgramArg = "--version"; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 0165766f3fa4..3d2f2069fe0a 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = [ "${placeholder "out"}/bin/protoc" ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 419e3e07117e..63cf268daec6 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -602,7 +602,6 @@ in dontUseCmakeConfigure = true; doInstallCheck = true; - versionCheckProgramArg = "--version"; propagatedBuildInputs = [ zip diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 8d43a6d27127..d288bdd8ce51 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -20,7 +20,6 @@ php82.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index 2d4000abe649..b142da4f6661 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -32,7 +32,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index c36e401e3b15..9c787b31535a 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -120,7 +120,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index d9c42c328551..626ba8242b0f 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -20,7 +20,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 93c934d83549..9394268042a3 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { broken = lib.versionOlder php.version "8.2"; diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix index 13d0ebf7b640..82796f9f5783 100644 --- a/pkgs/development/php-packages/phpinsights/default.nix +++ b/pkgs/development/php-packages/phpinsights/default.nix @@ -22,7 +22,6 @@ php.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index 06533e74a241..4d7b33174218 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -22,7 +22,6 @@ php.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-tiL8PL6Muc/i4Il1rCeEKenCmIEVn3rHFZInbUGQW9o="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index a509590a3a3e..9b70fb283f80 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/phpstan/phpstan/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index 7e0df378b41f..9cb574ba5490 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -35,7 +35,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { broken = lib.versionOlder php.version "8.2"; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 6dce6afd2718..cb6bcffb7f5d 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -74,7 +74,6 @@ buildPythonPackage rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; preCheck = '' # avoid coverage flags diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index f03d39d05379..11d811d564be 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -50,7 +50,6 @@ buildPythonPackage rec { versionCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "asn1tools" ]; diff --git a/pkgs/development/python-modules/bump-my-version/default.nix b/pkgs/development/python-modules/bump-my-version/default.nix index 9a2b261ef2ab..5b97d4e2c440 100644 --- a/pkgs/development/python-modules/bump-my-version/default.nix +++ b/pkgs/development/python-modules/bump-my-version/default.nix @@ -76,8 +76,6 @@ buildPythonPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "bumpversion" ]; diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 9d571b5ec183..0aaeee120721 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -54,7 +54,6 @@ buildPythonPackage { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bw"; - versionCheckProgramArg = "--version"; enabledTestPaths = [ # only unit tests as integration tests need a OpenSSH client/server setup diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index d459e1c6342d..b7bccae2c88d 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -84,7 +84,6 @@ buildPythonPackage rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Python client for coiled.io dask clusters"; diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix index df91398c1121..206623c27689 100644 --- a/pkgs/development/python-modules/crewai/default.nix +++ b/pkgs/development/python-modules/crewai/default.nix @@ -379,8 +379,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Framework for orchestrating role-playing, autonomous AI agents"; homepage = "https://github.com/crewAIInc/crewAI"; diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index 48dacf09a566..8fca41d9b161 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -90,7 +90,6 @@ buildPythonPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/cxfreeze"; - versionCheckProgramArg = "--version"; preCheck = '' rm -rf cx_Freeze diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index af46945b5197..8ca411c7343e 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -100,7 +100,6 @@ buildPythonPackage rec { ] ++ optional-dependencies.array ++ optional-dependencies.dataframe; - versionCheckProgramArg = "--version"; pytestFlags = [ # Rerun failed tests up to three times diff --git a/pkgs/development/python-modules/deid/default.nix b/pkgs/development/python-modules/deid/default.nix index d51a351a0ff9..10cd9938b130 100644 --- a/pkgs/development/python-modules/deid/default.nix +++ b/pkgs/development/python-modules/deid/default.nix @@ -62,7 +62,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "deid" ]; diff --git a/pkgs/development/python-modules/dynaconf/default.nix b/pkgs/development/python-modules/dynaconf/default.nix index 362c96457519..eaa43423ad3b 100644 --- a/pkgs/development/python-modules/dynaconf/default.nix +++ b/pkgs/development/python-modules/dynaconf/default.nix @@ -94,8 +94,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "dynaconf" ]; - versionCheckProgramArg = "--version"; - meta = { description = "Dynamic configurator for Python Project"; homepage = "https://github.com/dynaconf/dynaconf"; diff --git a/pkgs/development/python-modules/files-to-prompt/default.nix b/pkgs/development/python-modules/files-to-prompt/default.nix index 29d6fc79c16d..b263f32ad06e 100644 --- a/pkgs/development/python-modules/files-to-prompt/default.nix +++ b/pkgs/development/python-modules/files-to-prompt/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { disabledTests = [ "test_binary_file_warning" ]; - versionCheckProgramArg = "--version"; - meta = { mainProgram = "files-to-prompt"; description = "Concatenate a directory full of files into a single prompt for use with LLMs"; diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix index e7e77cf891d3..b15975381f76 100644 --- a/pkgs/development/python-modules/fmpy/default.nix +++ b/pkgs/development/python-modules/fmpy/default.nix @@ -141,7 +141,6 @@ buildPythonPackage rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { # From sundials, build only the CVODE solver. C.f. diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index 5bbceb734299..9cda637e5ba0 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -81,8 +81,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "granian" ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/development/python-modules/j2lint/default.nix b/pkgs/development/python-modules/j2lint/default.nix index c51312dc24c0..de867f0cf980 100644 --- a/pkgs/development/python-modules/j2lint/default.nix +++ b/pkgs/development/python-modules/j2lint/default.nix @@ -32,7 +32,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = with lib; { homepage = "https://github.com/aristanetworks/j2lint"; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index b111ab1d01a5..d6219103c0d4 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -138,7 +138,6 @@ buildPythonPackage rec { versionCheckHook virtualenv ]; - versionCheckProgramArg = "--version"; disabledTests = [ # Tries to install older versions through pip diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 3789ffb1311b..c886b68a480a 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -99,7 +99,6 @@ buildPythonPackage rec { # Tests that use a Jupyter notebook require $HOME to be writable writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; preCheck = '' substituteInPlace tests/functional/contents_manager/test_async_and_sync_contents_manager_are_in_sync.py \ diff --git a/pkgs/development/python-modules/keymap-drawer/default.nix b/pkgs/development/python-modules/keymap-drawer/default.nix index fffc10aa8252..bece9396dd9f 100644 --- a/pkgs/development/python-modules/keymap-drawer/default.nix +++ b/pkgs/development/python-modules/keymap-drawer/default.nix @@ -59,7 +59,6 @@ buildPythonPackage { pythonImportsCheck = [ "keymap_drawer" ]; versionCheckProgram = "${placeholder "out"}/bin/keymap"; - versionCheckProgramArg = "--version"; passthru.tests = callPackages ./tests { # Explicitly pass the correctly scoped package. diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index 04d864118ac3..89b1c0154910 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -260,7 +260,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; # about 55 of ~600 tests failing mostly due to demand for display disabledTests = import ./failing_tests.nix; diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 24e51364669b..9cea49c6c646 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -81,7 +81,6 @@ buildPythonPackage rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Reactive Python notebook that's reproducible, git-friendly, and deployable as scripts or apps"; diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index f75b9ba52faf..60db42babc15 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -101,7 +101,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Handy tool to trash your metadata"; diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index c561b1b914b3..7d3c239b1a27 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -52,8 +52,6 @@ buildPythonPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix index 0c825469ed6e..7b465d78510d 100644 --- a/pkgs/development/python-modules/mercantile/default.nix +++ b/pkgs/development/python-modules/mercantile/default.nix @@ -40,7 +40,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # AssertionError CLI exists with non-zero error code diff --git a/pkgs/development/python-modules/mike/default.nix b/pkgs/development/python-modules/mike/default.nix index c334aef04cd8..eb48339a27f0 100644 --- a/pkgs/development/python-modules/mike/default.nix +++ b/pkgs/development/python-modules/mike/default.nix @@ -46,7 +46,6 @@ buildPythonPackage rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix index e9f4650acb18..c013377c3143 100644 --- a/pkgs/development/python-modules/morecantile/default.nix +++ b/pkgs/development/python-modules/morecantile/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { rasterio versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # AssertionError CLI exists with non-zero error code diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 532c9a93b5de..019f2c4582b2 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -62,8 +62,6 @@ buildPythonPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - pythonImportsCheck = [ "mypy_boto3_builder" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 07ee8fa12d60..ee240ced4d4d 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -101,7 +101,6 @@ buildPythonPackage rec { ] ++ fakeredis.optional-dependencies.lua ++ optional-dependencies.optional; - versionCheckProgramArg = "--version"; disabledTests = [ # ValueError: Transform failed with error code 525: error creating static canvas/context for image server diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 5e6bb7b71327..655af74fc3b6 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -88,7 +88,6 @@ buildPythonPackage rec { ++ optional-dependencies.azure ++ optional-dependencies.s3 ++ optional-dependencies.gcs; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "papermill" ]; diff --git a/pkgs/development/python-modules/periodiq/default.nix b/pkgs/development/python-modules/periodiq/default.nix index 39ce3b00fca8..67af1c29893c 100644 --- a/pkgs/development/python-modules/periodiq/default.nix +++ b/pkgs/development/python-modules/periodiq/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { pytest-mock versionCheckHook ]; - versionCheckProgramArg = "--version"; enabledTestPaths = [ "tests/unit" ]; diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix index 717811aa2a10..1a62250667d8 100644 --- a/pkgs/development/python-modules/pyannote-metrics/default.nix +++ b/pkgs/development/python-modules/pyannote-metrics/default.nix @@ -65,7 +65,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Toolkit for reproducible evaluation, diagnostic, and error analysis of speaker diarization systems"; diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix index ecd4c17af84e..8b53f3f9e150 100644 --- a/pkgs/development/python-modules/pyannote-pipeline/default.nix +++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix @@ -63,7 +63,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Tunable pipelines"; diff --git a/pkgs/development/python-modules/pyglossary/default.nix b/pkgs/development/python-modules/pyglossary/default.nix index 6617af80e51d..62dfd68664b7 100644 --- a/pkgs/development/python-modules/pyglossary/default.nix +++ b/pkgs/development/python-modules/pyglossary/default.nix @@ -81,7 +81,6 @@ buildPythonPackage rec { env = { # The default --help creates permission errors that may be confusing when # observed in the build log. - versionCheckProgramArg = "--version"; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 637e3d58cd88..29f45d5f57a3 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -114,7 +114,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ] ++ optional-dependencies.all; - versionCheckProgramArg = "--version"; disabledTests = [ # avoid dependencies on many Qt things just to run one singular test diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 53c1513e2c9d..3bd70e269238 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -85,7 +85,6 @@ buildPythonPackage rec { shapely versionCheckHook ]; - versionCheckProgramArg = "--version"; preCheck = '' rm -r rasterio # prevent importing local rasterio diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 144f78733233..a7eb959a5cb5 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -105,7 +105,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # Tests touch network diff --git a/pkgs/development/python-modules/rembg/default.nix b/pkgs/development/python-modules/rembg/default.nix index 9e8a5554e3f0..86cb253539ca 100644 --- a/pkgs/development/python-modules/rembg/default.nix +++ b/pkgs/development/python-modules/rembg/default.nix @@ -84,7 +84,6 @@ buildPythonPackage rec { # not running python tests, as they require network access nativeCheckInputs = lib.optionals withCli [ versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "rembg" ]; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 08d7b9d6d394..0c9dc3b4f65d 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rncp"; - versionCheckProgramArg = "--version"; meta = { description = "Cryptography-based networking stack for wide-area networks"; diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index f4af7b1be9d4..649f9ad2f444 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { redisTestHook versionCheckHook ]; - versionCheckProgramArg = "--version"; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/scspell/default.nix b/pkgs/development/python-modules/scspell/default.nix index b2ab97e7c88e..4d85c77e9a92 100644 --- a/pkgs/development/python-modules/scspell/default.nix +++ b/pkgs/development/python-modules/scspell/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; - pythonImportsCheck = [ "scspell" ]; meta = { diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index dd9625a6b2f3..177711a41367 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -132,7 +132,6 @@ buildPythonPackage rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # Missing rotk private key diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix index da67f58c661d..5237c23afc53 100644 --- a/pkgs/development/python-modules/sqlfmt/default.nix +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -66,7 +66,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); - versionCheckProgramArg = "--version"; disabledTestPaths = [ # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr' diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 09ff9cdfe8a9..3c4d65d2bf83 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -69,7 +69,6 @@ buildPythonPackage rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/tensorflow/tensorboard/blob/${version}/RELEASE.md"; diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 47b4c3e35439..0d2c114d7895 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -70,7 +70,6 @@ buildPythonPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/toggl"; - versionCheckProgramArg = "--version"; disabledTests = [ "integration" diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix index 8215f457ab54..c30eef588cd5 100644 --- a/pkgs/development/python-modules/ufmt/default.nix +++ b/pkgs/development/python-modules/ufmt/default.nix @@ -60,7 +60,6 @@ buildPythonPackage rec { versionCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "ufmt" ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 9e81d3601b94..0cf349f2f859 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -102,7 +102,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { @@ -133,7 +132,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; checkFlags = diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index b6dcbfd889e6..6ad9c806f96c 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -51,7 +51,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; preCheck = '' rm -rf watchfiles diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 47c6a12e51fb..2e34422404f8 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -76,7 +76,6 @@ buildPythonPackage rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # needs the Ahem font (fails on macOS) diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index fca0c12f9ad0..03b40a3fd139 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -52,7 +52,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "yamlfix" ]; diff --git a/pkgs/development/tools/analysis/clazy/default.nix b/pkgs/development/tools/analysis/clazy/default.nix index 5033f56d18f1..42f38f449283 100644 --- a/pkgs/development/tools/analysis/clazy/default.nix +++ b/pkgs/development/tools/analysis/clazy/default.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 9b823ac3982f..7c95565fb047 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/luarocks"; - versionCheckProgramArg = "--version"; # unpack hook for src.rock and rockspec files setupHook = ./setup-hook.sh; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 7c6524367e1a..bbdc0995ab28 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -182,7 +182,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix index 1cc4f2109f5f..07b05e90d86f 100644 --- a/pkgs/os-specific/linux/freeipa/default.nix +++ b/pkgs/os-specific/linux/freeipa/default.nix @@ -171,7 +171,6 @@ stdenv.mkDerivation rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = with lib; { diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix index 30ae0ba4543d..b6823f0dc433 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Linux/X11 application for the Logitech Spotlight device (and similar devices)"; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index af643a8b6a67..1d1f61f7f612 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -216,7 +216,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 1e5cdadde472..a2cfaeed0194 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -75,7 +75,6 @@ buildGoModule (finalAttrs: { versionCheckHook gitMinimal ]; - versionCheckProgramArg = "--version"; passthru = { inherit wrapperPath; From 866aaf8e61dec3665f29e339f93353dcb20e08d4 Mon Sep 17 00:00:00 2001 From: Hans Joachim Kliemeck Date: Thu, 20 Nov 2025 13:10:04 +0100 Subject: [PATCH 132/542] buildEnv: relax constraints about readdir contents --- pkgs/build-support/buildenv/builder.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index f66acf3d5e75..cf4fc875b585 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -74,7 +74,7 @@ sub findFiles; sub findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority, $ignoreSingleFileOutputs) { opendir DIR, "$target" or die "cannot open `$target': $!"; - my @names = readdir DIR or die; + my @names = readdir DIR; closedir DIR; foreach my $name (@names) { From 0425be6ee19aca736410ecbff58f242cd422268f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Nov 2025 13:48:04 +0100 Subject: [PATCH 133/542] gnutls: 3.8.10 -> 3.8.11 Fixes CVE-2025-9820 (low severity) http://www.gnutls.org/security-new.html#GNUTLS-SA-2025-11-18 https://lists.gnupg.org/pipermail/gnutls-help/2025-November/004906.html --- pkgs/development/libraries/gnutls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 94fc6870976e..b66dcc37c0a1 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -59,11 +59,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.10"; + version = "3.8.11"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-23+rfM55Hncn677yM0MByCHXmlUOxVye8Ja2ELA+trc="; + hash = "sha256-kb0jxKhuvGFS6BMD0gz2zq65e8j4QmbQ+uxuKfF7qiA="; }; outputs = [ From 26ae310f9d5a4dec03200d8b2e1e9946a807b5d7 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 20 Nov 2025 15:56:49 +0100 Subject: [PATCH 134/542] sdl3: Disable AltiVec optimisations on non-ppc64le Baselines for 32-bit and big-endian 64-bit POWER don't guarantee it. --- pkgs/by-name/sd/sdl3/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 0e5feb85776a..f542994bebd5 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -171,6 +171,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDL_TESTS" true) (lib.cmakeBool "SDL_INSTALL_TESTS" true) (lib.cmakeBool "SDL_DEPS_SHARED" false) + + # Only ppc64le baseline guarantees AltiVec + (lib.cmakeBool "SDL_ALTIVEC" (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)) ] ++ lib.optionals From ab9b7a428e7be941ea98ea50ce6a499834e2d6fd Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 21 Nov 2025 09:58:53 +0800 Subject: [PATCH 135/542] uv: 0.9.10 -> 0.9.11 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 6d848d7cb933..884c49630f31 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.10"; + version = "0.9.11"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-XpWBgFxBflyqsla0K83j/3aBgq5ccedQTa5PoaYs9f0="; + hash = "sha256-X3jTJxT8aZ7/yuCVBhIG6UCmrB4/y2sbD3z2dGBApzg="; }; - cargoHash = "sha256-9SEUnud2gu64+trX87GhpXzTlBaB/DLrXLjoZbGL0f4="; + cargoHash = "sha256-4Zp+d74Auc/rQ2yJvg7ZdQB4NGqBpMSO5NmgDwsDzf0="; buildInputs = [ rust-jemalloc-sys From 98b0ce9e6f95a7ae3381b279c6973dc4c339f93b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 21 Nov 2025 06:35:39 +0000 Subject: [PATCH 136/542] ninja: 1.13.1 -> 1.13.2 Changes: https://github.com/ninja-build/ninja/releases/tag/v1.13.2 --- pkgs/by-name/ni/ninja/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix index b2d143cbc63d..9155aa1d5720 100644 --- a/pkgs/by-name/ni/ninja/package.nix +++ b/pkgs/by-name/ni/ninja/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { version = { "1.11" = "1.11.1"; - latest = "1.13.1"; + latest = "1.13.2"; } .${ninjaRelease}; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { { # TODO: Remove Ninja 1.11 as soon as possible. "1.11" = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; - latest = "sha256-GhAF5wUT19E02ZekW+ywsCMVGYrt56hES+MHCH4lNG4="; + latest = "sha256-D9HsIjv8EJ1qAdXFAKy260K77cCvopgQ2Fx6uXpt6VI="; } .${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}"); }; From 9eff836f32546c1c5bacd4d5762a9e60d8ca447e Mon Sep 17 00:00:00 2001 From: ryota2357 Date: Fri, 21 Nov 2025 10:38:55 +0900 Subject: [PATCH 137/542] happy: fix for justStaticExecutables --- pkgs/development/haskell-modules/configuration-darwin.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 9569f4b36597..7751c7bacf00 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -377,6 +377,13 @@ self: super: ${old.postInstall or ""} ''; }) super.cabal2nix-unstable; + happy = overrideCabal (old: { + postInstall = '' + remove-references-to -t ${lib.getLib self.happy-lib} "''${!outputBin}/bin/happy" + + ${old.postInstall or ""} + ''; + }) super.happy; # https://github.com/fpco/unliftio/issues/87 unliftio = dontCheck super.unliftio; From 3e6951eeac20cd5ce59f9e5231f0ae4f59a044e8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 21 Nov 2025 16:18:31 +0100 Subject: [PATCH 138/542] git-annex: update sha256 for 10.20251029 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 74367ff8ea7e..949cbc977e0b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -601,7 +601,7 @@ with haskellLib; name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-HkUrc9T8qpGsONIuM7ciKbx4vuJTOLFNxneIPte0wv4="; + sha256 = "sha256-hDbwkpu7qpJZmLNe/rF4eOewLrozo/qpCjFEczZv9S4="; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash From f566020603c18074b1887a38a029aa63a177fd07 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 21 Nov 2025 16:50:02 +0100 Subject: [PATCH 139/542] haskellPackages.proto3-wire: update list of required patches 1.4.4 incorporates most of the patches we need, but introduces a too strict upper bound on doctest we need to lift. --- .../haskell-modules/configuration-common.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 949cbc977e0b..aff64750eeeb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2958,24 +2958,14 @@ with haskellLib; # https://github.com/mchav/snappy-hs/commit/400490df38e0db7f353c0427f034a231bdf73098#r167007963 snappy-hs = doJailbreak super.snappy-hs; + # Too strict upper bound on doctest + # https://github.com/awakesecurity/proto3-wire/pull/111 proto3-wire = appendPatches [ (fetchpatch { - # https://github.com/awakesecurity/proto3-wire/pull/108 name = "add-reverse-encoders-for-packed-repeated-fields.patch"; - url = "https://github.com/awakesecurity/proto3-wire/commit/d4376fb6f1c1ac03ee8ec5c5793700ca6508ea70.patch"; - hash = "sha256-vtEYg/jLoTn1YRVhQJi6kyta+U4XiWeS7i1ZSN7BYf8="; - includes = [ - "**.cabal" - "*.hs" - ]; - }) - (fetchpatch { - # https://github.com/awakesecurity/proto3-wire/pull/111 - name = "support-LTS-24.patch"; - url = "https://github.com/awakesecurity/proto3-wire/commit/35fd88c4daf6643135db6da9ab6ed6d6f33eb3de.patch"; + url = "https://github.com/awakesecurity/proto3-wire/commit/fcc53d9935b64b6d8aaf65c8cef17f4bbed56867.patch"; hash = "sha256-GzXlweRshVLA29xVHhJSRIU40y+KtAplIqfvp0I8cY0="; }) - ] super.proto3-wire; # 2024-07-27: building test component requires non-trivial custom build steps From b44e0471746186700366d6da8765def2cecf8518 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 21 Nov 2025 16:50:45 +0100 Subject: [PATCH 140/542] top-level/release-haskell.nix: stop redundantly git-annex w/ 9.10 --- pkgs/top-level/release-haskell.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index f803f7f47dc3..ef7ec29175cf 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -548,9 +548,8 @@ let cabal2nix-unstable = released; funcmp = released; git-annex = [ - # for 9.10, test that using filepath (instead of filepath-bytestring) works. - compilerNames.ghc9102 - compilerNames.ghc9103 + # test that -f-OsPath still works correctly + compilerNames.ghc984 ]; haskell-language-server = released; hoogle = released; From 7024499bf8b002a1a5347ccc18cc61e42b8d4332 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 21 Nov 2025 16:54:33 +0100 Subject: [PATCH 141/542] git-annex: remove compat code for GHC < 9.10 This was implemented when we were using 9.8 in order to ease the transition to 9.10, but we don't really need to be able to build git-annex on 9.8 anymore. --- .../haskell-modules/configuration-common.nix | 64 +++++++++---------- pkgs/top-level/release-haskell.nix | 4 -- 2 files changed, 29 insertions(+), 39 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aff64750eeeb..106039c8ceff 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -594,42 +594,36 @@ with haskellLib; # but we want e.g. completions as well. See # https://web.archive.org/web/20160724083703/https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ # or git-annex @ 3571b077a1244330cc736181ee04b4d258a78476 doc/bugs/bash_completion_file_is_missing* - git-annex = lib.pipe super.git-annex ( - [ - (overrideCabal (drv: { - src = pkgs.fetchgit { - name = "git-annex-${super.git-annex.version}-src"; - url = "git://git-annex.branchable.com/"; - rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-hDbwkpu7qpJZmLNe/rF4eOewLrozo/qpCjFEczZv9S4="; - # delete android and Android directories which cause issues on - # darwin (case insensitive directory). Since we don't need them - # during the build process, we can delete it to prevent a hash - # mismatch on darwin. - postFetch = '' - rm -r $out/doc/?ndroid* - ''; - }; - - patches = drv.patches or [ ] ++ [ - # Prevent .desktop files from being installed to $out/usr/share. - # TODO(@sternenseemann): submit upstreamable patch resolving this - # (this should be possible by also taking PREFIX into account). - ./patches/git-annex-no-usr-prefix.patch - ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace-fail 'InstallDesktopFile $(PREFIX)/bin/git-annex' \ - 'InstallDesktopFile git-annex' + git-annex = lib.pipe super.git-annex [ + (overrideCabal (drv: { + src = pkgs.fetchgit { + name = "git-annex-${super.git-annex.version}-src"; + url = "git://git-annex.branchable.com/"; + rev = "refs/tags/" + super.git-annex.version; + sha256 = "sha256-hDbwkpu7qpJZmLNe/rF4eOewLrozo/qpCjFEczZv9S4="; + # delete android and Android directories which cause issues on + # darwin (case insensitive directory). Since we don't need them + # during the build process, we can delete it to prevent a hash + # mismatch on darwin. + postFetch = '' + rm -r $out/doc/?ndroid* ''; - })) - ] - ++ lib.optionals (lib.versionOlder self.ghc.version "9.10") [ - (disableCabalFlag "OsPath") - (addBuildDepends [ self.filepath-bytestring ]) - ] - ); + }; + + patches = drv.patches or [ ] ++ [ + # Prevent .desktop files from being installed to $out/usr/share. + # TODO(@sternenseemann): submit upstreamable patch resolving this + # (this should be possible by also taking PREFIX into account). + ./patches/git-annex-no-usr-prefix.patch + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail 'InstallDesktopFile $(PREFIX)/bin/git-annex' \ + 'InstallDesktopFile git-annex' + ''; + })) + ]; # Too strict bounds on servant # Pending a hackage revision: https://github.com/berberman/arch-web/commit/5d08afee5b25e644f9e2e2b95380a5d4f4aa81ea#commitcomment-89230555 diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ef7ec29175cf..2fc2fd113afc 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -547,10 +547,6 @@ let cabal2nix = released; cabal2nix-unstable = released; funcmp = released; - git-annex = [ - # test that -f-OsPath still works correctly - compilerNames.ghc984 - ]; haskell-language-server = released; hoogle = released; hlint = lib.subtractLists [ From 12630780b68538a77aaed8f54e9486067e9e2f49 Mon Sep 17 00:00:00 2001 From: Nick Gavalas Date: Fri, 21 Nov 2025 17:12:23 +0000 Subject: [PATCH 142/542] unzip: inline patch files from dead sources Of all the patches listed in unzip, these two stand out as depending on dubious or unreliable sources. Concretely, the Internet Archive was down yesterday (Nov 20, 2025) and caused build failures for the unzip package. I also can't imagine that the IA folks want to be a hard dependency for this. There is prior art for inlining unzip patches into the repository and these two are quite small. --- .../06-initialize-the-symlink-flag.patch | 20 ++ .../28-cve-2022-0529-and-cve-2022-0530.patch | 173 ++++++++++++++++++ pkgs/by-name/un/unzip/package.nix | 20 +- 3 files changed, 195 insertions(+), 18 deletions(-) create mode 100644 pkgs/by-name/un/unzip/06-initialize-the-symlink-flag.patch create mode 100644 pkgs/by-name/un/unzip/28-cve-2022-0529-and-cve-2022-0530.patch diff --git a/pkgs/by-name/un/unzip/06-initialize-the-symlink-flag.patch b/pkgs/by-name/un/unzip/06-initialize-the-symlink-flag.patch new file mode 100644 index 000000000000..11fa0d9f9bfa --- /dev/null +++ b/pkgs/by-name/un/unzip/06-initialize-the-symlink-flag.patch @@ -0,0 +1,20 @@ +From: Andreas Schwab +Subject: Initialize the symlink flag +Bug-Debian: https://bugs.debian.org/717029 +X-Debian-version: 6.0-10 + +--- a/process.c ++++ b/process.c +@@ -1758,6 +1758,12 @@ + = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11); + #endif + ++#ifdef SYMLINKS ++ /* Initialize the symlink flag, may be set by the platform-specific ++ mapattr function. */ ++ G.pInfo->symlink = 0; ++#endif ++ + return PK_COOL; + + } /* end function process_cdir_file_hdr() */ diff --git a/pkgs/by-name/un/unzip/28-cve-2022-0529-and-cve-2022-0530.patch b/pkgs/by-name/un/unzip/28-cve-2022-0529-and-cve-2022-0530.patch new file mode 100644 index 000000000000..8f5351e8cd82 --- /dev/null +++ b/pkgs/by-name/un/unzip/28-cve-2022-0529-and-cve-2022-0530.patch @@ -0,0 +1,173 @@ +From: Steven M. Schweda +Subject: Fix for CVE-2022-0529 and CVE-2022-0530 +Bug-Debian: https://bugs.debian.org/1010355 +X-Debian-version: 6.0-27 + +--- a/fileio.c ++++ b/fileio.c +@@ -171,8 +171,10 @@ + static ZCONST char Far FilenameTooLongTrunc[] = + "warning: filename too long--truncating.\n"; + #ifdef UNICODE_SUPPORT ++ static ZCONST char Far UFilenameCorrupt[] = ++ "error: Unicode filename corrupt.\n"; + static ZCONST char Far UFilenameTooLongTrunc[] = +- "warning: Converted unicode filename too long--truncating.\n"; ++ "warning: Converted Unicode filename too long--truncating.\n"; + #endif + static ZCONST char Far ExtraFieldTooLong[] = + "warning: extra field too long (%d). Ignoring...\n"; +@@ -2361,16 +2363,30 @@ + /* convert UTF-8 to local character set */ + fn = utf8_to_local_string(G.unipath_filename, + G.unicode_escape_all); +- /* make sure filename is short enough */ +- if (strlen(fn) >= FILNAMSIZ) { +- fn[FILNAMSIZ - 1] = '\0'; ++ ++ /* 2022-07-22 SMS, et al. CVE-2022-0530 ++ * Detect conversion failure, emit message. ++ * Continue with unconverted name. ++ */ ++ if (fn == NULL) ++ { + Info(slide, 0x401, ((char *)slide, +- LoadFarString(UFilenameTooLongTrunc))); +- error = PK_WARN; ++ LoadFarString(UFilenameCorrupt))); ++ error = PK_ERR; ++ } ++ else ++ { ++ /* make sure filename is short enough */ ++ if (strlen(fn) >= FILNAMSIZ) { ++ fn[FILNAMSIZ - 1] = '\0'; ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString(UFilenameTooLongTrunc))); ++ error = PK_WARN; ++ } ++ /* replace filename with converted UTF-8 */ ++ strcpy(G.filename, fn); ++ free(fn); + } +- /* replace filename with converted UTF-8 */ +- strcpy(G.filename, fn); +- free(fn); + } + # endif /* UNICODE_WCHAR */ + if (G.unipath_filename != G.filename_full) +--- a/process.c ++++ b/process.c +@@ -222,6 +222,8 @@ + "\nwarning: Unicode Path version > 1\n"; + static ZCONST char Far UnicodeMismatchError[] = + "\nwarning: Unicode Path checksum invalid\n"; ++ static ZCONST char Far UFilenameTooLongTrunc[] = ++ "warning: filename too long (P1) -- truncating.\n"; + #endif + + +@@ -1915,7 +1917,7 @@ + Sets both local header and central header fields. Not terribly clever, + but it means that this procedure is only called in one place. + +- 2014-12-05 SMS. ++ 2014-12-05 SMS. (oCERT.org report.) CVE-2014-8141. + Added checks to ensure that enough data are available before calling + makeint64() or makelong(). Replaced various sizeof() values with + simple ("4" or "8") constants. (The Zip64 structures do not depend +@@ -1947,9 +1949,10 @@ + ef_len - EB_HEADSIZE)); + break; + } ++ + if (eb_id == EF_PKSZ64) + { +- int offset = EB_HEADSIZE; ++ unsigned offset = EB_HEADSIZE; + + if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL)) + { +@@ -2046,7 +2049,7 @@ + } + if (eb_id == EF_UNIPATH) { + +- int offset = EB_HEADSIZE; ++ unsigned offset = EB_HEADSIZE; + ush ULen = eb_len - 5; + ulg chksum = CRCVAL_INITIAL; + +@@ -2504,16 +2507,17 @@ + int state_dependent; + int wsize = 0; + int max_bytes = MB_CUR_MAX; +- char buf[9]; ++ char buf[ MB_CUR_MAX+ 1]; /* ("+1" not really needed?) */ + char *buffer = NULL; + char *local_string = NULL; ++ size_t buffer_size; /* CVE-2022-0529 */ + + for (wsize = 0; wide_string[wsize]; wsize++) ; + + if (max_bytes < MAX_ESCAPE_BYTES) + max_bytes = MAX_ESCAPE_BYTES; +- +- if ((buffer = (char *)malloc(wsize * max_bytes + 1)) == NULL) { ++ buffer_size = wsize * max_bytes + 1; /* Reused below. */ ++ if ((buffer = (char *)malloc( buffer_size)) == NULL) { + return NULL; + } + +@@ -2551,8 +2555,28 @@ + } else { + /* no MB for this wide */ + /* use escape for wide character */ +- char *escape_string = wide_to_escape_string(wide_string[i]); +- strcat(buffer, escape_string); ++ size_t buffer_len; ++ size_t escape_string_len; ++ char *escape_string; ++ int err_msg = 0; ++ ++ escape_string = wide_to_escape_string(wide_string[i]); ++ buffer_len = strlen( buffer); ++ escape_string_len = strlen( escape_string); ++ ++ /* Append escape string, as space allows. */ ++ /* 2022-07-18 SMS, et al. CVE-2022-0529 */ ++ if (escape_string_len > buffer_size- buffer_len- 1) ++ { ++ escape_string_len = buffer_size- buffer_len- 1; ++ if (err_msg == 0) ++ { ++ err_msg = 1; ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString( UFilenameTooLongTrunc))); ++ } ++ } ++ strncat( buffer, escape_string, escape_string_len); + free(escape_string); + } + } +@@ -2604,9 +2628,18 @@ + ZCONST char *utf8_string; + int escape_all; + { +- zwchar *wide = utf8_to_wide_string(utf8_string); +- char *loc = wide_to_local_string(wide, escape_all); +- free(wide); ++ zwchar *wide; ++ char *loc = NULL; ++ ++ wide = utf8_to_wide_string( utf8_string); ++ ++ /* 2022-07-25 SMS, et al. CVE-2022-0530 */ ++ if (wide != NULL) ++ { ++ loc = wide_to_local_string( wide, escape_all); ++ free( wide); ++ } ++ + return loc; + } + diff --git a/pkgs/by-name/un/unzip/package.nix b/pkgs/by-name/un/unzip/package.nix index 1b35d4f52f93..efe3226d6cdd 100644 --- a/pkgs/by-name/un/unzip/package.nix +++ b/pkgs/by-name/un/unzip/package.nix @@ -52,24 +52,8 @@ stdenv.mkDerivation rec { name = "CVE-2019-13232-3.patch"; sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf"; }) - (fetchurl { - urls = [ - # original link (will be dead eventually): - "https://sources.debian.org/data/main/u/unzip/6.0-26%2Bdeb11u1/debian/patches/06-initialize-the-symlink-flag.patch" - - "https://gist.github.com/veprbl/41261bb781571e2246ea42d3f37795f5/raw/d8533d8c6223150f76b0f31aec03e185fcde3579/06-initialize-the-symlink-flag.patch" - ]; - sha256 = "1h00djdvgjhwfb60wl4qrxbyfsbbnn1qw6l2hkldnif4m8f8r1zj"; - }) - (fetchurl { - urls = [ - # original link (will be dead eventually): - "https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch" - - "https://web.archive.org/web/20230106200319/https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch" - ]; - sha256 = "sha256-on79jElQ+z2ULWAq14RpluAqr9d6itHiZwDkKubBzTc="; - }) + ./06-initialize-the-symlink-flag.patch + ./28-cve-2022-0529-and-cve-2022-0530.patch # Clang 16 makes implicit declarations an error by default for C99 and newer, causing the # configure script to fail to detect errno and the directory libraries on Darwin. ./implicit-declarations-fix.patch From 4a8512d344fd879bf1ee2f41ec3584b121870358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 21 Nov 2025 13:20:01 -0800 Subject: [PATCH 143/542] python3Packages.mkdocs: fix build with click 8.3.1 --- .../mkdocs/click-8.3.0-compat.patch | 25 +++++++++++++++++++ .../python-modules/mkdocs/default.nix | 5 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocs/click-8.3.0-compat.patch diff --git a/pkgs/development/python-modules/mkdocs/click-8.3.0-compat.patch b/pkgs/development/python-modules/mkdocs/click-8.3.0-compat.patch new file mode 100644 index 000000000000..5cfabfd9ec26 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs/click-8.3.0-compat.patch @@ -0,0 +1,25 @@ +diff --git a/mkdocs/__main__.py b/mkdocs/__main__.py +index c8d40969..3432ff40 100644 +--- a/mkdocs/__main__.py ++++ b/mkdocs/__main__.py +@@ -253,8 +253,8 @@ def cli(): + @cli.command(name="serve") + @click.option('-a', '--dev-addr', help=dev_addr_help, metavar='') + @click.option('-o', '--open', 'open_in_browser', help=serve_open_help, is_flag=True) +-@click.option('--no-livereload', 'livereload', flag_value=False, help=no_reload_help) +-@click.option('--livereload', 'livereload', flag_value=True, default=True, hidden=True) ++@click.option('--no-livereload', is_flag=True, help=no_reload_help) ++@click.option('--livereload', is_flag=True, hidden=True) + @click.option('--dirtyreload', 'build_type', flag_value='dirty', hidden=True) + @click.option('--dirty', 'build_type', flag_value='dirty', help=serve_dirty_help) + @click.option('-c', '--clean', 'build_type', flag_value='clean', help=serve_clean_help) +@@ -268,6 +268,9 @@ def serve_command(**kwargs): + """Run the builtin development server.""" + from mkdocs.commands import serve + ++ kwargs['livereload'] = kwargs['livereload'] or not kwargs['no_livereload'] ++ del kwargs['no_livereload'] ++ + _enable_warnings() + serve.serve(**kwargs) + diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 469780d1eaa5..67187308573f 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -48,6 +48,11 @@ buildPythonPackage rec { hash = "sha256-JQSOgV12iYE6FubxdoJpWy9EHKFxyKoxrm/7arCn9Ak="; }; + patches = [ + # https://github.com/mkdocs/mkdocs/pull/4065 + ./click-8.3.0-compat.patch + ]; + build-system = [ hatchling # babel, setuptools required as "build hooks" From d884d12701ec15225fd32de761c94167103b764c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 22 Nov 2025 12:03:50 +0100 Subject: [PATCH 144/542] haskell.packages.ghc948.crypton-x509-store: pin to 1.6.11 --- .../configuration-ghc-9.4.x.nix | 3 ++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 47 +++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index fe58bea65f88..4c9eb935a7b2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -96,6 +96,9 @@ self: super: { ++ drv.testFlags or [ ]; }) (doJailbreak super.hpack); + # Later versions require unix >= 2.8 which is tricky to provide with GHC 9.4 + crypton-x509-store = doDistribute self.crypton-x509-store_1_6_11; + # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = dontCheck super.hiedb; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8fa57f8401d9..33fcd5134f12 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -58,6 +58,7 @@ extra-packages: - Cabal-syntax == 3.12.* - Cabal-syntax == 3.14.* - Cabal-syntax == 3.16.* # version required for cabal-install and other packages + - crypton-x509-store < 1.6.12 # 2025-11-22: requires unix >= 2.8 which isn't available for GHC < 9.6 - extensions == 0.1.0.1 # 2025-09-21: needed for Cabal 3.10 (fourmolo/ormolu with ghc 9.8) - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - fourmolu == 0.15.0.0 # 2025-09-21: for ghc-lib-parser 9.8 compat diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c7bf6dd5d6b6..bd7fba9d2863 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -171594,6 +171594,53 @@ self: { } ) { }; + crypton-x509-store_1_6_11 = callPackage ( + { + mkDerivation, + asn1-encoding, + asn1-types, + base, + bytestring, + containers, + crypton, + crypton-x509, + directory, + filepath, + mtl, + pem, + tasty, + tasty-hunit, + }: + mkDerivation { + pname = "crypton-x509-store"; + version = "1.6.11"; + sha256 = "07vq7f883cm5krqz2kc0qkh9ks54jknrwdqvfqsk91s12b693a83"; + libraryHaskellDepends = [ + asn1-encoding + asn1-types + base + bytestring + containers + crypton + crypton-x509 + directory + filepath + mtl + pem + ]; + testHaskellDepends = [ + base + bytestring + crypton-x509 + tasty + tasty-hunit + ]; + description = "X.509 collection accessing and storing methods"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + crypton-x509-store = callPackage ( { mkDerivation, From 9323bf731843b5e8b1cba3eaa6a69916ad8de2a2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 22 Nov 2025 13:15:19 +0000 Subject: [PATCH 145/542] ell: 0.80 -> 0.81 Changes: https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.81 --- pkgs/by-name/el/ell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix index 85795193b0d9..72f4afab8b01 100644 --- a/pkgs/by-name/el/ell/package.nix +++ b/pkgs/by-name/el/ell/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.80"; + version = "0.81"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-B7Dz5H49d8kQaHfPQt7Y3f9D6EdqLOBMK+378g4E46U="; + hash = "sha256-NopI9aDtpEbf2JlboLTIg/9zXaZelfYhF0/RgwUgakI="; }; nativeBuildInputs = [ From 2a692fcc8236ff07268d909f89f14d47d5618588 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 22 Nov 2025 12:42:36 +0000 Subject: [PATCH 146/542] libpng: 1.6.50 -> 1.6.51 This is a security release and the APNG patch applies as is without modification from 1.6.50 Link: https://www.openwall.com/lists/oss-security/2025/11/22/1 Fixes: CVE-2025-64505, CVE-2025-64506, CVE-2025-64720, CVE-2025-65018 --- pkgs/development/libraries/libpng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index f7e71d872ca0..d0a5b5d6a83c 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.50"; + version = "1.6.51"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; - hash = "sha256-TfOWUYYgp6o2UUQ+h9Gyhi5OiMrRNai5NCPgFwYjIwc="; + hash = "sha256-oFCoktO0p7sBDDqVxzAeSWVtcqZPH8cJqQuK3tGSvtI="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" From 2344c36cc7ad453914661bc719917d7529a3fdf3 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 17 Nov 2025 20:25:22 -0500 Subject: [PATCH 147/542] at-spi2-core: drop patch on Darwin This patch is included in 2.58.1. --- pkgs/by-name/at/at-spi2-core/package.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 46cca4922179..5d6f49161239 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -42,15 +42,6 @@ stdenv.mkDerivation rec { hash = "sha256-fzdKajjNcP9LMsnToDEL+oBNlG/tTJ5pp9SfrNy5Xpw="; }; - # TODO apply unconditionally on rebuild - patches = lib.optionals stdenv.isDarwin [ - (fetchpatch { - name = "timersub.patch"; - url = "https://github.com/GNOME/at-spi2-core/commit/02108ea1b96db0189b2d4a9eceb843e1f13b7bdf.diff"; - hash = "sha256-pVBhawfRnJoXmovl9CAmzh+YWJkbvlOVrCs8XanjP00="; - }) - ]; - nativeBuildInputs = [ glib meson From a0b8c3e88ab59a1af6870f56015f80049dbbc065 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Sat, 22 Nov 2025 21:12:49 -0800 Subject: [PATCH 148/542] Code review comments --- pkgs/by-name/li/libbluray-full/package.nix | 6 ++++++ pkgs/by-name/li/libbluray/package.nix | 10 ++-------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/li/libbluray-full/package.nix diff --git a/pkgs/by-name/li/libbluray-full/package.nix b/pkgs/by-name/li/libbluray-full/package.nix new file mode 100644 index 000000000000..043d0f6ba7a0 --- /dev/null +++ b/pkgs/by-name/li/libbluray-full/package.nix @@ -0,0 +1,6 @@ +{libbluray}: +libbluray.override { + withAACS = true; + withBDplus = true; + withJava = true; +} diff --git a/pkgs/by-name/li/libbluray/package.nix b/pkgs/by-name/li/libbluray/package.nix index 8a4a77a4f974..de3bae4c7cd6 100644 --- a/pkgs/by-name/li/libbluray/package.nix +++ b/pkgs/by-name/li/libbluray/package.nix @@ -19,6 +19,7 @@ libxml2, withFonts ? true, freetype, + libbluray-full, # Used for tests }: # Info on how to use: @@ -71,16 +72,9 @@ stdenv.mkDerivation rec { }; passthru = { - variants = { - full = callPackage ./package.nix { - withAACS = true; - withBDplus = true; - withJava = true; - }; - }; tests = { # Verify the "full" package when verifying changes to this package - full = passthru.variants.full; + inherit libbluray-full; }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39587892f86c..0667cce2eda9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7284,8 +7284,6 @@ with pkgs; } ); - libbluray-full = libbluray.variants.full; - mtrace = callPackage ../development/libraries/glibc/mtrace.nix { }; # Provided by libc on Operating Systems that use the Extensible Linker Format. From 469c1fb173f340a66a21793010e37953d0cc5ad2 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Sat, 22 Nov 2025 21:33:32 -0800 Subject: [PATCH 149/542] Formatting --- pkgs/by-name/li/libbluray-full/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libbluray-full/package.nix b/pkgs/by-name/li/libbluray-full/package.nix index 043d0f6ba7a0..5a09f78f35d0 100644 --- a/pkgs/by-name/li/libbluray-full/package.nix +++ b/pkgs/by-name/li/libbluray-full/package.nix @@ -1,4 +1,4 @@ -{libbluray}: +{ libbluray }: libbluray.override { withAACS = true; withBDplus = true; From 49b9b8c0b5e5bcc698ffef5ea22f83c259fdb39a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Nov 2025 07:40:19 +0000 Subject: [PATCH 150/542] nghttp3: 1.12.0 -> 1.13.0 --- pkgs/by-name/ng/nghttp3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix index cff35f454d3a..3885fc9b8ab7 100644 --- a/pkgs/by-name/ng/nghttp3/package.nix +++ b/pkgs/by-name/ng/nghttp3/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "nghttp3"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2"; - hash = "sha256-KFl4NTevIT1npc5Cd923nIlBrUXtv6XM3VLZz0/6Qi0="; + hash = "sha256-hl22uuyA5zo7cXIJVgajvK85I0iQbhBBGtaQb6SfRy4="; }; outputs = [ From b0710abb2e182240cf0bf74c7463d4ea1f4c3dca Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 23 Nov 2025 12:09:01 +0000 Subject: [PATCH 151/542] utf8proc: 2.11.1 -> 2.11.2 Changes: https://github.com/JuliaStrings/utf8proc/releases/tag/v2.11.2 --- pkgs/by-name/ut/utf8proc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ut/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix index 28577b96d663..887bab5ee0be 100644 --- a/pkgs/by-name/ut/utf8proc/package.nix +++ b/pkgs/by-name/ut/utf8proc/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = "utf8proc"; rev = "v${version}"; - hash = "sha256-fFeevzek6Oql+wMmkZXVzKlDh3wZ6AjGCKJFsXBaqzg="; + hash = "sha256-/+/IrsLQ9ykuVOaItd2ZbX60pPlP2omvS1qJz51AnWA="; }; nativeBuildInputs = [ cmake ]; From 90fe3be1224c85e5b610145a3821f6ab000ca292 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 23 Nov 2025 11:03:25 +0100 Subject: [PATCH 152/542] unixODBCDrivers.sqlite: 0.9993 -> 0.99991 --- pkgs/development/libraries/unixODBCDrivers/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index fbef1b9ce460..f966d8e06922 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -104,11 +104,11 @@ sqlite = stdenv.mkDerivation rec { pname = "sqlite-connector-odbc"; - version = "0.9993"; + version = "0.99991"; src = fetchurl { url = "http://www.ch-werner.de/sqliteodbc/sqliteodbc-${version}.tar.gz"; - sha256 = "0dgsj28sc7f7aprmdd0n5a1rmcx6pv7170c8dfjl0x1qsjxim6hs"; + hash = "sha256-TZStuNPN4fqUoorrDfzHvnMUW8383z1eIlQ02zHcilw="; }; buildInputs = [ @@ -140,6 +140,7 @@ meta = with lib; { description = "ODBC driver for SQLite"; homepage = "http://www.ch-werner.de/sqliteodbc"; + changelog = "http://www.ch-werner.de/sqliteodbc/html/index.html#changelog"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ vlstill ]; From 49ba4308ababaded1285004582d605c4133b88ed Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 23 Nov 2025 16:44:36 +0100 Subject: [PATCH 153/542] pkgsStatic.cyrus_sasl: fix build Static linux-pam is marked broken. --- pkgs/by-name/cy/cyrus_sasl/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cy/cyrus_sasl/package.nix b/pkgs/by-name/cy/cyrus_sasl/package.nix index c6dc04e136f3..967206a14f89 100644 --- a/pkgs/by-name/cy/cyrus_sasl/package.nix +++ b/pkgs/by-name/cy/cyrus_sasl/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libxcrypt ] ++ lib.optional enableLdap openldap - ++ lib.optional stdenv.hostPlatform.isLinux pam; + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform pam) pam; configureFlags = [ "--with-openssl=${openssl.dev}" From 6dbe56499db33c9d06713f22d3a8a1ae6f4bad76 Mon Sep 17 00:00:00 2001 From: Martin Seller Date: Sun, 23 Nov 2025 20:03:50 +0100 Subject: [PATCH 154/542] spirv-cross: change shared build targets Build shared targets for macOS as well. The reason for this is that, for example, the `sdl3-shadercross` library depends on these shared libraries to be available. Without this change `sdl3-shadercross` can not support darwin targets. --- pkgs/by-name/sp/spirv-cross/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix index ecc7dd1219fe..9fde81732aaa 100644 --- a/pkgs/by-name/sp/spirv-cross/package.nix +++ b/pkgs/by-name/sp/spirv-cross/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isUnix [ (lib.cmakeBool "SPIRV_CROSS_SHARED" true) ]; From 92e4e51585225bf7d48d066d31b78cc4b54cfbd9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 24 Nov 2025 06:23:15 +0000 Subject: [PATCH 155/542] libdrm: 2.4.128 -> 2.4.129 Changes: https://lists.x.org/archives/xorg-announce/2025-November/003642.html --- pkgs/by-name/li/libdrm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix index f78ff46011f2..c6a4d9e11eb3 100644 --- a/pkgs/by-name/li/libdrm/package.nix +++ b/pkgs/by-name/li/libdrm/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.128"; + version = "2.4.129"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-O7NduHAMKgtWnyxnKaU/VJV4aFazEIVMjeV3gqIr3aw="; + hash = "sha256-WXgYP5eNaX4mpQugZhdJZO+wq5fKoeyqG4Yfvl3fd9w="; }; outputs = [ From 5a86e3d6ba68a05c8b8365933006c3cf07cb5704 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 20 Nov 2025 22:25:52 +0100 Subject: [PATCH 156/542] haskellPackages.cabal2nix-unstable: 2025-11-11 -> 2025-11-20 Also run Nix based test cases of the language-nix test suite. --- .../haskell-modules/cabal2nix-unstable/cabal2nix.nix | 6 +++--- .../cabal2nix-unstable/distribution-nixpkgs.nix | 6 +++--- .../cabal2nix-unstable/hackage-db.nix | 6 +++--- .../cabal2nix-unstable/language-nix.nix | 8 +++++--- .../haskell-modules/configuration-nix.nix | 12 ++++++++++++ 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix index dc82033beeef..79a33626af3f 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix @@ -35,10 +35,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "2.20.1-unstable-2025-11-11"; + version = "2.20.1-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; - sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; + url = "https://github.com/NixOS/cabal2nix/archive/be62a6c198c6fd082cd5660170fa23a709d92c8e.tar.gz"; + sha256 = "15bfhl0ypnnpgglxc7smppqi3w8w04zi97gh65kk1p6drlg29f47"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix index 00afd0bb28c4..aab109281ebf 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix @@ -18,10 +18,10 @@ }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.7.1.1-unstable-2025-11-11"; + version = "1.7.1.1-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; - sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; + url = "https://github.com/NixOS/cabal2nix/archive/be62a6c198c6fd082cd5660170fa23a709d92c8e.tar.gz"; + sha256 = "15bfhl0ypnnpgglxc7smppqi3w8w04zi97gh65kk1p6drlg29f47"; }; postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot"; enableSeparateDataOutput = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix index 2ad97d7259df..f99b95e475c4 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix @@ -17,10 +17,10 @@ }: mkDerivation { pname = "hackage-db"; - version = "2.1.3-unstable-2025-11-11"; + version = "2.1.3-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; - sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; + url = "https://github.com/NixOS/cabal2nix/archive/be62a6c198c6fd082cd5660170fa23a709d92c8e.tar.gz"; + sha256 = "15bfhl0ypnnpgglxc7smppqi3w8w04zi97gh65kk1p6drlg29f47"; }; postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix index d0e04dc856ab..2c863d4df1b7 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix @@ -9,14 +9,15 @@ lib, parsec-class, pretty, + process, QuickCheck, }: mkDerivation { pname = "language-nix"; - version = "2.3.0-unstable-2025-11-11"; + version = "2.3.0-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; - sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; + url = "https://github.com/NixOS/cabal2nix/archive/be62a6c198c6fd082cd5660170fa23a709d92c8e.tar.gz"; + sha256 = "15bfhl0ypnnpgglxc7smppqi3w8w04zi97gh65kk1p6drlg29f47"; }; postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ @@ -33,6 +34,7 @@ mkDerivation { lens parsec-class pretty + process QuickCheck ]; homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme"; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 526a96d59fc3..b9fde329d049 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1531,6 +1531,18 @@ builtins.intersectAttrs super { }; }) (enableSeparateBinOutput super.cabal2nix-unstable); + # Cabal doesn't allow us to properly specify the test dependency + # on nix-instantiate(1). Even though we're just evaluating pure code, + # it absolutely wants to write to disk. + language-nix-unstable = overrideCabal (drv: { + testDepends = drv.testDepends or [ ] ++ [ pkgs.nix ]; + preCheck = '' + export TMP_NIX_DIR="$(mktemp -d)" + export NIX_STORE_DIR="$TMP_NIX_DIR/store" + export NIX_STATE_DIR="$TMP_NIX_DIR/state" + ''; + }) super.language-nix-unstable; + # test suite needs local redis daemon nri-redis = dontCheck super.nri-redis; From d2f9817e5630295cd3fad9a586c5771c6cef61ca Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 24 Nov 2025 14:56:02 +0100 Subject: [PATCH 157/542] haskell.packages.ghc94.hlint: pin to 3.8 We use the same version for GHC 9.6 and GHC 9.8, so it's no additional effort to pin here as well. This pin was lost when turning HLS into a throw. --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 4c9eb935a7b2..97c95ebfb10a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -145,6 +145,8 @@ self: super: { "haskell-language-server has dropped support for ghc 9.4 in version 2.12.0.0, please use a newer ghc version or an older nixpkgs" (markBroken super.haskell-language-server); + hlint = doDistribute self.hlint_3_8; + # directory-ospath-streaming requires the ospath API in core packages # filepath, directory and unix. stan = super.stan.override { From bff0d7bcf28faa0c58192abce4c8233028537890 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 24 Nov 2025 15:10:19 +0100 Subject: [PATCH 158/542] haskell.packages.ghc94.hlint: pin to 3.6.1 My previous commit pinned to the wrong version, the version used for 9.4 was indeed 9.6.1. This time I confirmed building locally as well... --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 97c95ebfb10a..e17851404614 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -145,7 +145,7 @@ self: super: { "haskell-language-server has dropped support for ghc 9.4 in version 2.12.0.0, please use a newer ghc version or an older nixpkgs" (markBroken super.haskell-language-server); - hlint = doDistribute self.hlint_3_8; + hlint = doDistribute self.hlint_3_6_1; # directory-ospath-streaming requires the ospath API in core packages # filepath, directory and unix. From 7600c464345c8b8e15618d0bddcd99878c2e2c25 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 24 Nov 2025 15:07:27 +0100 Subject: [PATCH 159/542] haskellPackages: stackage LTS 24.19 -> LTS 24.21 all-cabal-hashes: 2025-11-11T08:13:55Z -> 2025-11-24T11:39:51Z (generated by maintainers/scripts/haskell/update-package-set.sh) --- pkgs/data/misc/hackage/pin.json | 8 +- .../haskell-modules/configuration-common.nix | 6 +- .../configuration-hackage2nix/stackage.yaml | 39 +- .../haskell-modules/hackage-packages.nix | 2852 ++++++++++++++--- 4 files changed, 2437 insertions(+), 468 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 5e277a04f768..7d7302bc143b 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "919b0d78e660eb496f9b2d0adb6dd7cfb1b64535", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/919b0d78e660eb496f9b2d0adb6dd7cfb1b64535.tar.gz", - "sha256": "0vjq2aq1wk2i2k2d54sl1ang3gmzcfnx1fv8jvxg50i246dnydrz", - "msg": "Update from Hackage at 2025-11-11T08:13:55Z" + "commit": "24e42920d74ce9ac5c0c05264079d55cec49e82b", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/24e42920d74ce9ac5c0c05264079d55cec49e82b.tar.gz", + "sha256": "1kmf1wg09gsw06525mc0y91x9jy81amhd1sd3b7gl1swnj3dzqqf", + "msg": "Update from Hackage at 2025-11-24T11:39:51Z" } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 106039c8ceff..26390afb5f4c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3093,7 +3093,7 @@ with haskellLib; ] ) super) what4 - what4_1_7_1_0 + what4_1_7_2 ; copilot-theorem = lib.pipe super.copilot-theorem [ @@ -3158,12 +3158,12 @@ with haskellLib; # 2025-04-13: jailbreak to allow th-abstraction >= 0.7 crucible = doJailbreak ( super.crucible.override { - what4 = self.what4_1_7_1_0; + what4 = self.what4_1_7_2; } ); crucible-llvm = super.crucible-llvm.override { - what4 = self.what4_1_7_1_0; + what4 = self.what4_1_7_2; }; # Test suite invokes cabal-install in a way incompatible with our generic builder diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 38f65b7ddb40..61bf170d412e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 24.19 +# Stackage LTS 24.21 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -223,7 +223,7 @@ default-package-overrides: - blaze-svg ==0.3.7 - blaze-textual ==0.2.3.1 - bloodhound ==0.23.0.1 - - bloomfilter ==2.0.1.2 + - bloomfilter ==2.0.1.3 - bluefin ==0.0.17.1 - bluefin-internal ==0.1.2.0 - bm ==0.2.0.0 @@ -270,14 +270,14 @@ default-package-overrides: - byte-count-reader ==0.10.1.12 - byte-order ==0.1.3.1 - byteable ==0.1.1 - - bytebuild ==0.3.16.3 + - bytebuild ==0.3.17.0 - bytedump ==1.0 - bytehash ==0.1.1.2 - byteorder ==1.0.4 - bytes ==0.17.4 - byteset ==0.1.1.2 - byteslice ==0.2.15.0 - - bytesmith ==0.3.13.0 + - bytesmith ==0.3.14.0 - bytestring-aeson-orphans ==0.1.0.2 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.2 @@ -298,10 +298,10 @@ default-package-overrides: - c2hs ==0.28.8 - ca-province-codes ==1.0.0.0 - cabal-add ==0.2 - - cabal-appimage ==0.4.1.0 + - cabal-appimage ==0.4.2.0 - cabal-clean ==0.2.20230609 - cabal-debian ==5.2.6 - - cabal-doctest ==1.0.11 + - cabal-doctest ==1.0.12 - cabal-file ==0.1.1 - cabal-flatpak ==0.1.2 - cabal-gild ==1.6.0.2 @@ -469,7 +469,7 @@ default-package-overrides: - control-bool ==0.2.1 - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 - - control-monad-omega ==0.3.3 + - control-monad-omega ==0.3.4 - convertible ==1.1.1.1 - cookie ==0.5.1 - copilot ==4.5.1 @@ -804,7 +804,7 @@ default-package-overrides: - express ==1.0.18 - extended-reals ==0.2.7.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.8 + - extra ==1.8.1 - extra-data-yj ==0.1.0.0 - extractable-singleton ==0.0.1 - extrapolate ==0.4.6 @@ -991,7 +991,7 @@ default-package-overrides: - ghc-lib ==9.12.2.20250421 - ghc-lib-parser ==9.12.2.20250421 - ghc-lib-parser-ex ==9.12.0.0 - - ghc-parser ==0.2.7.0 + - ghc-parser ==0.2.8.0 - ghc-paths ==0.1.0.12 - ghc-source-gen ==0.4.6.0 - ghc-syntax-highlighter ==0.0.13.0 @@ -1240,7 +1240,7 @@ default-package-overrides: - HaTeX ==3.23.0.1 - haveibeenpwned ==0.2.0.3 - HaXml ==1.25.14 - - haxr ==3000.11.5.1 + - haxr ==3000.11.6 - Hclip ==3.0.0.4 - HCodecs ==0.5.2 - hdaemonize ==0.5.7 @@ -1411,7 +1411,7 @@ default-package-overrides: - http-common ==0.8.3.4 - http-conduit ==2.3.9.1 - http-date ==0.0.11 - - http-directory ==0.1.11 + - http-directory ==0.1.12 - http-download ==0.2.1.0 - http-io-streams ==0.1.7.2 - http-link-header ==1.2.3 @@ -1526,7 +1526,7 @@ default-package-overrides: - ip ==1.7.8 - ip6addr ==2.0.0.1 - iproute ==1.7.15 - - IPv6Addr ==2.0.6.1 + - IPv6Addr ==2.0.6.2 - IPv6DB ==0.3.3.4 - ipynb ==0.2 - ipython-kernel ==0.11.0.0 @@ -1645,7 +1645,7 @@ default-package-overrides: - lens-properties ==4.11.1 - lens-regex ==0.1.3 - lens-regex-pcre ==1.1.2.0 - - lentil ==1.5.9.1 + - lentil ==1.5.10.0 - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5.1 - lexer-applicative ==2.1.0.2 @@ -1707,7 +1707,7 @@ default-package-overrides: - lr-acts ==0.0.1 - lrucache ==1.2.0.1 - lsfrom ==2.0 - - lua ==2.3.3 + - lua ==2.3.4 - lua-arbitrary ==1.0.1.1 - lucid ==2.11.20250303 - lucid-cdn ==0.2.2.0 @@ -1725,7 +1725,7 @@ default-package-overrides: - mailtrap ==0.1.2.2 - main-tester ==0.2.0.1 - mainland-pretty ==0.7.1.1 - - managed ==1.0.10 + - managed ==1.0.11 - mandrill ==0.5.8.0 - manifolds-core ==0.6.1.1 - Mantissa ==0.1.0.0 @@ -1919,7 +1919,7 @@ default-package-overrides: - named-text ==1.2.2.0 - names-th ==0.3.0.1 - nano-erl ==0.1.0.1 - - NanoID ==3.4.1.1 + - NanoID ==3.4.1.2 - nanospec ==0.2.2 - nats ==1.1.2 - natural-arithmetic ==0.2.3.0 @@ -1956,6 +1956,7 @@ default-package-overrides: - network-transport-tcp ==0.8.6 - network-transport-tests ==0.3.4 - network-uri ==2.6.4.2 + - network-uri-template ==0.1.1.4 - network-wait ==0.2.0.0 - newtype ==0.2.2.0 - newtype-generics ==0.6.2 @@ -2435,7 +2436,7 @@ default-package-overrides: - rhythmic-sequences ==0.8.0.0 - riak-protobuf ==0.25.0.0 - richenv ==0.1.0.3 - - rio ==0.1.23.0 + - rio ==0.1.24.0 - rio-orphans ==0.1.2.0 - rio-prettyprint ==0.1.8.0 - rng-utils ==0.3.1 @@ -2452,7 +2453,7 @@ default-package-overrides: - row-types ==1.0.1.2 - rp-tree ==0.7.1 - rpm-nvr ==0.1.2 - - rpmbuild-order ==0.4.12 + - rpmbuild-order ==0.4.13 - rrb-vector ==0.2.2.1 - RSA ==2.4.1 - rss ==3000.2.0.8 @@ -2958,7 +2959,7 @@ default-package-overrides: - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - - time-manager ==0.2.3 + - time-manager ==0.2.4 - time-units ==1.0.0 - time-units-types ==0.2.0.1 - timeit ==2.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bd7fba9d2863..f9ea4be0f3e8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24751,8 +24751,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "2.0.6.1"; - sha256 = "1gdz3m6sc7aj4wy0j9sdd4qbb1jzilw8vjqig29szcqmp6cslc3c"; + version = "2.0.6.2"; + sha256 = "0hpvs9p3vyzmlkd9nm8xjfpyfpr9h0rc5cbfzck3xvfxp4srbyzc"; libraryHaskellDepends = [ aeson attoparsec @@ -24768,7 +24768,6 @@ self: { HUnit test-framework test-framework-hunit - text ]; description = "Library to deal with IPv6 address text representations"; license = lib.licenses.bsd3; @@ -31982,15 +31981,14 @@ self: { bytestring, bytestring-encodings, cereal, - extra, mwc-random, optparse-applicative, text, }: mkDerivation { pname = "NanoID"; - version = "3.4.1.1"; - sha256 = "1dfl5vj6fwxwrhgx11vzxij2p19q3kqri130fxgw2l6ajlckyh8x"; + version = "3.4.1.2"; + sha256 = "0aagfbmzk48nsgia01wpl1k0smvgi3s7b63h0m4sz51x9v4b5j9h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31998,7 +31996,6 @@ self: { base bytestring cereal - extra mwc-random text ]; @@ -36057,8 +36054,8 @@ self: { }: mkDerivation { pname = "PropRatt"; - version = "0.1.0.0"; - sha256 = "0qs8g88hsak7w7qi5qmjzsir71mr5b214cr0h4ni145x6is5fa0j"; + version = "0.2.0.0"; + sha256 = "0pdwzjh80j9flxykb3xiwypks1jbwn24wm6b0fz7pxszlw5cm5g2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59116,6 +59113,48 @@ self: { } ) { }; + algebraic-graph-duoids = callPackage ( + { + mkDerivation, + algebraic-graphs, + base, + Cabal, + cabal-doctest, + doctest, + duoids, + duoids-hedgehog, + hedgehog, + no-recursion, + }: + mkDerivation { + pname = "algebraic-graph-duoids"; + version = "0.0.1.0"; + sha256 = "151x544zhbgn85f0gpb0j3x2nv31lkx59jn91wcq1qxr4dmywgw9"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + no-recursion + ]; + libraryHaskellDepends = [ + algebraic-graphs + base + duoids + no-recursion + ]; + testHaskellDepends = [ + algebraic-graphs + base + doctest + duoids-hedgehog + hedgehog + no-recursion + ]; + description = "Duoid instances for the algebraic-graphs package"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + } + ) { }; + algebraic-graphs = callPackage ( { mkDerivation, @@ -90257,8 +90296,8 @@ self: { }: mkDerivation { pname = "auto-export"; - version = "0.1.0.0"; - sha256 = "11gv67h3kssqwfdgp00fg5gl0944k3524mmh9avihr0wpjmvswa5"; + version = "0.1.0.1"; + sha256 = "16bs4l4284viya1b4q0k965qbly99pkmny8vdgj92lkfclk1rxjr"; libraryHaskellDepends = [ base bytestring @@ -92273,6 +92312,136 @@ self: { } ) { }; + aws_0_25_1 = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + attoparsec-aeson, + base, + base16-bytestring, + base64-bytestring, + blaze-builder, + byteable, + bytestring, + case-insensitive, + cereal, + conduit, + conduit-extra, + containers, + crypton, + data-default, + directory, + errors, + exceptions, + filepath, + http-client, + http-client-tls, + http-conduit, + http-types, + lifted-base, + memory, + monad-control, + mtl, + network, + network-bsd, + old-locale, + QuickCheck, + quickcheck-instances, + resourcet, + safe, + scientific, + tagged, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + time, + transformers, + transformers-base, + unordered-containers, + utf8-string, + vector, + xml-conduit, + }: + mkDerivation { + pname = "aws"; + version = "0.25.1"; + sha256 = "1prv5chmcnikxizl44ql2f68ri86i9a8i2kcnz7sqqb87ysbf0f6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + attoparsec + attoparsec-aeson + base + base16-bytestring + base64-bytestring + blaze-builder + byteable + bytestring + case-insensitive + cereal + conduit + conduit-extra + containers + crypton + data-default + directory + exceptions + filepath + http-client-tls + http-conduit + http-types + lifted-base + memory + monad-control + mtl + network + network-bsd + old-locale + resourcet + safe + scientific + tagged + text + time + transformers + unordered-containers + utf8-string + vector + xml-conduit + ]; + testHaskellDepends = [ + aeson + base + bytestring + conduit + errors + http-client + http-client-tls + http-types + lifted-base + monad-control + mtl + QuickCheck + quickcheck-instances + resourcet + tagged + tasty + tasty-hunit + tasty-quickcheck + text + time + transformers + transformers-base + ]; + description = "Amazon Web Services (AWS) for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + aws-academy-grade-exporter = callPackage ( { mkDerivation, @@ -92833,6 +93002,60 @@ self: { } ) { }; + aws-eventbridge-cron = callPackage ( + { + mkDerivation, + base, + containers, + criterion, + megaparsec, + QuickCheck, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + time, + tz, + tzdata, + }: + mkDerivation { + pname = "aws-eventbridge-cron"; + version = "0.2.0.0"; + sha256 = "1dv2jm31krkc8924zz0xvkrh1ffas1nmmhbgdccqrb22hbyncjp0"; + libraryHaskellDepends = [ + base + containers + megaparsec + text + time + tz + tzdata + ]; + testHaskellDepends = [ + base + containers + megaparsec + QuickCheck + tasty + tasty-hunit + tasty-quickcheck + text + time + tz + tzdata + ]; + benchmarkHaskellDepends = [ + base + criterion + text + time + tz + ]; + description = "AWS EventBridge cron, rate, and one-time parser with scheduler"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + aws-general = callPackage ( { mkDerivation, @@ -107546,6 +107769,29 @@ self: { } ) { }; + bitarray-bs = callPackage ( + { + mkDerivation, + base, + bytestring, + }: + mkDerivation { + pname = "bitarray-bs"; + version = "0.1.0.0"; + sha256 = "0sf0sgdpgjqh6zyclpic382frzk8gwrm8k3bpffazrmlql8jzd5b"; + libraryHaskellDepends = [ + base + bytestring + ]; + testHaskellDepends = [ + base + bytestring + ]; + description = "Bit array based on ByteString"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + bitcoin-address = callPackage ( { mkDerivation, @@ -111909,8 +112155,8 @@ self: { }: mkDerivation { pname = "bloomfilter"; - version = "2.0.1.2"; - sha256 = "0klb26ldkw32axv3927w489j71r2rc9pangsvznqjbljib9970hp"; + version = "2.0.1.3"; + sha256 = "03lwgk9bwzwfvsmdn9gg2bww2xllr0mmhklwm7sjvvvihw5blj9r"; libraryHaskellDepends = [ array base @@ -120715,10 +120961,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.16.3"; - sha256 = "0l88c5c1i704g87zvnpazfmcppg90b5q5cd6q5k75yx4x9vdcc88"; - revision = "1"; - editedCabalFile = "0jcqp55d8a2fpimc937a1phd6s20ypk12r2ybm3c0d3120sr9bnd"; + version = "0.3.17.0"; + sha256 = "1qp50gnccns9snvykhign98ixly1s7bwzg5wpa969mypy480shdc"; libraryHaskellDepends = [ base byteslice @@ -121205,13 +121449,14 @@ self: { tasty, tasty-hunit, tasty-quickcheck, + text, text-short, wide-word, }: mkDerivation { pname = "bytesmith"; - version = "0.3.13.0"; - sha256 = "0gbpqz1r8xcqii9kj6nd1yjcdrpj49rr107v2ldylvilvqw6yh52"; + version = "0.3.14.0"; + sha256 = "1i7vksz1g497hrn2kf7gk8vjxnd511b1xw1jg085xx0k33pcik6w"; libraryHaskellDepends = [ base byteslice @@ -121219,6 +121464,7 @@ self: { contiguous natural-arithmetic primitive + text text-short wide-word ]; @@ -121641,6 +121887,32 @@ self: { } ) { }; + bytestring-ft = callPackage ( + { + mkDerivation, + base, + bytestring, + mono-traversable, + }: + mkDerivation { + pname = "bytestring-ft"; + version = "0.1.0.0"; + sha256 = "0m93i56n26qi47y340c3a84mrghdavnfdgf1nfd4db0j63wzzglp"; + libraryHaskellDepends = [ + base + bytestring + mono-traversable + ]; + testHaskellDepends = [ + base + bytestring + mono-traversable + ]; + description = "Byte String implemented on Finger Tree"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + bytestring-handle = callPackage ( { mkDerivation, @@ -122436,8 +122708,8 @@ self: { }: mkDerivation { pname = "bz3"; - version = "1.0.0.0"; - sha256 = "1iik8r9hwhyqfi71f8nc0lb2ia18lgkrfsfcl98y7cfq243svc1a"; + version = "1.0.0.1"; + sha256 = "02nrsn63wrc5ml00iiap1pvbkk3nmc1py52423b0x0h5kk8bidnk"; libraryHaskellDepends = [ base binary @@ -123368,8 +123640,8 @@ self: { }: mkDerivation { pname = "cabal-appimage"; - version = "0.4.1.0"; - sha256 = "009mp46i5xx6cqjbmbj6m0kh2r2l1wa3gvpnjn9nc58vqhfnhr9c"; + version = "0.4.2.0"; + sha256 = "0vaxrp127anayn9zyk1icrzrq975f773fysn20ql1zs6msbwd9ca"; libraryHaskellDepends = [ base Cabal @@ -123973,7 +124245,7 @@ self: { } ) { }; - cabal-debian_5_4_0 = callPackage ( + cabal-debian_5_4_1 = callPackage ( { mkDerivation, base, @@ -124005,8 +124277,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.4.0"; - sha256 = "03ldl0bkqv11jgbz0bj6v02bh27nahnpq909xywjwn9syp2bmzqj"; + version = "5.4.1"; + sha256 = "16c3jj9hcda9lhnyp6qp49f8w2rhakxiy4gr5jz5d9x8w2izrc9v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124206,8 +124478,8 @@ self: { }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.11"; - sha256 = "0gwjpwv2v7c7gs2dvf7ixsxx6likmgw5yi0fy4bqc0i7nkqg4bfw"; + version = "1.0.12"; + sha256 = "0b4vlfdcazlyaklcqv2w94bh6xipjpfdffzp6w36bzj5639g049i"; libraryHaskellDepends = [ base Cabal @@ -125554,8 +125826,8 @@ self: { }: mkDerivation { pname = "cabal-matrix"; - version = "1.0.0.0"; - sha256 = "1y5hc98w9c6amlzp0nvzgd331nrmnf4qgqr0n6nv80zqy9s80b65"; + version = "1.0.1.0"; + sha256 = "029r3bf3w09jzrh0xy1hz9y13wr0w603b0gp5z7wm7qp3ki21iyy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129310,8 +129582,8 @@ self: { }: mkDerivation { pname = "canadian-income-tax"; - version = "2024.1"; - sha256 = "1j68n3j05ga0l3fm9ric61i04kn0yjgzw80vzgwa5g208v1l97vj"; + version = "2024.1.0.1"; + sha256 = "04q4p0f4cmrg8zljbb79pmz1jbisv41zcz9g13gkqgp4q9r5di9s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -161929,8 +162201,8 @@ self: { }: mkDerivation { pname = "control-monad-omega"; - version = "0.3.3"; - sha256 = "0f90q6mxxb8szqvw93pypbbf4nicj1w5n9sqs4434b6cp55665z6"; + version = "0.3.4"; + sha256 = "0pyl90zk80myfw4vka2v6awh5fam43kljis613j0n0x4dkzvyf0q"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -181934,11 +182206,13 @@ self: { dataframe = callPackage ( { mkDerivation, + aeson, array, attoparsec, base, bytestring, bytestring-lexing, + cassava, containers, criterion, directory, @@ -181951,26 +182225,31 @@ self: { process, random, random-shuffle, + regex-tdfa, + scientific, snappy-hs, template-haskell, text, time, + unordered-containers, vector, vector-algorithms, zstd, }: mkDerivation { pname = "dataframe"; - version = "0.3.3.6"; - sha256 = "0x32x6lg5kq3l2zpcpbp1nw6k279lp1y4nsfm9ppaz18j9k39nqy"; + version = "0.3.4.0"; + sha256 = "0n33zjgfkrnr9j4sg93w2iz743m3yw0hk6nnpy3081ibj24426vj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ + aeson array attoparsec base bytestring bytestring-lexing + cassava containers directory granite @@ -181979,10 +182258,13 @@ self: { parallel process random + regex-tdfa + scientific snappy-hs template-haskell text time + unordered-containers vector vector-algorithms zstd @@ -186901,10 +187183,8 @@ self: { }: mkDerivation { pname = "deltaq"; - version = "1.1.0.0"; - sha256 = "06f71mikkmxpvpywl3ydss1knwy9pd3x9klbxfiz985v9q5nb4ja"; - revision = "1"; - editedCabalFile = "1g9l29msxa2w3yzv3xnvhhzgh1a2vc3s7g39g6rbx9rdx1xw68kc"; + version = "1.2.0.0"; + sha256 = "0d9a96m2bwjm52v3s041kay02lsxbq0510rhczxksg0vjqc8l14b"; libraryHaskellDepends = [ base Chart @@ -188272,11 +188552,12 @@ self: { hspec, template-haskell, th-abstraction, + th-test-utils, }: mkDerivation { pname = "derive-has-field"; - version = "0.1.2.0"; - sha256 = "1ccsg6x0isnqgnxdl53y18jciwlv4nvbjb7g4vpdw60s9p0z86xw"; + version = "0.1.2.1"; + sha256 = "0zz2c5ykjmbbwfxk066di6mhlfrdqamdzg8g498jgc2dqvd10nma"; libraryHaskellDepends = [ base template-haskell @@ -188287,6 +188568,7 @@ self: { hspec template-haskell th-abstraction + th-test-utils ]; description = "Derive HasField instances with Template Haskell"; license = lib.licenses.mit; @@ -191541,8 +191823,8 @@ self: { }: mkDerivation { pname = "dhscanner-kbgen"; - version = "1.0.7"; - sha256 = "1z7l1q9ijk2xzy94vpbkjsx74zccp2a1b3qbjfmhfh5gkpk3gyvv"; + version = "1.0.12"; + sha256 = "1zmnc4ih9pk12wz7mxrxf0y6wrirvdngk3ch4w0605czwh8522i3"; libraryHaskellDepends = [ aeson base @@ -202148,6 +202430,8 @@ self: { pname = "dom-parser"; version = "3.2.0"; sha256 = "1i71gcxwq0pdwkg70l33gaqcf8ihbgw3rgbw6r11p4vri0fl6fr4"; + revision = "1"; + editedCabalFile = "15h56mpdddbws6ifkd93m3l6ywg90cp9vf40b1f8qzhvwy65dpj9"; libraryHaskellDepends = [ base case-insensitive @@ -203791,6 +204075,35 @@ self: { } ) { }; + dpapi = callPackage ( + { + mkDerivation, + base, + base64, + bytestring, + HUnit, + text, + typed-process, + Win32, + }: + mkDerivation { + pname = "dpapi"; + version = "0.1.0.0"; + sha256 = "16rl4fpjf2jn0fgh5mmsg8j9z7h5p0jqm8f6cr4bz71q0nq8rj11"; + testHaskellDepends = [ + base + base64 + bytestring + HUnit + text + typed-process + Win32 + ]; + description = "Windows DPAPI bindings"; + license = lib.licensesSpdx."MPL-2.0"; + } + ) { }; + dph-base = callPackage ( { mkDerivation, @@ -206183,6 +206496,114 @@ self: { } ) { }; + duoidal-transformers = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + doctest, + duoids, + no-recursion, + transformers, + }: + mkDerivation { + pname = "duoidal-transformers"; + version = "0.0.1.0"; + sha256 = "0hlnlak7pamdaaxlac8zi9gd9wvjf4lh3fbdhcz5kldxrbj5jwgv"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + no-recursion + ]; + libraryHaskellDepends = [ + base + duoids + no-recursion + transformers + ]; + testHaskellDepends = [ + base + doctest + no-recursion + ]; + description = "Extending the tranformers package with duoids"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + } + ) { }; + + duoids = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + doctest, + no-recursion, + }: + mkDerivation { + pname = "duoids"; + version = "0.0.1.0"; + sha256 = "1h697a56b827ddmhhp9w3wsbm815527zjl1hnp9f6hn6cwv2ylfn"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + no-recursion + ]; + libraryHaskellDepends = [ + base + no-recursion + ]; + testHaskellDepends = [ + base + doctest + no-recursion + ]; + description = "Unifying parallel and sequential operations"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial) AND BSD-3-Clause"; + } + ) { }; + + duoids-hedgehog = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + doctest, + duoids, + hedgehog, + no-recursion, + }: + mkDerivation { + pname = "duoids-hedgehog"; + version = "0.0.1.0"; + sha256 = "0vcvyqqnray1h62lnihgcaimzrc2ava77g1p5ys9fs6pkq3pxfzf"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + no-recursion + ]; + libraryHaskellDepends = [ + base + duoids + hedgehog + no-recursion + ]; + testHaskellDepends = [ + base + doctest + hedgehog + no-recursion + ]; + description = "Unifying parallel and sequential operations"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + } + ) { }; + dupIO = callPackage ( { mkDerivation, @@ -210426,6 +210847,43 @@ self: { } ) { }; + effectful-poolboy = callPackage ( + { + mkDerivation, + async, + base, + effectful, + effectful-core, + hspec, + hspec-core, + poolboy, + timeit, + }: + mkDerivation { + pname = "effectful-poolboy"; + version = "0.1.0.0"; + sha256 = "05m8k06mrrc1insn4bnxnlfi2d137abki2lczq7fwhjm5zzr645s"; + libraryHaskellDepends = [ + async + base + effectful-core + poolboy + ]; + testHaskellDepends = [ + async + base + effectful + effectful-core + hspec + hspec-core + poolboy + timeit + ]; + description = "Simple work queue for bounded concurrency (effectful wrapper)"; + license = lib.licensesSpdx."ISC"; + } + ) { }; + effectful-postgresql = callPackage ( { mkDerivation, @@ -226835,8 +227293,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.8"; - sha256 = "18c9ad7wjf6q4yp0sagxhwyjpm9frw9kk27ih2x0nmjhmrgcx91g"; + version = "1.8.1"; + sha256 = "165mk0030bhkzh3czzpps5df5il5q46marrdhbd7nsk433bxd9v6"; libraryHaskellDepends = [ base clock @@ -242239,8 +242697,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.16.7"; - sha256 = "12d46b232aks34nvb3jc66dhz0nxq3z8ngbs6rfn71paj2mfj5cv"; + version = "0.16.8"; + sha256 = "152c71a1al7gxk7kzs73nyi237z74nqgf0i8xk98zs5v9cm1h3hk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -260973,8 +261431,8 @@ self: { }: mkDerivation { pname = "ghc-parser"; - version = "0.2.7.0"; - sha256 = "08m1jb093pkmbj7km7xclq6f1jz20v313ih9b4fydis974i8pv3h"; + version = "0.2.8.0"; + sha256 = "1w346jy9vgfyclkg4rri871ixbpb6skks2x4x7hcg49jn9rnmxpx"; libraryHaskellDepends = [ base ghc @@ -261731,8 +262189,7 @@ self: { deepseq, directory, filepath, - ghc, - ghc-boot, + ghc-lib, ghc-paths, optparse-applicative, process, @@ -261745,10 +262202,8 @@ self: { }: mkDerivation { pname = "ghc-tags"; - version = "1.9"; - sha256 = "0s0gipypdz9d7ny8bz38msqlr88y5b3fcd3xzdcsm5mlbra4m904"; - revision = "1"; - editedCabalFile = "0id8whk4dabyrr7kcbgzn3770ypyqin24fqpc0yn5d5x5jm0ynhz"; + version = "1.10"; + sha256 = "1ckcrafm83fqr8k4wzmpfbk889in0296ym0500kfhqj7cm80w7w7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -261761,8 +262216,7 @@ self: { deepseq directory filepath - ghc - ghc-boot + ghc-lib ghc-paths optparse-applicative process @@ -268982,31 +269436,31 @@ self: { mkDerivation, base, cmdargs, + directory, + filepath, hslogger, parallel-io, regex-posix, shelly, - system-fileio, - system-filepath, text, transformers, unix, }: mkDerivation { pname = "git-all"; - version = "1.6.0"; - sha256 = "10fq88fld1lb5wrikcsg9gxcfbldr0fpix81sba8qy11g7igd7fl"; + version = "1.8.1"; + sha256 = "1c7jiyj9pz65dq6bck312fs28q4mcn5q6dp98xpp741ami8nz82k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs + directory + filepath hslogger parallel-io regex-posix shelly - system-fileio - system-filepath text transformers unix @@ -269129,8 +269583,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20251029"; - sha256 = "0i4ys60rn9df94hm5r1q0y19kv43f1r2j4pj54jkrgdki7i906py"; + version = "10.20251114"; + sha256 = "0rl72ygqgzq97ri86k9asinv14s56g06q2w1nlnb4sx3a91sw7as"; configureFlags = [ "-fassistant" "-f-benchmark" @@ -279384,6 +279838,36 @@ self: { } ) { }; + google-oauth2-jwt_0_3_3_2 = callPackage ( + { + mkDerivation, + base, + base64-bytestring, + bytestring, + HsOpenSSL, + RSA, + text, + unix-time, + }: + mkDerivation { + pname = "google-oauth2-jwt"; + version = "0.3.3.2"; + sha256 = "1j98waikh1lka2x2jwy09gnvk20zqjpjb4b4kjn6r454bm6xv0ih"; + libraryHaskellDepends = [ + base + base64-bytestring + bytestring + HsOpenSSL + RSA + text + unix-time + ]; + description = "Get a signed JWT for Google Service Accounts"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + google-search = callPackage ( { mkDerivation, @@ -280311,9 +280795,8 @@ self: { mkDerivation, aeson, base, - binary, bytestring, - connection, + crypton-connection, exceptions, hashable, http-client, @@ -280324,20 +280807,20 @@ self: { lens-aeson, scientific, text, + tls, unix, unordered-containers, vector, }: mkDerivation { pname = "gothic"; - version = "0.1.8.3"; - sha256 = "0lf0yhq4q2vcw9b69l7ixdscmz5drxiag9l31iz1ypb8cyjspi1q"; + version = "0.1.8.4"; + sha256 = "052ixajcs3nvsdwdhrhd4l7y9vxrhhdmcxdpwb4irl524mskimzm"; libraryHaskellDepends = [ aeson base - binary bytestring - connection + crypton-connection exceptions hashable http-client @@ -280348,6 +280831,7 @@ self: { lens-aeson scientific text + tls unix unordered-containers vector @@ -299638,8 +300122,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.7.1"; - sha256 = "1pd7axnr48bc5lqw3zax0cs3722m39pgmgjrkhq8fd30alw3xm2s"; + version = "0.1.7.2"; + sha256 = "0rwffb74kafd4284h649p1q7n38hajvbdq6p0l1z93dl7jindiqg"; libraryHaskellDepends = [ base binary @@ -303240,10 +303724,14 @@ self: { dap, directory, exceptions, + file-embed, filepath, ghc, + ghc-boot, + ghc-boot-th, ghci, haskeline, + haskell-debugger-view, hie-bios, implicit-hie, mtl, @@ -303266,8 +303754,8 @@ self: { }: mkDerivation { pname = "haskell-debugger"; - version = "0.9.0.0"; - sha256 = "1fla0w681lv9v64aglyyg4i4s83fzcs836cm3xj4a4jviv9m3psg"; + version = "0.10.1.0"; + sha256 = "0jqnbrv9a7k1lpmvkdzmc88wz576m9f6cag5in4s65y6akna6mh5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -303282,9 +303770,13 @@ self: { cryptohash-sha1 directory exceptions + file-embed filepath ghc + ghc-boot + ghc-boot-th ghci + haskell-debugger-view hie-bios mtl prettyprinter @@ -303340,13 +303832,36 @@ self: { text unordered-containers ]; - description = "A step-through machine-interface debugger for GHC Haskell"; + description = "A step-through debugger for GHC Haskell"; license = lib.licensesSpdx."BSD-3-Clause"; hydraPlatforms = lib.platforms.none; mainProgram = "hdb"; } ) { }; + haskell-debugger-view = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + text, + }: + mkDerivation { + pname = "haskell-debugger-view"; + version = "0.1.0.0"; + sha256 = "0kfpkpbw3m2z7qr0fibsacqcfiiczawhml6hvr25i7czrg4vnk4a"; + libraryHaskellDepends = [ + base + bytestring + containers + text + ]; + description = "Custom debug visualization instances for @haskell-debugger@"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + haskell-disque = callPackage ( { mkDerivation, @@ -315211,65 +315726,6 @@ self: { ) { }; haxr = callPackage ( - { - mkDerivation, - array, - base, - base-compat, - base64-bytestring, - blaze-builder, - bytestring, - HaXml, - HsOpenSSL, - http-streams, - http-types, - io-streams, - mtl, - mtl-compat, - network, - network-uri, - old-locale, - old-time, - template-haskell, - text, - time, - utf8-string, - }: - mkDerivation { - pname = "haxr"; - version = "3000.11.5.1"; - sha256 = "1r5ipm1qzlkxk1xc9hv86kli5aa4nw7i9a6n42ixkcspwb8fjhzd"; - revision = "1"; - editedCabalFile = "0m9x1cs789qs7k3zc197zri1nbh6g1y05xraq5a1k10s0xs5sjdy"; - libraryHaskellDepends = [ - array - base - base-compat - base64-bytestring - blaze-builder - bytestring - HaXml - HsOpenSSL - http-streams - http-types - io-streams - mtl - mtl-compat - network - network-uri - old-locale - old-time - template-haskell - text - time - utf8-string - ]; - description = "XML-RPC client and server library"; - license = lib.licenses.bsd3; - } - ) { }; - - haxr_3000_11_6 = callPackage ( { mkDerivation, array, @@ -315323,7 +315779,6 @@ self: { ]; description = "XML-RPC client and server library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -331932,8 +332387,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.50.2"; - sha256 = "04rc39c2vvs0pxsabk5fm5d7ldrgn1ahkbqqw296zra94mcc600w"; + version = "1.50.3"; + sha256 = "0qiii5gdsw0x1dkxsws481mx49fg2013l6y0vsza281ziryzwcm2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -332487,8 +332942,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.50.2"; - sha256 = "1x070rs92n1y0l07x4lvg77x5k5sclafm1iissfd17dbg5d84383"; + version = "1.50.3"; + sha256 = "1z0k0mp64vnlz3k66csz7i3vpns3lhy2mg8k6p2lznivr4hfzph1"; libraryHaskellDepends = [ aeson aeson-pretty @@ -332754,10 +333209,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.50.2"; - sha256 = "1g9ygyj99mzr8x3xh4zyrqpivv4c35cadybgg0ihjxpvmz7vlz4n"; - revision = "1"; - editedCabalFile = "0n32y9p0z5vvsgpv601vqqir8qm0fkhppvn7aqmhy2450xgzcdrh"; + version = "1.50.3"; + sha256 = "1wm2v7z57z16wb0a068bwrdwhaaq8rf8mzhl347z60nb3y0ihnk5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -332892,8 +333345,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.50.2"; - sha256 = "1hmqcnpc2wdkp2aysdy1872vcmji00b1s2rpv08fk8pcqsa3892v"; + version = "1.50.3"; + sha256 = "0p5hd9rg99ilv9gnd3k1xcnp6m4ndfin1v4ah898b741ib5chj4s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -342866,6 +343319,139 @@ self: { } ) { }; + hpack_0_39_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bifunctors, + bytestring, + Cabal, + containers, + crypton, + deepseq, + directory, + filepath, + Glob, + hspec, + hspec-discover, + http-client, + http-client-tls, + http-types, + HUnit, + infer-license, + interpolate, + mockery, + mtl, + pretty, + QuickCheck, + scientific, + template-haskell, + temporary, + text, + transformers, + unordered-containers, + vcr, + vector, + yaml, + }: + mkDerivation { + pname = "hpack"; + version = "0.39.0"; + sha256 = "0cjjjw5zr0j64350i7kc6g5k6f2nkffwi206vbgwmblmxjqmq02p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bifunctors + bytestring + Cabal + containers + crypton + deepseq + directory + filepath + Glob + http-client + http-client-tls + http-types + infer-license + mtl + pretty + scientific + text + transformers + unordered-containers + vector + yaml + ]; + executableHaskellDepends = [ + aeson + base + bifunctors + bytestring + Cabal + containers + crypton + deepseq + directory + filepath + Glob + http-client + http-client-tls + http-types + infer-license + mtl + pretty + scientific + text + transformers + unordered-containers + vector + yaml + ]; + testHaskellDepends = [ + aeson + base + bifunctors + bytestring + Cabal + containers + crypton + deepseq + directory + filepath + Glob + hspec + http-client + http-client-tls + http-types + HUnit + infer-license + interpolate + mockery + mtl + pretty + QuickCheck + scientific + template-haskell + temporary + text + transformers + unordered-containers + vcr + vector + yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hpack"; + } + ) { }; + hpack-convert = callPackage ( { mkDerivation, @@ -347010,8 +347596,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-instrumentation-auto"; - version = "0.1.0.2"; - sha256 = "1w4xq79phbbhjjp9q5pj7wlsdp0nrlfdhqpc9yh0vlaqag93cc6d"; + version = "0.1.0.3"; + sha256 = "082crbi4hhnlyb5qm49v5955ws95skiq0ih7p17425nfsp68kndd"; libraryHaskellDepends = [ base bytestring @@ -354232,6 +354818,29 @@ self: { } ) { }; + hsmrc = callPackage ( + { + mkDerivation, + base, + bytestring, + text, + }: + mkDerivation { + pname = "hsmrc"; + version = "0.1.1"; + sha256 = "11xydr0l8gr049gwaqc6dzk0ql9rwql3l34r35my69gz3aq39bfv"; + revision = "1"; + editedCabalFile = "18p39bw5lwmx634y2icmm1sv35r4332qgsjz3bh673w8nyvid174"; + libraryHaskellDepends = [ + base + bytestring + text + ]; + description = "Library for Marc21 bibliographic records"; + license = lib.licenses.bsd3; + } + ) { }; + hsmtpclient = callPackage ( { mkDerivation, @@ -361436,8 +362045,8 @@ self: { }: mkDerivation { pname = "http-directory"; - version = "0.1.11"; - sha256 = "1ny5qcwx56f5zb1s8cmwj2gc5xk6rck9cxirjrcp58ry6d6dmvl6"; + version = "0.1.12"; + sha256 = "1m571hwllb1xa5qwb9amjhjvxm64shyabxaqbs8jlgi9aj5wl4sg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -362729,6 +363338,40 @@ self: { } ) { }; + http-semantics_0_4_0 = callPackage ( + { + mkDerivation, + array, + base, + bytestring, + case-insensitive, + http-types, + network, + network-byte-order, + time-manager, + utf8-string, + }: + mkDerivation { + pname = "http-semantics"; + version = "0.4.0"; + sha256 = "0wxw10432rgsmgns8vk4wv7km85ak0rbsc9b6yyw26awp1g0ch4x"; + libraryHaskellDepends = [ + array + base + bytestring + case-insensitive + http-types + network + network-byte-order + time-manager + utf8-string + ]; + description = "HTTP semantics library"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + http-server = callPackage ( { mkDerivation, @@ -363104,6 +363747,8 @@ self: { pname = "http2"; version = "5.3.10"; sha256 = "0rs21pgnmd0qcg1j360pm8r9c4hm18bcivhnq3krqjl32zb1frpl"; + revision = "1"; + editedCabalFile = "0vknnc3qfhlya9fk1alamdlpjxmh471aknh37mjbknq9rg9n93kw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -363163,6 +363808,106 @@ self: { } ) { }; + http2_5_4_0 = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + array, + async, + base, + base16-bytestring, + bytestring, + case-insensitive, + containers, + criterion, + crypton, + directory, + filepath, + Glob, + hspec, + hspec-discover, + http-semantics, + http-types, + iproute, + network, + network-byte-order, + network-control, + network-run, + random, + stm, + text, + time-manager, + typed-process, + unix-time, + unordered-containers, + utf8-string, + vector, + }: + mkDerivation { + pname = "http2"; + version = "5.4.0"; + sha256 = "09qj8afc0dfd769hs8lch14m5njacxfl2yncxlhxwbgxxs7zfgdq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array + async + base + bytestring + case-insensitive + containers + http-semantics + http-types + iproute + network + network-byte-order + network-control + stm + time-manager + unix-time + utf8-string + ]; + testHaskellDepends = [ + aeson + aeson-pretty + async + base + base16-bytestring + bytestring + crypton + directory + filepath + Glob + hspec + http-semantics + http-types + network + network-byte-order + network-run + random + text + typed-process + unordered-containers + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array + base + bytestring + case-insensitive + containers + criterion + network-byte-order + stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + http2-client = callPackage ( { mkDerivation, @@ -363401,8 +364146,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.4.9"; - sha256 = "180l7fqddgrxjvqikrg1q2s5p3s2h4a4fsf23l3bn9fvirnswf4d"; + version = "0.5.1"; + sha256 = "08lcmnyrdpfj2lqnc7zm82qa8gr9s90qqg0vfghx9xzsa1g6c2l2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -363461,8 +364206,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.1.1"; - sha256 = "0bzi8w3nz6yw5ab30674p062nvps55q9f0vpxdgqgnb22jim8jyj"; + version = "0.1.2"; + sha256 = "09s7n19aw4my7rrpjkrh4ql53282gjgfjkd2k1fn85xgz3y7jcbc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -373316,6 +374061,57 @@ self: { } ) { }; + idn = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + criterion, + deepseq, + file-embed, + hspec, + hspec-discover, + primitive, + QuickCheck, + text, + vector, + vector-algorithms, + }: + mkDerivation { + pname = "idn"; + version = "0.1.2.0"; + sha256 = "0kpykvjmi71ixgqkndcxpxwwyb0fsdgcswzkgw9gwcz1yyk8c4zv"; + libraryHaskellDepends = [ + base + bytestring + containers + deepseq + file-embed + primitive + text + vector + vector-algorithms + ]; + testHaskellDepends = [ + base + hspec + QuickCheck + text + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base + criterion + deepseq + QuickCheck + text + ]; + description = "Pure Haskell IDN and Punycode implementation"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + idna = callPackage ( { mkDerivation, @@ -374172,6 +374968,129 @@ self: { } ) { }; + ihaskell_0_13_0_0 = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + binary, + bytestring, + cmdargs, + containers, + directory, + exceptions, + filepath, + ghc, + ghc-boot, + ghc-parser, + ghc-paths, + ghc-syntax-highlighter, + haskeline, + hlint, + hspec, + hspec-contrib, + http-client, + http-client-tls, + HUnit, + ipython-kernel, + parsec, + process, + random, + raw-strings-qq, + setenv, + shelly, + split, + stm, + strict, + text, + time, + transformers, + unix, + unordered-containers, + utf8-string, + vector, + }: + mkDerivation { + pname = "ihaskell"; + version = "0.13.0.0"; + sha256 = "1fgwb54gi9kngw8n7214670vj4hpkf7s0z5zybnp33sz2y0jnnr6"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + binary + bytestring + cmdargs + containers + directory + exceptions + filepath + ghc + ghc-boot + ghc-parser + ghc-paths + ghc-syntax-highlighter + haskeline + hlint + http-client + http-client-tls + ipython-kernel + parsec + process + random + shelly + split + stm + strict + text + time + transformers + unix + unordered-containers + utf8-string + vector + ]; + executableHaskellDepends = [ + aeson + base + bytestring + containers + directory + ghc + ipython-kernel + process + strict + text + transformers + unix + unordered-containers + ]; + testHaskellDepends = [ + aeson + base + directory + ghc + ghc-paths + hspec + hspec-contrib + HUnit + raw-strings-qq + setenv + shelly + text + transformers + ]; + description = "A Haskell backend kernel for the Jupyter project"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "ihaskell"; + } + ) { }; + ihaskell-aeson = callPackage ( { mkDerivation, @@ -374274,6 +375193,55 @@ self: { } ) { }; + ihaskell-dataframe = callPackage ( + { + mkDerivation, + base, + dataframe, + dataframe-hasktorch, + hasktorch, + ihaskell, + random, + random-shuffle, + text, + }: + mkDerivation { + pname = "ihaskell-dataframe"; + version = "0.1.0.0"; + sha256 = "1waqr8dc6dcz6r4qm62c8y2c52wr145zk3qd6l4a5rdgii20ybg6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + dataframe + dataframe-hasktorch + hasktorch + ihaskell + random + random-shuffle + text + ]; + executableHaskellDepends = [ + base + dataframe + dataframe-hasktorch + hasktorch + ihaskell + random + random-shuffle + text + ]; + testHaskellDepends = [ + base + dataframe + ihaskell + text + ]; + license = lib.licensesSpdx."BSD-3-Clause"; + mainProgram = "ihaskell-dataframe-exe"; + } + ) { }; + ihaskell-diagrams = callPackage ( { mkDerivation, @@ -378688,6 +379656,104 @@ self: { } ) { }; + inf-backprop_0_2_0_2 = callPackage ( + { + mkDerivation, + base, + combinatorial, + comonad, + composition, + data-fix, + deepseq, + doctest, + extra, + finite-typelits, + fixed-vector, + ghc-prim, + hashable, + indexed-list-literals, + isomorphism-class, + lens, + numhask, + optics, + primitive, + profunctors, + safe, + simple-expr, + Stream, + text, + transformers, + unordered-containers, + vector, + vector-sized, + }: + mkDerivation { + pname = "inf-backprop"; + version = "0.2.0.2"; + sha256 = "0nssr4j4gd3lf6asxvmf2qq9j8z6q5318kn0ky5r3kqmgdp54wfc"; + libraryHaskellDepends = [ + base + combinatorial + comonad + composition + data-fix + deepseq + extra + finite-typelits + fixed-vector + ghc-prim + hashable + indexed-list-literals + isomorphism-class + lens + numhask + optics + primitive + profunctors + safe + simple-expr + Stream + text + transformers + unordered-containers + vector + vector-sized + ]; + testHaskellDepends = [ + base + combinatorial + comonad + composition + data-fix + deepseq + doctest + extra + finite-typelits + fixed-vector + ghc-prim + hashable + indexed-list-literals + isomorphism-class + lens + numhask + optics + primitive + profunctors + safe + simple-expr + Stream + text + transformers + unordered-containers + vector + vector-sized + ]; + description = "Automatic differentiation and backpropagation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + inf-interval = callPackage ( { mkDerivation, @@ -381560,6 +382626,8 @@ self: { pname = "integration"; version = "0.2.1"; sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc"; + revision = "1"; + editedCabalFile = "1lqmj7szzvmv1binfvg6fkvswwykxak3kqxrd0hw4fizk4i3knch"; libraryHaskellDepends = [ base parallel @@ -385157,6 +386225,59 @@ self: { } ) { }; + ipython-kernel_0_12_1_0 = callPackage ( + { + mkDerivation, + aeson, + base, + base16-bytestring, + binary, + bytestring, + containers, + cryptohash-sha256, + directory, + filepath, + parsec, + process, + temporary, + text, + transformers, + unordered-containers, + uuid, + zeromq4-haskell, + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.12.1.0"; + sha256 = "1rwi15dpji1alrslrdljgs384d3nw0mlq6yl27ffc0kd01kdz126"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + base + base16-bytestring + binary + bytestring + containers + cryptohash-sha256 + directory + filepath + parsec + process + temporary + text + transformers + unordered-containers + uuid + zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + irc = callPackage ( { mkDerivation, @@ -407156,6 +408277,7 @@ self: { aeson, async, base, + base64-bytestring, bytestring, conduit, containers, @@ -407164,6 +408286,7 @@ self: { http-conduit, http-types, ollama-haskell, + openai, parsec, pdf-toolbox-document, tagsoup, @@ -407171,18 +408294,19 @@ self: { tasty-hunit, temporary, text, + time, + transformers, vector, }: mkDerivation { pname = "langchain-hs"; - version = "0.0.2.0"; - sha256 = "0gh3gmmppfms1jg5zaxksalh90675r4pl6lmz63szkpwl9rmc9kz"; - revision = "2"; - editedCabalFile = "0qk56yswclxrf903c34ifadd8ja2l3zxfc0b2vzlgf1x7zf4cikl"; + version = "0.0.3.0"; + sha256 = "1jj4pwrvs4q9qz8d4mi3ygkrvrxdx9hxddiyp81sn9zsqpvk4azy"; libraryHaskellDepends = [ aeson async base + base64-bytestring bytestring conduit containers @@ -407191,16 +408315,20 @@ self: { http-conduit http-types ollama-haskell + openai parsec pdf-toolbox-document tagsoup text + time + transformers vector ]; testHaskellDepends = [ aeson async base + base64-bytestring bytestring conduit containers @@ -407209,6 +408337,7 @@ self: { http-conduit http-types ollama-haskell + openai parsec pdf-toolbox-document tagsoup @@ -407216,6 +408345,8 @@ self: { tasty-hunit temporary text + time + transformers vector ]; description = "Haskell implementation of Langchain"; @@ -409362,17 +410493,17 @@ self: { mkDerivation, base, deepseq, + hspec, lens, parsec-class, pretty, + process, QuickCheck, }: mkDerivation { pname = "language-nix"; - version = "2.2.0"; - sha256 = "1lq07311dg4a32zdp5bc20bw94g0c7pdzxdiwi2y4zbhd1944rzx"; - revision = "1"; - editedCabalFile = "0g4hq729bz128sf3ifd8rbfamwa8mqqcnhbc3qxnpz1myzvxhnjk"; + version = "2.3.0"; + sha256 = "03gvhaa82kd3nmpfjf5vlkzr6yjxl5whvy2z2xnskfl63q48qsra"; libraryHaskellDepends = [ base deepseq @@ -409381,6 +410512,15 @@ self: { pretty QuickCheck ]; + testHaskellDepends = [ + base + hspec + lens + parsec-class + pretty + process + QuickCheck + ]; description = "Data types and functions to represent the Nix language"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sternenseemann ]; @@ -412461,8 +413601,8 @@ self: { }: mkDerivation { pname = "layoutz"; - version = "0.1.0.0"; - sha256 = "0hmqi5ly418nqbz8zzj9r5mvcndmympwh5zkxqipf9gj3swppy9z"; + version = "0.1.1.0"; + sha256 = "0jmahwgbf64axjqd13r6b51aqarxby6qv9k93hfvrdim3rwnjdw7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -413253,6 +414393,7 @@ self: { bytestring, containers, crypton-connection, + data-default, hspec, hspec-discover, network, @@ -413260,11 +414401,12 @@ self: { semigroups, stm, text, + tls, }: mkDerivation { pname = "ldap-client-og"; - version = "0.4.0"; - sha256 = "06migywnmdd3d0cbkhs4y1v62wpa3p2s5pn5vgw269wyhxq3ph4a"; + version = "0.5.0"; + sha256 = "023wsfcl8vy2viwr4447s5yd27rr42l0v54xxdxzl4bx09zkp87l"; libraryHaskellDepends = [ asn1-encoding asn1-types @@ -413273,10 +414415,12 @@ self: { bytestring containers crypton-connection + data-default network semigroups stm text + tls ]; testHaskellDepends = [ base @@ -415827,8 +416971,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.5.9.1"; - sha256 = "0vw5myzycksjcl7r1yjkj1i771v5yqm68k17jj7dxg050dfsnwkc"; + version = "1.5.10.0"; + sha256 = "1x99355r4yds90vp6v3wkv00pvcs9041s29njnv16livfm8y4w1s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -421386,6 +422530,83 @@ self: { } ) { }; + linear-base_0_6_0 = callPackage ( + { + mkDerivation, + base, + containers, + deepseq, + ghc-bignum, + ghc-prim, + hashable, + hashtables, + hedgehog, + inspection-testing, + linear-generics, + mmorph, + MonadRandom, + primitive, + random, + random-shuffle, + storable-tuple, + tasty, + tasty-bench, + tasty-hedgehog, + tasty-inspection-testing, + text, + transformers, + unordered-containers, + vector, + }: + mkDerivation { + pname = "linear-base"; + version = "0.6.0"; + sha256 = "0rjqzzrw513nrjf4fmq78mnnz63c1j7wgipqp273klx96iwznbk7"; + libraryHaskellDepends = [ + base + containers + ghc-bignum + ghc-prim + hashable + linear-generics + primitive + storable-tuple + text + transformers + vector + ]; + testHaskellDepends = [ + base + containers + hedgehog + inspection-testing + linear-generics + mmorph + tasty + tasty-hedgehog + tasty-inspection-testing + vector + ]; + benchmarkHaskellDepends = [ + base + containers + deepseq + hashable + hashtables + MonadRandom + random + random-shuffle + tasty-bench + unordered-containers + vector + ]; + doHaddock = false; + description = "Standard library for linear types"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + linear-circuit = callPackage ( { mkDerivation, @@ -432416,34 +433637,6 @@ self: { ) { }; lua = callPackage ( - { - mkDerivation, - base, - lua5_4, - tasty, - tasty-hunit, - }: - mkDerivation { - pname = "lua"; - version = "2.3.3"; - sha256 = "0xvhfq8ms5wbchrscxaqf4a9panfnzgz5xdlg86790nydab2kals"; - configureFlags = [ - "-fsystem-lua" - "-f-use-pkgconfig" - ]; - libraryHaskellDepends = [ base ]; - librarySystemDepends = [ lua5_4 ]; - testHaskellDepends = [ - base - tasty - tasty-hunit - ]; - description = "Lua, an embeddable scripting language"; - license = lib.licensesSpdx."MIT"; - } - ) { inherit (pkgs) lua5_4; }; - - lua_2_3_4 = callPackage ( { mkDerivation, base, @@ -432468,7 +433661,6 @@ self: { ]; description = "Lua, an embeddable scripting language"; license = lib.licensesSpdx."MIT"; - hydraPlatforms = lib.platforms.none; } ) { inherit (pkgs) lua5_4; }; @@ -436390,8 +437582,8 @@ self: { }: mkDerivation { pname = "makefile"; - version = "1.1.0.0"; - sha256 = "01swnw8fp2cx5z5xim9apia3yw48six61mhf6p3g0gp99w4i4ypd"; + version = "1.1.0.2"; + sha256 = "1abwscz1nx939v4fcmn11nyi9cbnk5a6mhgb4l6dzz3j8x118b1a"; libraryHaskellDepends = [ attoparsec base @@ -436517,8 +437709,8 @@ self: { }: mkDerivation { pname = "managed"; - version = "1.0.10"; - sha256 = "0ngpk6zkpnc9hl9a46pgkc8ii4d7y06xci52birc5vy1a2fwl8is"; + version = "1.0.11"; + sha256 = "0ppzf9551a9rqdjmx4ak7cq58n53z7p3k82g28mqmagzrjvirqdc"; libraryHaskellDepends = [ base transformers @@ -453026,21 +454218,24 @@ self: { containers, gigaparsec, hspec, + text, }: mkDerivation { pname = "mmzk-env"; - version = "0.1.1.1"; - sha256 = "02bcv8767bjrbbhnl89kcl63b7c9ajadickd84sr93xxdhjx0jfk"; + version = "0.1.2.0"; + sha256 = "1midm7qq8n4kpp2dhpfa7bzgp9fbhx76325yxx73slkmlgppvc2r"; libraryHaskellDepends = [ base containers gigaparsec + text ]; testHaskellDepends = [ base containers gigaparsec hspec + text ]; description = "Read environment variables into a user-defined data type"; license = lib.licensesSpdx."MIT"; @@ -458294,6 +459489,81 @@ self: { } ) { }; + monatone = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + binary, + bytestring, + containers, + deepseq, + directory, + file-io, + filepath, + mtl, + process, + QuickCheck, + tasty, + tasty-hunit, + tasty-quickcheck, + temporary, + text, + unordered-containers, + }: + mkDerivation { + pname = "monatone"; + version = "0.1.0.0"; + sha256 = "1i4fk1x40x2zmkpyfmps1jnjbzvamhxg97a6a1vpfwjd2hca32w1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + binary + bytestring + containers + deepseq + directory + file-io + filepath + mtl + text + unordered-containers + ]; + executableHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + filepath + mtl + text + ]; + testHaskellDepends = [ + base + bytestring + containers + directory + filepath + mtl + process + QuickCheck + tasty + tasty-hunit + tasty-quickcheck + temporary + text + ]; + description = "Pure Haskell library for audio metadata parsing and writing"; + license = lib.licensesSpdx."GPL-3.0-only"; + mainProgram = "monatone"; + } + ) { }; + mondo = callPackage ( { mkDerivation, @@ -471939,8 +473209,8 @@ self: { }: mkDerivation { pname = "nanopass"; - version = "0.0.3.0"; - sha256 = "18fj3gwqvs2vyqgp6sv4h0hbp7jrwr7ik7kvgv9przbjk24caqsc"; + version = "0.0.3.1"; + sha256 = "0rjxfmh3a2rcfi21gcmjkv34mvhv7rdmncajynnxwjqvkxyc6m1y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -477223,6 +478493,30 @@ self: { } ) { }; + network-run_0_5_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + network, + time-manager, + }: + mkDerivation { + pname = "network-run"; + version = "0.5.0"; + sha256 = "0y6wrg1cfl9yi68s6nkyv9dzxficnls73ksqr3a7w7h5jlz68p6y"; + libraryHaskellDepends = [ + base + bytestring + network + time-manager + ]; + description = "Simple network runner library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + network-server = callPackage ( { mkDerivation, @@ -478063,8 +479357,8 @@ self: { }: mkDerivation { pname = "network-uri-template"; - version = "0.1.1.1"; - sha256 = "0giq6cgdyk4f2bwggiab771pajcpp3vzp6mqfd65qzs2b4cwkjg7"; + version = "0.1.1.4"; + sha256 = "0bvjjjmv4338jib5gw83qwjk3m1hkiaqjg06dj7gmvnyaag60jfy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -478092,7 +479386,7 @@ self: { text ]; testToolDepends = [ markdown-unlit ]; - description = "TODO"; + description = "Library for parsing and expanding URI Templates, as per RFC 6570"; license = lib.licenses.agpl3Only; mainProgram = "network-uri-template"; } @@ -481870,7 +483164,7 @@ self: { } ) { }; - no-recursion_0_2_0_0 = callPackage ( + no-recursion_0_3_0_0 = callPackage ( { mkDerivation, base, @@ -481881,8 +483175,8 @@ self: { }: mkDerivation { pname = "no-recursion"; - version = "0.2.0.0"; - sha256 = "1bgglxzgxbqlxbx2li0kr8nxp22rk5r2rvnk90ym35xi58iz8r3p"; + version = "0.3.0.0"; + sha256 = "01g5gg2jrq5p8frq722z4a60j8s69kgb2shz3rvvcm4da91v62l9"; setupHaskellDepends = [ base Cabal @@ -481897,7 +483191,7 @@ self: { doctest ]; description = "A GHC plugin to remove support for recursion"; - license = lib.licensesSpdx."AGPL-3.0-or-later"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sellout ]; } @@ -484965,8 +486259,8 @@ self: { }: mkDerivation { pname = "nthese"; - version = "0.1.0.0"; - sha256 = "1iab7w8nj0zs7s5a2cpvyrw4jfp1kbh0824m90mb3w82qa8rsgys"; + version = "0.1.0.1"; + sha256 = "1nf668pxflwh9rbrik6qqr6s4kci3i31735qz7pc2cqmi04wxzd3"; libraryHaskellDepends = [ base semialign @@ -488893,7 +490187,7 @@ self: { } ) { }; - ogma-cli_1_10_0 = callPackage ( + ogma-cli_1_11_0 = callPackage ( { mkDerivation, aeson, @@ -488910,8 +490204,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.10.0"; - sha256 = "1fli4xhdrzbzkwjidz5piif4hs0zscw4rs6z30d9gb2zf4kl5h4z"; + version = "1.11.0"; + sha256 = "0ba5y46p8gi7vjl62791cjxly6ik00bfjbzma6z4n8irnf2frdzy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -489009,7 +490303,7 @@ self: { } ) { }; - ogma-core_1_10_0 = callPackage ( + ogma-core_1_11_0 = callPackage ( { mkDerivation, aeson, @@ -489041,8 +490335,8 @@ self: { }: mkDerivation { pname = "ogma-core"; - version = "1.10.0"; - sha256 = "010bdip18i0vkhkg2yp1yb4691przni612nwfjz8wrcdxgxvnpz0"; + version = "1.11.0"; + sha256 = "0bx7rjddwxwqacy3mw59502dc9jwy88s1mya4yn6mp9a1k62ha7g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -489122,7 +490416,7 @@ self: { } ) { }; - ogma-extra_1_10_0 = callPackage ( + ogma-extra_1_11_0 = callPackage ( { mkDerivation, aeson, @@ -489139,8 +490433,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.10.0"; - sha256 = "0y2jmqnw1nfai225nl9x37klwynrwl2yz1352zix709cc0spma8i"; + version = "1.11.0"; + sha256 = "1az9v4zrwwfwpnqhdqcnr1bhyx3zkx2m372sp90f4v5m3gmk64mp"; libraryHaskellDepends = [ aeson base @@ -489206,7 +490500,7 @@ self: { } ) { }; - ogma-language-c_1_10_0 = callPackage ( + ogma-language-c_1_11_0 = callPackage ( { mkDerivation, alex, @@ -489222,8 +490516,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.10.0"; - sha256 = "0gamqxl9ajw1fnywx9wkip86xh6b9pgc6l5f80lvkw486g1qp5qf"; + version = "1.11.0"; + sha256 = "0qh8v892bf25cs8csrc0sa4li172v20zr1qfpq4q8apb2hz71bpb"; setupHaskellDepends = [ base Cabal @@ -489301,12 +490595,12 @@ self: { } ) { }; - ogma-language-copilot_1_10_0 = callPackage ( + ogma-language-copilot_1_11_0 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.10.0"; - sha256 = "14zx4n9xqd36rn8s6akv5f2rlpvamlg4704n0c0yg2zs6n95zxlw"; + version = "1.11.0"; + sha256 = "1d26p8qrdpisxgjs3ij09qkvs61p6ik18r311w3lbm1z6ryi3ifm"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = lib.licenses.asl20; @@ -489343,7 +490637,7 @@ self: { } ) { }; - ogma-language-csv_1_10_0 = callPackage ( + ogma-language-csv_1_11_0 = callPackage ( { mkDerivation, base, @@ -489356,8 +490650,8 @@ self: { }: mkDerivation { pname = "ogma-language-csv"; - version = "1.10.0"; - sha256 = "0j8w9r1618lqv922mdadvhgfyqjhmbh84giz8jwlx7dmqzk28a88"; + version = "1.11.0"; + sha256 = "0ba1y8shyanj97zlxpxpl158p5r9fy4x31zzx9mjxq0fglyi7fbs"; libraryHaskellDepends = [ base bytestring @@ -489478,7 +490772,7 @@ self: { } ) { }; - ogma-language-jsonspec_1_10_0 = callPackage ( + ogma-language-jsonspec_1_11_0 = callPackage ( { mkDerivation, aeson, @@ -489492,8 +490786,8 @@ self: { }: mkDerivation { pname = "ogma-language-jsonspec"; - version = "1.10.0"; - sha256 = "1f9ha1jbg3pgyjhjwdf6xyiwsmca29pgpg0zk2gljmw9q7ry4b9i"; + version = "1.11.0"; + sha256 = "0mwph8zw0jdx4dvg4agd2jry9cjm2x96bbpacs8g5g49lp41bd3j"; libraryHaskellDepends = [ aeson base @@ -489553,7 +490847,7 @@ self: { } ) { }; - ogma-language-lustre_1_10_0 = callPackage ( + ogma-language-lustre_1_11_0 = callPackage ( { mkDerivation, alex, @@ -489569,8 +490863,8 @@ self: { }: mkDerivation { pname = "ogma-language-lustre"; - version = "1.10.0"; - sha256 = "12s58r5g9q9c4jmwck97w8ff6567ncyh1kclvw0mcqpgk09cpvk2"; + version = "1.11.0"; + sha256 = "03ckm7555snxrzs45n81h1rmma3ahc5m5rh9yarkwns34n8a20xg"; setupHaskellDepends = [ base Cabal @@ -489640,7 +490934,7 @@ self: { } ) { }; - ogma-language-smv_1_10_0 = callPackage ( + ogma-language-smv_1_11_0 = callPackage ( { mkDerivation, alex, @@ -489656,8 +490950,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.10.0"; - sha256 = "0cq0kdipn79wvhpfx51w52c78djki7dn7c12dl93w585r6f0spzp"; + version = "1.11.0"; + sha256 = "02zks4b679j4mjf624sf3kn2b4s9dfqiymkl9c8jhrimxvh20g49"; setupHaskellDepends = [ base Cabal @@ -489709,7 +491003,7 @@ self: { } ) { }; - ogma-language-xlsx_1_10_0 = callPackage ( + ogma-language-xlsx_1_11_0 = callPackage ( { mkDerivation, base, @@ -489720,8 +491014,8 @@ self: { }: mkDerivation { pname = "ogma-language-xlsx"; - version = "1.10.0"; - sha256 = "0n9i60kdm8blazgpq2swsdnpjryig6w7kykb9gws7hhlg5m16vkx"; + version = "1.11.0"; + sha256 = "0i8k5baqcl9gfqkzxg3pydr3gji6n1530zf7w2rfzwzda13mi7n1"; libraryHaskellDepends = [ base bytestring @@ -489764,7 +491058,7 @@ self: { } ) { }; - ogma-language-xmlspec_1_10_0 = callPackage ( + ogma-language-xmlspec_1_11_0 = callPackage ( { mkDerivation, base, @@ -489777,8 +491071,8 @@ self: { }: mkDerivation { pname = "ogma-language-xmlspec"; - version = "1.10.0"; - sha256 = "091b8gp7z0hnmcfzx5id3sybp87598zzhbhjw1nmhkszphyd2y7z"; + version = "1.11.0"; + sha256 = "0d9mqz7g996d0gn13l93fy3spvqqld35hllc6haimzm4pahyq7ai"; libraryHaskellDepends = [ base hxt @@ -489806,12 +491100,12 @@ self: { } ) { }; - ogma-spec_1_10_0 = callPackage ( + ogma-spec_1_11_0 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "ogma-spec"; - version = "1.10.0"; - sha256 = "078npma0dkqlhwiqw75s9q6k3c4h2m6g4v1wpxgj1n9laz4bf1nn"; + version = "1.11.0"; + sha256 = "0wdhb4n9ngrxy5b8s89ms1m72ykp36vldslm8w66181icinn96d9"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; license = lib.licenses.asl20; @@ -495825,7 +497119,7 @@ self: { } ) { }; - opt-env-conf_0_11_1_0 = callPackage ( + opt-env-conf_0_13_0_0 = callPackage ( { mkDerivation, aeson, @@ -495846,11 +497140,12 @@ self: { text, validity, validity-containers, + validity-text, }: mkDerivation { pname = "opt-env-conf"; - version = "0.11.1.0"; - sha256 = "14ywdbmvi2zw7pixpmgcazmhg320zwiri8y9bajvhgmhfa82g3zg"; + version = "0.13.0.0"; + sha256 = "0s7g5h3z0if85pgxcm1dshyqhnsrvjvfwgdf65jyhdhmnlkxws4a"; libraryHaskellDepends = [ aeson autodocodec @@ -495870,6 +497165,7 @@ self: { text validity validity-containers + validity-text ]; description = "Settings parsing for Haskell: command-line arguments, environment variables, and configuration values"; license = lib.licenses.lgpl3Only; @@ -498783,6 +500079,56 @@ self: { } ) { }; + os-string-compat = callPackage ( + { + mkDerivation, + base, + bytestring, + deepseq, + exceptions, + filepath, + os-string, + QuickCheck, + quickcheck-classes-base, + random, + tasty-bench, + }: + mkDerivation { + pname = "os-string-compat"; + version = "1.0.1"; + sha256 = "1kmjh2sqqp97iq7bnxa706daap87pczvcvz7gvm1ihydgv4lpk49"; + libraryHaskellDepends = [ + base + bytestring + exceptions + filepath + os-string + ]; + testHaskellDepends = [ + base + bytestring + deepseq + exceptions + filepath + os-string + QuickCheck + quickcheck-classes-base + ]; + benchmarkHaskellDepends = [ + base + bytestring + deepseq + exceptions + filepath + os-string + random + tasty-bench + ]; + description = "Compatibility layer for os-string"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + osc = callPackage ( { mkDerivation, @@ -502642,6 +503988,7 @@ self: { blaze-html, blaze-markup, containers, + ghc-lib-parser, ghc-syntax-highlighter, HaTeX, optics-core, @@ -502655,8 +504002,8 @@ self: { }: mkDerivation { pname = "pandoc-filter-indent"; - version = "0.3.2.0"; - sha256 = "0nhv38vpkjsy6fbidrfwh8n2pzs4ipb8l4dq9is0rjb36fahjmvg"; + version = "0.3.3.1"; + sha256 = "148zy51bxzlw20x6rqfbz93fb6y9abrnfc40nhg2rb56szyy43fb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -502689,6 +504036,7 @@ self: { base blaze-html blaze-markup + ghc-lib-parser ghc-syntax-highlighter HaTeX optics-core @@ -517571,8 +518919,8 @@ self: { }: mkDerivation { pname = "phino"; - version = "0.0.0.48"; - sha256 = "06815l05m9x99nvq2sdzigxy7s0ll1dbh0r8argj9rcffdvz10hy"; + version = "0.0.0.49"; + sha256 = "076wv0s4hsqfhqsk1syn4gxbn99ad35a2iqavvjn9k51xs0hgad1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -531075,8 +532423,8 @@ self: { }: mkDerivation { pname = "poolboy"; - version = "0.4.1.0"; - sha256 = "0xzk9ibildpv90hzn6h5c82wl2aqn8j18628ld27pddw3xq7aq08"; + version = "0.5.0.0"; + sha256 = "1dfslmjs047g2xmpvryaa9gic6d7nqidk38kvs4bpqgg1rhwqq4k"; libraryHaskellDepends = [ base unliftio @@ -553406,8 +554754,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.2.20"; - sha256 = "1kam5r9i9zvq3z1nandz38jm1nr8npghxpqrav3mr28rbnlwmd3k"; + version = "0.2.21"; + sha256 = "118ds282flakcdadvybn35bvr02dz2iqwg5c1m6d0gj51mmkb054"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -565197,8 +566545,8 @@ self: { }: mkDerivation { pname = "reference-counting"; - version = "0.1.0.0"; - sha256 = "1q0nnm4x1nw6hzymzaxg6rvsd9nwqnmxwrwmwphfa37lz4mcn2lr"; + version = "0.2.0.0"; + sha256 = "1ak2pa30lidaf06nw06blsckq4q76wyfgn4il6k7w8bgs04rcpwv"; libraryHaskellDepends = [ atomic-counter base @@ -575670,8 +577018,8 @@ self: { }: mkDerivation { pname = "retry-effectful"; - version = "0.1.0.0"; - sha256 = "0d9ja583y6vi4i1mcbyr85k7ffcnrzb23axnpl7khmbgiybwr85w"; + version = "0.1.0.1"; + sha256 = "0amz3qp2w7fjjh4plmspha9zmbqqgdfmsf8w94rzb00alsqfc6lw"; libraryHaskellDepends = [ base effectful-core @@ -578147,92 +579495,6 @@ self: { ) { }; rio = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - deepseq, - directory, - exceptions, - filepath, - hashable, - hspec, - hspec-discover, - microlens, - microlens-mtl, - mtl, - primitive, - process, - QuickCheck, - text, - time, - typed-process, - unix, - unliftio, - unliftio-core, - unordered-containers, - vector, - }: - mkDerivation { - pname = "rio"; - version = "0.1.23.0"; - sha256 = "089bj6wqh872iy64ivk2wq9g4zb1748kj1wrgk2aa1j5pfbh1cic"; - libraryHaskellDepends = [ - base - bytestring - containers - deepseq - directory - exceptions - filepath - hashable - microlens - microlens-mtl - mtl - primitive - process - text - time - typed-process - unix - unliftio - unliftio-core - unordered-containers - vector - ]; - testHaskellDepends = [ - base - bytestring - containers - deepseq - directory - exceptions - filepath - hashable - hspec - microlens - microlens-mtl - mtl - primitive - process - QuickCheck - text - time - typed-process - unix - unliftio - unliftio-core - unordered-containers - vector - ]; - testToolDepends = [ hspec-discover ]; - description = "A standard library for Haskell"; - license = lib.licenses.mit; - } - ) { }; - - rio_0_1_24_0 = callPackage ( { mkDerivation, base, @@ -578315,7 +579577,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A standard library for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -582550,61 +583811,6 @@ self: { ) { }; rpmbuild-order = callPackage ( - { - mkDerivation, - base, - case-insensitive, - directory, - extra, - fgl, - filepath, - graphviz, - hspec, - regex-tdfa, - simple-cmd, - simple-cmd-args, - unix, - }: - mkDerivation { - pname = "rpmbuild-order"; - version = "0.4.12"; - sha256 = "16l3pxzqndjhnycpnn9jnxisp9mjdbyvglfpra1is07ssr0ckqn0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - case-insensitive - directory - extra - fgl - filepath - graphviz - regex-tdfa - simple-cmd - ]; - executableHaskellDepends = [ - base - extra - fgl - simple-cmd-args - ]; - testHaskellDepends = [ - base - directory - extra - hspec - simple-cmd - unix - ]; - description = "Sort RPM packages in dependency order"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "rpmbuild-order"; - broken = true; - } - ) { }; - - rpmbuild-order_0_4_13 = callPackage ( { mkDerivation, base, @@ -588794,7 +590000,7 @@ self: { } ) { }; - sbp_6_3_1 = callPackage ( + sbp_6_3_2 = callPackage ( { mkDerivation, aeson, @@ -588823,8 +590029,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.3.1"; - sha256 = "15cbyml31b0a2ky9lnkbg9whn0622wmqm3yvk3v8jy986cbnvzs3"; + version = "6.3.2"; + sha256 = "0fvdmflixagy971pv302aq9hfdjlphgvjymrnqkwndzjv2znldrh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -610640,6 +611846,61 @@ self: { } ) { }; + shelltestrunner_1_11 = callPackage ( + { + mkDerivation, + base, + cmdargs, + Diff, + directory, + filemanip, + filepath, + hspec, + hspec-contrib, + hspec-core, + HUnit, + parsec, + pretty-show, + process, + regex-tdfa, + safe, + test-framework, + test-framework-hunit, + utf8-string, + }: + mkDerivation { + pname = "shelltestrunner"; + version = "1.11"; + sha256 = "0ka1scq321dxdxqap2laph2c98s8323z2yd8zabl20v20a62yx5i"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + cmdargs + Diff + directory + filemanip + filepath + hspec + hspec-contrib + hspec-core + HUnit + parsec + pretty-show + process + regex-tdfa + safe + test-framework + test-framework-hunit + utf8-string + ]; + description = "Easy, repeatable testing of CLI programs/commands"; + license = lib.licensesSpdx."GPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; + mainProgram = "shelltest"; + } + ) { }; + shellwords = callPackage ( { mkDerivation, @@ -613913,6 +615174,71 @@ self: { } ) { }; + simple-expr_0_2_0_2 = callPackage ( + { + mkDerivation, + base, + combinatorial, + composition, + data-fix, + doctest, + graphite, + graphviz, + hashable, + mtl, + numhask, + Stream, + text, + unicode-show, + unordered-containers, + vector, + vector-sized, + }: + mkDerivation { + pname = "simple-expr"; + version = "0.2.0.2"; + sha256 = "0ffb0rg166r2ynxih7r3ssq28rpax77rhqi9w0dcgjnblacnw1sk"; + libraryHaskellDepends = [ + base + combinatorial + composition + data-fix + graphite + graphviz + hashable + mtl + numhask + Stream + text + unicode-show + unordered-containers + vector + vector-sized + ]; + testHaskellDepends = [ + base + combinatorial + composition + data-fix + doctest + graphite + graphviz + hashable + mtl + numhask + Stream + text + unicode-show + unordered-containers + vector + vector-sized + ]; + description = "Minimalistic toolkit for simple mathematical expression"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + simple-firewire = callPackage ( { mkDerivation, @@ -617427,9 +618753,12 @@ self: { mkDerivation, base, cmdargs, + containers, deepseq, dlist, + exceptions, lens, + mtl, parallel-io, regex-pcre, semigroups, @@ -617440,16 +618769,19 @@ self: { }: mkDerivation { pname = "sizes"; - version = "2.4.1"; - sha256 = "1hz9ix8rp6av2rknqra5y2wk26vs5mwzjzqa52ya30yk0jnq80m2"; + version = "2.4.2"; + sha256 = "1pwbsh4lcksf52d59d40q4fic56w0dwfqf5llwzxxd2q8nygr02y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs + containers deepseq dlist + exceptions lens + mtl parallel-io regex-pcre semigroups @@ -624822,10 +626154,10 @@ self: { base, bytestring, conduit, + crc32c, criterion, data-default, deepseq, - digest, mtl, optparse-applicative, random, @@ -624838,17 +626170,15 @@ self: { }: mkDerivation { pname = "snappy-c"; - version = "0.1.1"; - sha256 = "1ds454nvw5ps0aq51ld7hjml4096z1zc7m7nvf9dc3wi0awzy43f"; - revision = "2"; - editedCabalFile = "1awpkbyfg43zwrxp3w1kfg3zdqfdf5mlmrqkbwam43rs555nwvr3"; + version = "0.1.2"; + sha256 = "0y23af1c7gyi1ypf0wvw618iph4w1rfxsa1dq6z9f0l4kx52qps9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring + crc32c data-default - digest mtl ]; librarySystemDepends = [ snappy ]; @@ -682831,8 +684161,8 @@ self: { }: mkDerivation { pname = "time-manager"; - version = "0.2.3"; - sha256 = "1s387nka1nxii026ly4awrz74acs4ci141mh3mvsz4j47cyw7dzf"; + version = "0.2.4"; + sha256 = "0w5n3wd1pv1f1wrmr7rjv21847zxflxq7q3vy891ncd0qppf7hpv"; libraryHaskellDepends = [ auto-update base @@ -685828,7 +687158,7 @@ self: { } ) { }; - tls_2_1_12 = callPackage ( + tls_2_1_13 = callPackage ( { mkDerivation, asn1-encoding, @@ -685864,8 +687194,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.1.12"; - sha256 = "1lhv1c93qaj3mg5mdifjfzddcw6y5j0nzbyy22pqyad1j41lbm2g"; + version = "2.1.13"; + sha256 = "0d249apxcm39431vpjwamr145iz7i2q1fj4g89xg409hl3r2jadd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -686913,6 +688243,52 @@ self: { } ) { }; + todoist-sdk = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + dotenv, + hspec, + hspec-discover, + microlens, + random, + req, + text, + transformers, + }: + mkDerivation { + pname = "todoist-sdk"; + version = "0.1.2.1"; + sha256 = "1ygqzy17x3p1kcyc7ygl2ygm1psj5xvcdcgcalwdkhpbk5c53h9k"; + libraryHaskellDepends = [ + aeson + base + bytestring + microlens + req + text + transformers + ]; + testHaskellDepends = [ + aeson + base + bytestring + dotenv + hspec + hspec-discover + random + text + transformers + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Unofficial Haskell SDK for the Todoist REST API"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + todos = callPackage ( { mkDerivation, @@ -698266,6 +699642,25 @@ self: { } ) { }; + type-level-prng = callPackage ( + { + mkDerivation, + base, + defun-core, + }: + mkDerivation { + pname = "type-level-prng"; + version = "0.1.0"; + sha256 = "0yakpbslwd8lh59595ck7r8xlrcz47gihwf93626151f1w1gq60s"; + libraryHaskellDepends = [ + base + defun-core + ]; + description = "Type level pseudorandom number generators"; + license = lib.licenses.mit; + } + ) { }; + type-level-sets = callPackage ( { mkDerivation, @@ -705799,6 +707194,26 @@ self: { } ) { }; + units-list = callPackage ( + { + mkDerivation, + base, + semigroupoids, + }: + mkDerivation { + pname = "units-list"; + version = "0.2.0.0"; + sha256 = "0kdi0j2s4ix3l8gwaxlzygxxq9q19hjk461p50gkv6pazydkfzjc"; + libraryHaskellDepends = [ + base + semigroupoids + ]; + testHaskellDepends = [ base ]; + description = "Extensible typed Dimensions"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + units-parser = callPackage ( { mkDerivation, @@ -709047,54 +710462,63 @@ self: { uri-templater = callPackage ( { mkDerivation, - ansi-wl-pprint, base, bytestring, - charset, containers, + cookie, dlist, - HTTP, + doctest, + flatparse, + http-api-data, + http-types, HUnit, mtl, - parsers, + prettyprinter, + prettyprinter-ansi-terminal, + tagged, template-haskell, text, time, - trifecta, + time-compat, unordered-containers, uuid-types, vector, }: mkDerivation { pname = "uri-templater"; - version = "0.3.1.0"; - sha256 = "1hj93jgn8xch9bw9fs76qsfqarb15csfy0ddnr1dxcq04vznbri1"; - revision = "2"; - editedCabalFile = "1fc0agzm3qasslhns64qbyhml31s1akib0mfaj2298iqm8075jyg"; + version = "1.0.0.1"; + sha256 = "12g2h83d1cklfr5gvag2523jrk995w0yl75bgn2sq6l85j11pcqc"; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring - charset containers + cookie dlist - HTTP + flatparse + http-api-data + http-types mtl - parsers + prettyprinter + prettyprinter-ansi-terminal + tagged template-haskell text time - trifecta + time-compat unordered-containers uuid-types vector ]; testHaskellDepends = [ - ansi-wl-pprint base + doctest + http-api-data HUnit mtl + prettyprinter template-haskell + text + vector ]; description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; license = lib.licenses.mit; @@ -718668,6 +720092,30 @@ self: { } ) { }; + vty-crossplatform_0_5_0_0 = callPackage ( + { + mkDerivation, + base, + vty, + vty-unix, + }: + mkDerivation { + pname = "vty-crossplatform"; + version = "0.5.0.0"; + sha256 = "0dikbxs6ykkwxzy9bjaarl9gqlnyg8s5gnp276072bw0d4f6z4rs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + vty + vty-unix + ]; + description = "Cross-platform support for Vty"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + vty-examples = callPackage ( { mkDerivation, @@ -724755,6 +726203,141 @@ self: { } ) { }; + warp_3_4_10 = callPackage ( + { + mkDerivation, + array, + async, + auto-update, + base, + bsb-http-chunked, + bytestring, + case-insensitive, + containers, + criterion, + crypton-x509, + directory, + ghc-prim, + hashable, + hspec, + hspec-discover, + http-client, + http-date, + http-types, + http2, + iproute, + network, + process, + QuickCheck, + recv, + simple-sendfile, + stm, + streaming-commons, + text, + time-manager, + unix, + vault, + wai, + word8, + }: + mkDerivation { + pname = "warp"; + version = "3.4.10"; + sha256 = "1w08v8wgagfmvc2aqy0w5cs6778z7d39xf9zkcc3cyr2la6bz1dj"; + revision = "1"; + editedCabalFile = "0328b9azvwffdgxim117p9gnjpkdxzd5sda0dci33g15aksgiixw"; + libraryHaskellDepends = [ + array + async + auto-update + base + bsb-http-chunked + bytestring + case-insensitive + containers + crypton-x509 + ghc-prim + hashable + http-date + http-types + http2 + iproute + network + recv + simple-sendfile + stm + streaming-commons + text + time-manager + unix + vault + wai + word8 + ]; + testHaskellDepends = [ + array + async + auto-update + base + bsb-http-chunked + bytestring + case-insensitive + containers + crypton-x509 + directory + ghc-prim + hashable + hspec + http-client + http-date + http-types + http2 + iproute + network + process + QuickCheck + recv + simple-sendfile + stm + streaming-commons + text + time-manager + unix + vault + wai + word8 + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array + auto-update + base + bytestring + case-insensitive + containers + criterion + crypton-x509 + ghc-prim + hashable + http-date + http-types + network + recv + streaming-commons + text + time-manager + unix + vault + wai + word8 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.alexfmpe ]; + } + ) { }; + warp-dynamic = callPackage ( { mkDerivation, @@ -727322,6 +728905,47 @@ self: { } ) { }; + web3-tools = callPackage ( + { + mkDerivation, + base, + base16-bytestring, + bytestring, + crypton, + hspec, + hspec-discover, + memory, + QuickCheck, + secp256k1-haskell, + }: + mkDerivation { + pname = "web3-tools"; + version = "0.1.0.0"; + sha256 = "0yvw66v1k6xh2mrh32q38pn7syh3c2q69d60r0hszyy53mrhq8zv"; + libraryHaskellDepends = [ + base + bytestring + crypton + memory + secp256k1-haskell + ]; + testHaskellDepends = [ + base + base16-bytestring + bytestring + crypton + hspec + hspec-discover + memory + QuickCheck + secp256k1-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Tools for working with Crypto/Web3"; + license = lib.licenses.mit; + } + ) { }; + webapi = callPackage ( { mkDerivation, @@ -730785,7 +732409,7 @@ self: { } ) { }; - what4_1_7_1_0 = callPackage ( + what4_1_7_2 = callPackage ( { mkDerivation, async, @@ -730847,8 +732471,8 @@ self: { }: mkDerivation { pname = "what4"; - version = "1.7.1.0"; - sha256 = "0hd4f38ydk337m5cwx0gfja1qv05j30w529iakv97jgbrdsnfcsj"; + version = "1.7.2"; + sha256 = "0mb9r3mzh3zmd8bs0d9km42xnqcxx2cbn8wmavbpklb9vmv6g3wi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -731105,6 +732729,41 @@ self: { } ) { }; + which-embed = callPackage ( + { + mkDerivation, + base, + bytestring, + directory, + exceptions, + file-embed, + path, + path-io, + template-haskell, + unix, + which, + }: + mkDerivation { + pname = "which-embed"; + version = "0.1.0"; + sha256 = "1glzxask1lljz77dmz718zaplpcp5srzw6fjh8v7cdqgh8rj0dvv"; + libraryHaskellDepends = [ + base + bytestring + directory + exceptions + file-embed + path + path-io + template-haskell + unix + which + ]; + description = "which-embed"; + license = lib.licensesSpdx."Apache-2.0"; + } + ) { }; + while-lang-parser = callPackage ( { mkDerivation, @@ -743139,6 +744798,231 @@ self: { } ) { }; + yaftee = callPackage ( + { + mkDerivation, + base, + ftcqueue, + higher-order-freer-monad, + higher-order-open-union, + }: + mkDerivation { + pname = "yaftee"; + version = "0.1.0.0"; + sha256 = "1ibxrl4d7dacvs1lsw5shngvw9l2v5h0kp12llypvxg56gg9dxdx"; + libraryHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + ]; + testHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + ]; + description = "Yet Another heFTy-inspired Extensible Effect"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + yaftee-basic-monads = callPackage ( + { + mkDerivation, + base, + ftcqueue, + higher-order-freer-monad, + higher-order-open-union, + yaftee, + }: + mkDerivation { + pname = "yaftee-basic-monads"; + version = "0.1.0.0"; + sha256 = "01idl3k293x0bccr8xx7p56j33004rjc9fr5h9may4lss9nhrvxv"; + libraryHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + yaftee + ]; + testHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + yaftee + ]; + description = "Basic monads implemented on Yaftee"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + yaftee-conduit = callPackage ( + { + mkDerivation, + base, + ftcqueue, + higher-order-freer-monad, + higher-order-open-union, + yaftee, + yaftee-basic-monads, + }: + mkDerivation { + pname = "yaftee-conduit"; + version = "0.1.0.0"; + sha256 = "1rhq31ybi0gjqk8h6jplm1fkchdibm60axq0nqa3j6y8iiyndncr"; + libraryHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + yaftee + yaftee-basic-monads + ]; + testHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + yaftee + yaftee-basic-monads + ]; + description = "Conduit implemented on Yaftee"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + yaftee-conduit-bytestring = callPackage ( + { + mkDerivation, + array, + base, + bitarray-bs, + bytestring, + higher-order-freer-monad, + higher-order-open-union, + tools-yj, + typelevel-tools-yj, + yaftee, + yaftee-basic-monads, + yaftee-conduit, + }: + mkDerivation { + pname = "yaftee-conduit-bytestring"; + version = "0.1.0.1"; + sha256 = "0zrbhpaslwjs9y23r4g7mllfpjp5fsx6rrvxm80vwkwr5qp2n99i"; + libraryHaskellDepends = [ + array + base + bitarray-bs + bytestring + higher-order-freer-monad + higher-order-open-union + tools-yj + typelevel-tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + testHaskellDepends = [ + array + base + bitarray-bs + bytestring + higher-order-freer-monad + higher-order-open-union + tools-yj + typelevel-tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + description = "Yaftee Conduit tools for ByteString"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + yaftee-conduit-bytestring-ft = callPackage ( + { + mkDerivation, + base, + bytestring-ft, + higher-order-open-union, + tools-yj, + typelevel-tools-yj, + yaftee, + yaftee-basic-monads, + yaftee-conduit, + }: + mkDerivation { + pname = "yaftee-conduit-bytestring-ft"; + version = "0.1.0.0"; + sha256 = "0k2dzyc2zhlndh1drfl6vx5plkciyh1n77jc44zqxpzkfdvl11nf"; + libraryHaskellDepends = [ + base + bytestring-ft + higher-order-open-union + tools-yj + typelevel-tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + testHaskellDepends = [ + base + bytestring-ft + higher-order-open-union + tools-yj + typelevel-tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + description = "Finger tree-based byte string tools for Yaftee Conduit"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + yaftee-conduit-mono-traversable = callPackage ( + { + mkDerivation, + base, + higher-order-open-union, + mono-traversable, + tools-yj, + yaftee, + yaftee-basic-monads, + yaftee-conduit, + }: + mkDerivation { + pname = "yaftee-conduit-mono-traversable"; + version = "0.1.0.0"; + sha256 = "0q6kx82cpr4wp1b5hk8igqy15y30cg0xf1wwxnxjs67kn81c717q"; + libraryHaskellDepends = [ + base + higher-order-open-union + mono-traversable + tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + testHaskellDepends = [ + base + higher-order-open-union + mono-traversable + tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + description = "Mono traversable tools for Yaftee Conduit"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + yahoo-finance-api = callPackage ( { mkDerivation, @@ -756633,6 +758517,43 @@ self: { } ) { }; + zlib-core = callPackage ( + { + mkDerivation, + base, + c-enum, + c-struct, + exception-hierarchy, + primitive, + tools-yj, + zlib, + }: + mkDerivation { + pname = "zlib-core"; + version = "0.1.0.1"; + sha256 = "0qln41mdh2734ir0d3kz8gg5x7nd8db0wmn6jvqz0cd8z2632a88"; + libraryHaskellDepends = [ + base + c-enum + c-struct + exception-hierarchy + primitive + tools-yj + ]; + libraryPkgconfigDepends = [ zlib ]; + testHaskellDepends = [ + base + c-enum + c-struct + exception-hierarchy + primitive + tools-yj + ]; + description = "Thin wrapper for zlib"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { inherit (pkgs) zlib; }; + zlib-enum = callPackage ( { mkDerivation, @@ -756686,6 +758607,53 @@ self: { } ) { }; + zlib-yaftee = callPackage ( + { + mkDerivation, + base, + bytestring, + bytestring-ft, + higher-order-open-union, + primitive, + tools-yj, + yaftee, + yaftee-basic-monads, + yaftee-conduit, + zlib-core, + }: + mkDerivation { + pname = "zlib-yaftee"; + version = "0.1.0.0"; + sha256 = "04c1cgn7mch14n3d7v1jsylnqspd01zi591xxjwx5jphg71k5n35"; + libraryHaskellDepends = [ + base + bytestring + bytestring-ft + higher-order-open-union + primitive + tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + zlib-core + ]; + testHaskellDepends = [ + base + bytestring + bytestring-ft + higher-order-open-union + primitive + tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + zlib-core + ]; + description = "Zlib wrapper built on Yaftee"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + zm = callPackage ( { mkDerivation, From 69543514c07da77e8de88d88009254ea206452cc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 24 Nov 2025 18:06:46 +0100 Subject: [PATCH 160/542] haskellPackages: run unbreak.nu created by running maintainers/scripts/haskell/unbreak.nu --- .../configuration-hackage2nix/broken.yaml | 15 ------ .../transitive-broken.yaml | 21 +------- .../haskell-modules/hackage-packages.nix | 51 +------------------ 3 files changed, 2 insertions(+), 85 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1bab28281090..a7a8d2a37cab 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -16,7 +16,6 @@ broken-packages: - AC-BuildPlatform # failure in job https://hydra.nixos.org/build/233219130 at 2023-09-02 - AC-EasyRaster-GTK # failure in job https://hydra.nixos.org/build/233226232 at 2023-09-02 - AC-HalfInteger # failure in job https://hydra.nixos.org/build/233239266 at 2023-09-02 - - ac-library-hs # failure in job https://hydra.nixos.org/build/302800699 at 2025-07-27 - ac-machine # failure in job https://hydra.nixos.org/build/233253535 at 2023-09-02 - AC-MiniTest # failure in job https://hydra.nixos.org/build/233216015 at 2023-09-02 - AC-Terminal # failure in job https://hydra.nixos.org/build/233192747 at 2023-09-02 @@ -504,7 +503,6 @@ broken-packages: - bits-show # failure in job https://hydra.nixos.org/build/252714912 at 2024-03-16 - bitset # failure in job https://hydra.nixos.org/build/233218622 at 2023-09-02 - bitspeak # failure in job https://hydra.nixos.org/build/233219582 at 2023-09-02 - - bitstream # failure in job https://hydra.nixos.org/build/233240888 at 2023-09-02 - BitStringRandomMonad # failure in job https://hydra.nixos.org/build/233203519 at 2023-09-02 - BitSyntax # failure in job https://hydra.nixos.org/build/233211551 at 2023-09-02 - bitx-bitcoin # failure in job https://hydra.nixos.org/build/233215594 at 2023-09-02 @@ -725,7 +723,6 @@ broken-packages: - carte # failure in job https://hydra.nixos.org/build/233201806 at 2023-09-02 - Cartesian # failure in job https://hydra.nixos.org/build/233249956 at 2023-09-02 - cas-hashable # failure in job https://hydra.nixos.org/build/233238789 at 2023-09-02 - - casa-abbreviations-and-acronyms # failure in job https://hydra.nixos.org/build/233194663 at 2023-09-02 - casadi-bindings-core # failure in job https://hydra.nixos.org/build/294582281 at 2025-04-09 - Cascade # failure in job https://hydra.nixos.org/build/233223917 at 2023-09-02 - cascading # failure in job https://hydra.nixos.org/build/233238563 at 2023-09-02 @@ -1094,7 +1091,6 @@ broken-packages: - cozo-hs # failure in job https://hydra.nixos.org/build/241432654 at 2023-11-19 - cparsing # failure in job https://hydra.nixos.org/build/233192377 at 2023-09-02 - cpio-conduit # failure in job https://hydra.nixos.org/build/233220518 at 2023-09-02 - - CPL # failure in job https://hydra.nixos.org/build/252731771 at 2024-03-16 - cplusplus-th # failure in job https://hydra.nixos.org/build/233204461 at 2023-09-02 - cpmonad # failure in job https://hydra.nixos.org/build/307517578 at 2025-09-19 - cps-except # failure in job https://hydra.nixos.org/build/252711064 at 2024-03-16 @@ -1124,7 +1120,6 @@ broken-packages: - crocodile # failure in job https://hydra.nixos.org/build/233222277 at 2023-09-02 - cronus # failure in job https://hydra.nixos.org/build/233225303 at 2023-09-02 - crucible-debug # failure in job https://hydra.nixos.org/build/307610411 at 2025-09-19 - - crucible-symio # failure in job https://hydra.nixos.org/build/307610404 at 2025-09-19 - cruncher-types # failure in job https://hydra.nixos.org/build/233229024 at 2023-09-02 - crunghc # failure in job https://hydra.nixos.org/build/233193295 at 2023-09-02 - crypt-sha512 # failure in job https://hydra.nixos.org/build/307517616 at 2025-09-19 @@ -1700,7 +1695,6 @@ broken-packages: - eved # failure in job https://hydra.nixos.org/build/233194319 at 2023-09-02 - event # failure in job https://hydra.nixos.org/build/233209756 at 2023-09-02 - event-driven # failure in job https://hydra.nixos.org/build/233233946 at 2023-09-02 - - eventlog-live-influxdb # failure in job https://hydra.nixos.org/build/311052040 at 2025-11-02 - eventloop # failure in job https://hydra.nixos.org/build/295093203 at 2025-04-22 - eventsource-api # failure in job https://hydra.nixos.org/build/233243220 at 2023-09-02 - eventsourced # failure in job https://hydra.nixos.org/build/233192731 at 2023-09-02 @@ -2181,7 +2175,6 @@ broken-packages: - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 - gi-ibus # failure in job https://hydra.nixos.org/build/233220272 at 2023-09-02 - gi-keybinder # failure in job https://hydra.nixos.org/build/265273447 at 2024-07-14 - - gi-notify # failure in job https://hydra.nixos.org/build/311052496 at 2025-11-02 - gi-webkit # failure in job https://hydra.nixos.org/build/307610609 at 2025-09-19 - gi-webkit2webextension # failure in job https://hydra.nixos.org/build/254424710 at 2024-03-31 - gi-webkitwebprocessextension # failure in job https://hydra.nixos.org/build/233227647 at 2023-09-02 @@ -2292,7 +2285,6 @@ broken-packages: - GPipe # failure in job https://hydra.nixos.org/build/233202480 at 2023-09-02 - GPipe-Core # failure in job https://hydra.nixos.org/build/233194426 at 2023-09-02 - gpmf # failure in job https://hydra.nixos.org/build/233245964 at 2023-09-02 - - gpu-vulkan-middle # failure in job https://hydra.nixos.org/build/311052831 at 2025-11-02 - gpx-conduit # failure in job https://hydra.nixos.org/build/233245487 at 2023-09-02 - grab # failure in job https://hydra.nixos.org/build/252727759 at 2024-03-16 - graceful # failure in job https://hydra.nixos.org/build/233199650 at 2023-09-02 @@ -4298,7 +4290,6 @@ broken-packages: - nested-sequence # failure in job https://hydra.nixos.org/build/233221359 at 2023-09-02 - NestedFunctor # failure in job https://hydra.nixos.org/build/233253656 at 2023-09-02 - nestedmap # failure in job https://hydra.nixos.org/build/233219375 at 2023-09-02 - - net-mqtt # failure in job https://hydra.nixos.org/build/307611123 at 2025-09-19 - net-spider # failure in job https://hydra.nixos.org/build/295095612 at 2025-04-22 - netclock # failure in job https://hydra.nixos.org/build/233207456 at 2023-09-02 - netease-fm # failure in job https://hydra.nixos.org/build/233210043 at 2023-09-02 @@ -5749,7 +5740,6 @@ broken-packages: - simple-pipe # failure in job https://hydra.nixos.org/build/233251483 at 2023-09-02 - simple-rope # failure in job https://hydra.nixos.org/build/233239446 at 2023-09-02 - simple-server # failure in job https://hydra.nixos.org/build/233242498 at 2023-09-02 - - simple-sql-parser # failure in job https://hydra.nixos.org/build/233203075 at 2023-09-02 - simple-stacked-vm # failure in job https://hydra.nixos.org/build/233206051 at 2023-09-02 - simple-tabular # failure in job https://hydra.nixos.org/build/233233368 at 2023-09-02 - simple-tar # failure in job https://hydra.nixos.org/build/233206675 at 2023-09-02 @@ -5877,7 +5867,6 @@ broken-packages: - snipcheck # failure in job https://hydra.nixos.org/build/233214417 at 2023-09-02 - snorkels # failure in job https://hydra.nixos.org/build/233229705 at 2023-09-02 - snowtify # failure in job https://hydra.nixos.org/build/233215099 at 2023-09-02 - - soap # failure in job https://hydra.nixos.org/build/295097136 at 2025-04-22 - socket-activation # failure in job https://hydra.nixos.org/build/233258011 at 2023-09-02 - socket-sctp # failure in job https://hydra.nixos.org/build/233228125 at 2023-09-02 - socketed # failure in job https://hydra.nixos.org/build/233210087 at 2023-09-02 @@ -5946,7 +5935,6 @@ broken-packages: - sqlcipher # failure in job https://hydra.nixos.org/build/233259217 at 2023-09-02 - sqlcli # failure in job https://hydra.nixos.org/build/252719841 at 2024-03-16 - sqlite # failure in job https://hydra.nixos.org/build/233215839 at 2023-09-02 - - sqlite-easy # failure in job https://hydra.nixos.org/build/309817187 at 2025-10-15 - sqlite-simple-errors # failure in job https://hydra.nixos.org/build/233232977 at 2023-09-02 - sqlvalue-list # failure in job https://hydra.nixos.org/build/233197313 at 2023-09-02 - sqsd-local # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237237046 at 2023-10-21 @@ -6090,7 +6078,6 @@ broken-packages: - stripe-core # failure in job https://hydra.nixos.org/build/233215702 at 2023-09-02 - stripe-hs # failure in job https://hydra.nixos.org/build/233203500 at 2023-09-02 - stripe-scotty # failure in job https://hydra.nixos.org/build/252711778 at 2024-03-16 - - strong-path # failure in job https://hydra.nixos.org/build/233225171 at 2023-09-02 - struct-inspector # failure in job https://hydra.nixos.org/build/252739623 at 2024-03-16 - structural-traversal # failure in job https://hydra.nixos.org/build/233235730 at 2023-09-02 - structured # failure in job https://hydra.nixos.org/build/307522227 at 2025-09-19 @@ -6229,7 +6216,6 @@ broken-packages: - taskell # depends on old version of brick - TaskMonad # failure in job https://hydra.nixos.org/build/233219257 at 2023-09-02 - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02 - - tasty-checklist # failure in job https://hydra.nixos.org/build/307522349 at 2025-09-19 - tasty-fail-fast # failure in job https://hydra.nixos.org/build/233200040 at 2023-09-02 - tasty-grading-system # failure in job https://hydra.nixos.org/build/236673021 at 2023-10-04 - tasty-hedgehog-coverage # failure in job https://hydra.nixos.org/build/233231332 at 2023-09-02 @@ -6410,7 +6396,6 @@ broken-packages: - timecalc # failure in job https://hydra.nixos.org/build/233207970 at 2023-09-02 - timemap # failure in job https://hydra.nixos.org/build/233250038 at 2023-09-02 - timeout # failure in job https://hydra.nixos.org/build/233193307 at 2023-09-02 - - timeout-snooze # failure in job https://hydra.nixos.org/build/309817674 at 2025-10-15 - timeout-with-results # failure in job https://hydra.nixos.org/build/233212129 at 2023-09-02 - timeparsers # failure in job https://hydra.nixos.org/build/233250789 at 2023-09-02 - TimePiece # failure in job https://hydra.nixos.org/build/233213400 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index b03d66e0fbe4..c717a0c1e27e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -53,7 +53,6 @@ dont-distribute-packages: - age - agentx - aip - - airgql - alg - algebra-checkers - algebra-driven-design @@ -74,7 +73,6 @@ dont-distribute-packages: - alto - amazon-emailer-client-snap - amby - - ampersand - analyze-client - anansi-hscolour - anatomy @@ -625,7 +623,6 @@ dont-distribute-packages: - crf-chain2-tiers - criu-rpc - cron-compat - - crucible-llvm - crux - crux-llvm - crypto-classical @@ -869,6 +866,7 @@ dont-distribute-packages: - error-message - errors-ext - ersatz-toysat + - ersatz-viz - esotericbot - EsounD - esqueleto-postgis @@ -1196,13 +1194,6 @@ dont-distribute-packages: - GPipe-TextureLoad - gps - gps2htmlReport - - gpu-vulkan - - gpu-vulkan-khr-surface - - gpu-vulkan-khr-surface-glfw - - gpu-vulkan-khr-swapchain - - gpu-vulkan-middle-khr-surface - - gpu-vulkan-middle-khr-surface-glfw - - gpu-vulkan-middle-khr-swapchain - GPX - grab-form - graflog @@ -1989,7 +1980,6 @@ dont-distribute-packages: - kubernetes-client - kure-your-boilerplate - kurita - - kvitable - laborantin-hs - labsat - labyrinth @@ -2400,7 +2390,6 @@ dont-distribute-packages: - nakadi-client - named-servant-client - named-servant-server - - named-text - nanq - NaperianNetCDF - national-australia-bank @@ -2412,8 +2401,6 @@ dont-distribute-packages: - nero-wai - nero-warp - nested-routes - - net-mqtt-lens - - net-mqtt-rpc - net-spider-cli - net-spider-pangraph - net-spider-rpl @@ -2795,7 +2782,6 @@ dont-distribute-packages: - puzzle-draw-cmdline - pvd - qd-vec - - qhs - qhull - qnap-decrypt - qr-repa @@ -3284,8 +3270,6 @@ dont-distribute-packages: - snowflake-server - snumber - Snusmumrik - - soap-openssl - - soap-tls - SoccerFun - SoccerFunGL - sock2stream @@ -3450,15 +3434,12 @@ dont-distribute-packages: - target - task - task-distribution - - tasklite - - tasklite-core - tasty-bdd - tasty-groundhog-converters - tasty-integrate - tasty-jenkins-xml - tasty-laws - tasty-lens - - tasty-sugar - TastyTLT - tateti-tateti - Taxonomy diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bd7fba9d2863..3cd1bdd99ae0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5442,9 +5442,7 @@ self: { ]; description = "An interpreter of Hagino's Categorical Programming Language (CPL)"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; mainProgram = "cpl"; - broken = true; } ) { }; @@ -49644,9 +49642,7 @@ self: { ]; description = "Data structures and algorithms"; license = lib.licensesSpdx."CC0-1.0"; - hydraPlatforms = lib.platforms.none; mainProgram = "example-lazy-segtree"; - broken = true; } ) { }; @@ -57735,7 +57731,6 @@ self: { ]; description = "Automatically generate a GraphQL API for an SQLite database"; license = lib.licensesSpdx."AGPL-3.0-or-later"; - hydraPlatforms = lib.platforms.none; mainProgram = "airgql"; } ) { }; @@ -75209,7 +75204,6 @@ self: { ]; description = "Toolsuite for automated design of business processes"; license = "GPL"; - hydraPlatforms = lib.platforms.none; mainProgram = "ampersand"; } ) { }; @@ -109028,8 +109022,6 @@ self: { ]; description = "Fast, packed, strict and lazy bit streams with stream fusion"; license = lib.licensesSpdx."CC0-1.0"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -131377,8 +131369,6 @@ self: { ]; description = "CASA Abbreviations and Acronyms"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -169223,7 +169213,6 @@ self: { ]; description = "Support for translating and executing LLVM code in Crucible"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -169290,8 +169279,6 @@ self: { ]; description = "An implementation of symbolic I/O primitives for Crucible"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -219222,6 +219209,7 @@ self: { ]; description = "draw circuit (DAG) for Ersatz.Bit"; license = lib.licensesSpdx."GPL-3.0-only"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -222188,9 +222176,7 @@ self: { ]; description = "Stream eventlog data into InfluxDB"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; mainProgram = "eventlog-live-influxdb"; - broken = true; } ) { }; @@ -267234,8 +267220,6 @@ self: { libraryPkgconfigDepends = [ libnotify ]; description = "Libnotify bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) libnotify; }; @@ -280838,7 +280822,6 @@ self: { ]; description = "Vulkan library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280966,7 +280949,6 @@ self: { ]; description = "VK_KHR_surface extension of the Vulkan API"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -281011,7 +280993,6 @@ self: { ]; description = "GLFW surface for Vulkan"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -281059,7 +281040,6 @@ self: { ]; description = "VK_KHR_swapchain extension of the Vulkan API"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -281144,8 +281124,6 @@ self: { ]; description = "Medium wrapper for Vulkan API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -281187,7 +281165,6 @@ self: { ]; description = "medium wrapper for VK_KHR_surface extension of the Vulkan API"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -281220,7 +281197,6 @@ self: { ]; description = "medium wrapper for GLFW surface for the Vulkan API"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -281268,7 +281244,6 @@ self: { ]; description = "medium wrapper for VK_KHR_swapchain extension of the Vulkan API"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -404510,7 +404485,6 @@ self: { ]; description = "Key/Value Indexed Table container and formatting library"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -471571,7 +471545,6 @@ self: { ]; description = "A parameterized named text type and associated functionality"; license = lib.licensesSpdx."ISC"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -474322,8 +474295,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -474358,7 +474329,6 @@ self: { ]; description = "Optics for net-mqtt"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -474406,7 +474376,6 @@ self: { ]; description = "Make RPC calls via an MQTT broker"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "mqtt-rpc"; } ) { }; @@ -551450,7 +551419,6 @@ self: { doHaddock = false; description = "Command line tool qhs, SQL queries on CSV and TSV files"; license = lib.licensesSpdx."MIT"; - hydraPlatforms = lib.platforms.none; mainProgram = "qhs"; } ) { }; @@ -614972,8 +614940,6 @@ self: { ]; description = "A parser for SQL"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -625715,8 +625681,6 @@ self: { ]; description = "SOAP client tools"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -625750,7 +625714,6 @@ self: { ]; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -625790,7 +625753,6 @@ self: { ]; description = "TLS-enabled SOAP transport (using tls package)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -632262,8 +632224,6 @@ self: { ]; description = "A primitive yet easy to use sqlite library"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -651358,8 +651318,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Strongly typed paths in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -665993,7 +665951,6 @@ self: { ]; description = "CLI task / todo list manager with SQLite backend"; license = lib.licensesSpdx."AGPL-3.0-or-later"; - hydraPlatforms = lib.platforms.none; mainProgram = "tasklite"; } ) { }; @@ -666131,7 +666088,6 @@ self: { ]; description = "CLI task / todo list manager with SQLite backend"; license = lib.licensesSpdx."AGPL-3.0-or-later"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -666586,8 +666542,6 @@ self: { ]; description = "Check multiple items during a tasty test"; license = lib.licensesSpdx."ISC"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -668180,7 +668134,6 @@ self: { doHaddock = false; description = "Tests defined by Search Using Golden Answer References"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -683700,8 +683653,6 @@ self: { ]; description = "Efficient timeout with reset"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; From 8780e5b41f89f4a9d910c6bfc35a2dc2c01bb288 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Oct 2025 02:05:59 +0200 Subject: [PATCH 161/542] haskellPackages: _ prefix attribute names that would need quoting In order not to break downstream expressions that (manually) introduced dependencies on now renamed attributes, add aliases (with proper warnings about the renames) for all attributes that were previously part of Nixpkgs, but have been renamed with this change. --- .../cabal2nix-unstable/cabal2nix.nix | 4 +- .../distribution-nixpkgs.nix | 4 +- .../cabal2nix-unstable/hackage-db.nix | 4 +- .../cabal2nix-unstable/language-nix.nix | 4 +- .../haskell-modules/configuration-nix.nix | 24 +++ .../haskell-modules/hackage-packages.nix | 140 ++++++++++++++++-- 6 files changed, 160 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix index 79a33626af3f..ebd8fa92ce90 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix @@ -37,8 +37,8 @@ mkDerivation { pname = "cabal2nix"; version = "2.20.1-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/be62a6c198c6fd082cd5660170fa23a709d92c8e.tar.gz"; - sha256 = "15bfhl0ypnnpgglxc7smppqi3w8w04zi97gh65kk1p6drlg29f47"; + url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz"; + sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix index aab109281ebf..81a23733d424 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix @@ -20,8 +20,8 @@ mkDerivation { pname = "distribution-nixpkgs"; version = "1.7.1.1-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/be62a6c198c6fd082cd5660170fa23a709d92c8e.tar.gz"; - sha256 = "15bfhl0ypnnpgglxc7smppqi3w8w04zi97gh65kk1p6drlg29f47"; + url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz"; + sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii"; }; postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot"; enableSeparateDataOutput = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix index f99b95e475c4..3554407b8faa 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix @@ -19,8 +19,8 @@ mkDerivation { pname = "hackage-db"; version = "2.1.3-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/be62a6c198c6fd082cd5660170fa23a709d92c8e.tar.gz"; - sha256 = "15bfhl0ypnnpgglxc7smppqi3w8w04zi97gh65kk1p6drlg29f47"; + url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz"; + sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii"; }; postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix index 2c863d4df1b7..503860f9737c 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix @@ -16,8 +16,8 @@ mkDerivation { pname = "language-nix"; version = "2.3.0-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/be62a6c198c6fd082cd5660170fa23a709d92c8e.tar.gz"; - sha256 = "15bfhl0ypnnpgglxc7smppqi3w8w04zi97gh65kk1p6drlg29f47"; + url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz"; + sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii"; }; postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index b9fde329d049..1ecbd972c5b8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -2122,3 +2122,27 @@ builtins.intersectAttrs super { botan-bindings = super.botan-bindings.override { botan = pkgs.botan3; }; } + +// lib.optionalAttrs pkgs.config.allowAliases ( + lib.genAttrs + [ + "2captcha" + "3d-graphics-example" + "3dmodels" + "4Blocks" + "assert" + "if" + ] + ( + old: + let + new = "_" + old; + in + { + name = old; + value = + lib.warnOnInstantiate "haskell.packages.*.${old} has been renamed to haskell.packages.*.${new}" + self.${new}; + } + ) +) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c7bf6dd5d6b6..62de256a0597 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8,7 +8,7 @@ self: { - "2captcha" = callPackage ( + _2captcha = callPackage ( { mkDerivation, aeson, @@ -49,7 +49,7 @@ self: { } ) { }; - "3d-graphics-examples" = callPackage ( + _3d-graphics-examples = callPackage ( { mkDerivation, base, @@ -76,7 +76,7 @@ self: { } ) { }; - "3dmodels" = callPackage ( + _3dmodels = callPackage ( { mkDerivation, attoparsec, @@ -103,7 +103,7 @@ self: { } ) { }; - "4Blocks" = callPackage ( + _4Blocks = callPackage ( { mkDerivation, base, @@ -7795,6 +7795,49 @@ self: { } ) { }; + ConcurrentUtils = callPackage ( + { + mkDerivation, + _assert, + array, + atl, + base, + containers, + extra, + list-extras, + monad-loops, + monads-tf, + parallel, + profunctors, + strict, + time, + vector, + }: + mkDerivation { + pname = "ConcurrentUtils"; + version = "0.5.0.0"; + sha256 = "1caixp7gdhjsnlr79kmc4pd4ky663x9kid9i998qrd6anbrm2i8b"; + libraryHaskellDepends = [ + _assert + array + atl + base + containers + extra + list-extras + monad-loops + monads-tf + parallel + profunctors + strict + time + vector + ]; + description = "Concurrent utilities"; + license = lib.licenses.gpl2Only; + } + ) { }; + Concurrential = callPackage ( { mkDerivation, @@ -85906,7 +85949,7 @@ self: { } ) { ghc-binary = null; }; - "assert" = callPackage ( + _assert = callPackage ( { mkDerivation, base, @@ -94713,10 +94756,8 @@ self: { ]; description = "Specify axioms for type classes and quickCheck all available instances"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } - ) { control-invariants = null; }; + ) { }; azimuth-hs = callPackage ( { @@ -161683,6 +161724,51 @@ self: { } ) { }; + control-invariants = callPackage ( + { + mkDerivation, + _assert, + base, + containers, + data-default, + deepseq, + either, + lens, + mtl, + QuickCheck, + semigroups, + template-haskell, + th-lift, + th-printf, + transformers, + }: + mkDerivation { + pname = "control-invariants"; + version = "0.1.0.0"; + sha256 = "0qfw2g04k3jd9dqj1m46rf9dz767y3lkny8pj4zp3mnr704wnwwr"; + revision = "1"; + editedCabalFile = "0f8px9rf0d6bz0hm52iw5v89ada7jgj5lydpsr6x542hbq953wz3"; + libraryHaskellDepends = [ + _assert + base + containers + data-default + deepseq + either + lens + mtl + QuickCheck + semigroups + template-haskell + th-lift + th-printf + transformers + ]; + description = "Invariants and contract monitoring"; + license = lib.licenses.mit; + } + ) { }; + control-iso = callPackage ( { mkDerivation, @@ -224705,10 +224791,8 @@ self: { ]; description = "Existential types with lens-like accessors"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } - ) { control-invariants = null; }; + ) { }; exists = callPackage ( { @@ -373614,7 +373698,7 @@ self: { } ) { }; - "if" = callPackage ( + _if = callPackage ( { mkDerivation, base }: mkDerivation { pname = "if"; @@ -697493,6 +697577,27 @@ self: { } ) { }; + _type = callPackage ( + { + mkDerivation, + base, + containers, + template-haskell, + }: + mkDerivation { + pname = "type"; + version = "0.2.0"; + sha256 = "13xkbj1nimgs9cm5mdqx52m1qzjgkzcxxjibqb1g8rmjgy17yj5m"; + libraryHaskellDepends = [ + base + containers + template-haskell + ]; + description = "Dynamic casting library with support for arbitrary rank type kinds"; + license = lib.licenses.bsd3; + } + ) { }; + type-aligned = callPackage ( { mkDerivation, base }: mkDerivation { @@ -732594,6 +732699,17 @@ self: { } ) { }; + _with = callPackage ( + { mkDerivation }: + mkDerivation { + pname = "with"; + version = "0.1.0"; + sha256 = "0jgm6w1xisyww81ak9rrrqmhgaiwdgk5rgvzax72rknzg9rb6701"; + description = "Simple open product type"; + license = lib.licenses.bsd3; + } + ) { }; + with-index = callPackage ( { mkDerivation, base }: mkDerivation { From 7b0c66ac22fedd265515ee0ef00392a23ed2e39a Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 24 Nov 2025 21:38:26 +0000 Subject: [PATCH 162/542] unbound: Add versionCheckHook --- pkgs/by-name/un/unbound/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 62657e2f4c36..eb283cc9005e 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -52,6 +52,7 @@ nix-update-script, # for passthru.tests gnutls, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -202,6 +203,12 @@ stdenv.mkDerivation (finalAttrs: { ) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'" ) (builtins.filter (p: p != null) finalAttrs.buildInputs); + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "-V"; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { extraArgs = [ @@ -220,6 +227,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; homepage = "https://www.unbound.net"; maintainers = with lib.maintainers; [ Scrumplex ]; + mainProgram = "unbound"; platforms = with lib.platforms; unix ++ windows; }; }) From 800206d7599dde3d1c7ffd922fc0156563a04b5b Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 24 Nov 2025 21:40:49 +0000 Subject: [PATCH 163/542] unbound: Add changelog --- pkgs/by-name/un/unbound/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index eb283cc9005e..0f90bc2958dc 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -226,6 +226,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Validating, recursive, and caching DNS resolver"; license = lib.licenses.bsd3; homepage = "https://www.unbound.net"; + changelog = "https://github.com/NLnetLabs/unbound/releases/tag/release-${finalAttrs.version}"; maintainers = with lib.maintainers; [ Scrumplex ]; mainProgram = "unbound"; platforms = with lib.platforms; unix ++ windows; From 57ad3ddfd98128f30abc14eac7b4479b77d7be6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Nov 2025 00:33:59 +0000 Subject: [PATCH 164/542] unixODBCDrivers.psql: 17.00.0006 -> 17.00.0007 --- pkgs/by-name/ps/psqlodbc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index 09543fac64c1..64428c0ba552 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -18,13 +18,13 @@ assert lib.xor withLibiodbc withUnixODBC; stdenv.mkDerivation (finalAttrs: { pname = "psqlodbc"; - version = "17.00.0006"; + version = "17.00.0007"; src = fetchFromGitHub { owner = "postgresql-interfaces"; repo = "psqlodbc"; tag = "REL-${lib.replaceString "." "_" finalAttrs.version}"; - hash = "sha256-iu1PWkfOyWtMmy7/8W+acu8v+e8nUPkCIHtVNZ8HzRg="; + hash = "sha256-KlAGA+oNV/jJpcDJNGzsq/n55QKhUwTwhfNJ6QL6Pas="; }; buildInputs = [ From 034ee0ed1c9ee82daf984dfbb52374c7fb1ce73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 Nov 2025 21:10:22 -0800 Subject: [PATCH 165/542] gpgmepp: init at 2.0.0 --- pkgs/by-name/gp/gpgmepp/package.nix | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/gp/gpgmepp/package.nix diff --git a/pkgs/by-name/gp/gpgmepp/package.nix b/pkgs/by-name/gp/gpgmepp/package.nix new file mode 100644 index 000000000000..217732a67240 --- /dev/null +++ b/pkgs/by-name/gp/gpgmepp/package.nix @@ -0,0 +1,42 @@ +{ + cmake, + fetchurl, + gpgme, + lib, + libgpg-error, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gpgmepp"; + version = "2.0.0"; + + src = fetchurl { + url = "mirror://gnupg/gpgmepp/gpgmepp-${finalAttrs.version}.tar.xz"; + hash = "sha256-1HlgScBnCKJvMJb3SO8JU0fho8HlcFYXAf6VLD9WU4I="; + }; + + postPatch = '' + substituteInPlace src/gpgmepp.pc.in \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + gpgme + libgpg-error + ]; + + meta = { + changelog = "https://dev.gnupg.org/source/gpgmepp/browse/master/NEWS;gpgmepp-${finalAttrs.version}?as=remarkup"; + description = "C++ bindings/wrapper for GPGME"; + homepage = "https://dev.gnupg.org/source/gpgmepp"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.dotlambda ]; + platforms = lib.platforms.unix; + }; +}) From feae9a142c999339804055fa558c7c3b8e30d4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 Nov 2025 21:05:39 -0800 Subject: [PATCH 166/542] qt6Packages.qgpgme: build from new repo --- pkgs/development/libraries/qgpgme/default.nix | 43 +++++++++++++++++++ pkgs/top-level/qt6-packages.nix | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qgpgme/default.nix diff --git a/pkgs/development/libraries/qgpgme/default.nix b/pkgs/development/libraries/qgpgme/default.nix new file mode 100644 index 000000000000..e8644c8ccb9e --- /dev/null +++ b/pkgs/development/libraries/qgpgme/default.nix @@ -0,0 +1,43 @@ +{ + cmake, + fetchurl, + gpgme, + gpgmepp, + lib, + libgpg-error, + qtbase, + stdenv, + which, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qgpgme"; + version = "2.0.0"; + + src = fetchurl { + url = "mirror://gnupg/qgpgme/qgpgme-${finalAttrs.version}.tar.xz"; + hash = "sha256-FWRbJHXMphGOsu0zGzqNlELJ1AGcOEa6P20lMhtKYa0="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + gpgme + gpgmepp + libgpg-error + qtbase + ]; + + dontWrapQtApps = true; + + meta = { + changelog = "https://dev.gnupg.org/source/gpgmeqt/browse/master/NEWS;gpgmeqt-${finalAttrs.version}?as=remarkup"; + description = "Qt API bindings/wrapper for GPGME"; + homepage = "https://dev.gnupg.org/source/gpgmeqt/"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.dotlambda ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 6aae3abf5efd..a2b08c9031b9 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -87,7 +87,7 @@ makeScopeWithSplicing' { }; qcoro = callPackage ../development/libraries/qcoro { }; qcustomplot = callPackage ../development/libraries/qcustomplot { }; - qgpgme = callPackage ../development/libraries/gpgme { }; + qgpgme = callPackage ../development/libraries/qgpgme { }; qhotkey = callPackage ../development/libraries/qhotkey { }; qmlbox2d = callPackage ../development/libraries/qmlbox2d { }; packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; From 22a797aed3e8efded65d2a1c8ed44973707c325a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 Nov 2025 21:41:53 -0800 Subject: [PATCH 167/542] libsForQt5.qgpgme: build from new repo --- pkgs/top-level/qt5-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index c70f900e794b..e677f73aa051 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -76,7 +76,7 @@ makeScopeWithSplicing' { futuresql = callPackage ../development/libraries/futuresql { }; - qgpgme = callPackage ../development/libraries/gpgme { }; + qgpgme = callPackage ../development/libraries/qgpgme { }; grantlee = callPackage ../development/libraries/grantlee/5 { }; From e892e1573fca6e9c443526c32ee61dba4423c5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 Nov 2025 21:47:29 -0800 Subject: [PATCH 168/542] gpgme: remove qgpgme-related code --- pkgs/development/libraries/gpgme/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 2b3c7d93d853..5d9ad94c4cc2 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -12,7 +12,6 @@ which, texinfo, buildPackages, - qtbase ? null, # only for passthru.tests libsForQt5, qt6Packages, @@ -54,8 +53,7 @@ stdenv.mkDerivation rec { libassuan libgpg-error pth - ] - ++ lib.optionals (qtbase != null) [ qtbase ]; + ]; nativeCheckInputs = [ which ]; @@ -75,11 +73,8 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gpg-test" ]; env.NIX_CFLAGS_COMPILE = toString ( - # qgpgme uses Q_ASSERT which retains build inputs at runtime unless - # debugging is disabled - lib.optional (qtbase != null) "-DQT_NO_DEBUG" # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html - ++ lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" + lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" ); enableParallelBuilding = true; @@ -101,8 +96,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - # fatal error: 'QtCore/qcompare.h' file not found - broken = qtbase != null && stdenv.hostPlatform.isDarwin; homepage = "https://gnupg.org/software/gpgme/index.html"; changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;f=NEWS;hb=gpgme-${version}"; description = "Library for making GnuPG easier to use"; From 2be13436c3eac0656a1dd74d777e3f2c3aabd2d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Nov 2025 01:34:13 +0000 Subject: [PATCH 169/542] wayland-protocols: 1.45 -> 1.46 --- pkgs/development/libraries/wayland/protocols.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 1e2e1aaa889d..93117b7e9872 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.45"; + version = "1.46"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-TSsqnj4JnQF9yBB78cM00nu4fZ5K/xmgyNhW0XzUHvA="; + hash = "sha256-/Q3gVqiV+ki9GqXwuN/u1FQQG4i8fhxhqVNCLrcdsWc="; }; postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' From 0aac596502af9edd4719b2f53a148ad662780264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Nov 2025 09:01:10 -0800 Subject: [PATCH 170/542] gpa: fix build with gpgme 2.0 --- pkgs/by-name/gp/gpa/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/gp/gpa/package.nix b/pkgs/by-name/gp/gpa/package.nix index 349d37ba3ac7..29ec915516d2 100644 --- a/pkgs/by-name/gp/gpa/package.nix +++ b/pkgs/by-name/gp/gpa/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, intltool, pkg-config, gtk3, @@ -19,6 +20,14 @@ stdenv.mkDerivation rec { hash = "sha256-Jqj6W/cFQct0Hwxxt8/ikbHqVuq2jusHqpYs71zfM8w="; }; + patches = [ + (fetchpatch { + name = "remove-trust_item-stuff-to-make-it-build-with-gpgme-2.x.patch"; + url = "https://dev.gnupg.org/rGPAb6ba8bcc6db7765667cd6c49b7edc9a2073bc74f?diff=1"; + hash = "sha256-A3Cx4zub3Um09yjZ1mu0PZe/v7rmhXjND0Hg5WkcIf8="; + }) + ]; + nativeBuildInputs = [ intltool pkg-config From 36e46c73aabd8014f85b583c9986c7542621044d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Nov 2025 09:11:41 -0800 Subject: [PATCH 171/542] gpgme: add gpa to passthru.tests --- pkgs/development/libraries/gpgme/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 5d9ad94c4cc2..649a636ae9f3 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -13,6 +13,7 @@ texinfo, buildPackages, # only for passthru.tests + gpa, libsForQt5, qt6Packages, python3, @@ -90,6 +91,7 @@ stdenv.mkDerivation rec { ]; passthru.tests = { + inherit gpa; python = python3.pkgs.gpgme; qt5 = libsForQt5.qgpgme; qt6 = qt6Packages.qgpgme; From 6fc82cbabec070129cedbc67b8f66f181c0d5dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Nov 2025 09:13:13 -0800 Subject: [PATCH 172/542] gpgme: move to pkgs/by-name --- pkgs/{development/libraries => by-name/gp}/gpgme/LFS64.patch | 0 .../gpgme/default.nix => by-name/gp/gpgme/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/libraries => by-name/gp}/gpgme/LFS64.patch (100%) rename pkgs/{development/libraries/gpgme/default.nix => by-name/gp/gpgme/package.nix} (100%) diff --git a/pkgs/development/libraries/gpgme/LFS64.patch b/pkgs/by-name/gp/gpgme/LFS64.patch similarity index 100% rename from pkgs/development/libraries/gpgme/LFS64.patch rename to pkgs/by-name/gp/gpgme/LFS64.patch diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/by-name/gp/gpgme/package.nix similarity index 100% rename from pkgs/development/libraries/gpgme/default.nix rename to pkgs/by-name/gp/gpgme/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecbf644f5d5d..cb741746e1e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7504,8 +7504,6 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - gpgme = callPackage ../development/libraries/gpgme { }; - grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; glib = callPackage ../by-name/gl/glib/package.nix ( From b6578352eb851a17fa4c460cd3fb0d02401a3221 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 30 Oct 2025 23:05:43 +0100 Subject: [PATCH 173/542] python312Packages: stop recursing into attrset --- 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 38b21a4a588a..a712057dffaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5808,7 +5808,7 @@ with pkgs; python27Packages = python27.pkgs; python310Packages = python310.pkgs; python311Packages = python311.pkgs; - python312Packages = recurseIntoAttrs python312.pkgs; + python312Packages = python312.pkgs; python313Packages = recurseIntoAttrs python313.pkgs; python314Packages = python314.pkgs; python315Packages = python315.pkgs; From fca641dfefb7bb994792bae7c7fd24d7eca9cfa6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 30 Oct 2025 23:11:54 +0100 Subject: [PATCH 174/542] python314Packages: recurse into attrs --- 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 a712057dffaf..281698e541d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5810,7 +5810,7 @@ with pkgs; python311Packages = python311.pkgs; python312Packages = python312.pkgs; python313Packages = recurseIntoAttrs python313.pkgs; - python314Packages = python314.pkgs; + python314Packages = recurseIntoAttrs python314.pkgs; python315Packages = python315.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; From 2f31ffad352e5799932b9da98b8d33b562f9573d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 02:09:18 +0100 Subject: [PATCH 175/542] python3Packages.gipc: 1.6.0 -> 1.8.0 https://github.com/jgehrcke/gipc/blob/1.8.0/CHANGELOG.rst --- pkgs/development/python-modules/gipc/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 0057cd455a36..d4ba25da84e5 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -4,29 +4,21 @@ fetchFromGitHub, gevent, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "gipc"; - version = "1.6.0"; + version = "1.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "jgehrcke"; repo = "gipc"; tag = version; - hash = "sha256-eYE7A1VDJ0NSshvdJKxPwGyVdW6BnyWoRSR1i1iTr8Y="; + hash = "sha256-P3soMA/EBMuhkXQsiLv9gnDBfo9XGosKnSMi+EZ0gaM="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "gevent>=1.5,<=23.9.1" "gevent>=1.5" - ''; - build-system = [ setuptools ]; dependencies = [ gevent ]; From 1690f975aec39462a28642a58142c2fcac98f50f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 14:11:12 +0100 Subject: [PATCH 176/542] python3Packages.html5lib: 1.1 -> 1.1-unstable-2024-02-21 Reenables the tests and backports a fix for Python 3.14 compat. --- .../python-modules/html5lib/default.nix | 39 ++++++++++--------- .../html5lib/python314-compat.patch | 26 +++++++++++++ 2 files changed, 46 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/html5lib/python314-compat.patch diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index fb6e80b44995..990ccacb4fbc 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -1,47 +1,48 @@ { lib, buildPythonPackage, - fetchPypi, - fetchpatch, + fetchFromGitHub, + setuptools, six, webencodings, - mock, pytest-expect, pytestCheckHook, + unstableGitUpdater, }: -buildPythonPackage rec { +buildPythonPackage { pname = "html5lib"; - version = "1.1"; - format = "setuptools"; + version = "1.1-unstable-2024-02-21"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"; + src = fetchFromGitHub { + owner = "html5lib"; + repo = "html5lib-python"; + rev = "fd4f032bc090d44fb11a84b352dad7cbee0a4745"; + hash = "sha256-Hyte1MEqlrD2enfunK1qtm3FJlUDqmhSyrCjo7VaBgA="; }; patches = [ - # Fix compatibility with pytest 6. - # Will be included in the next release after 1.1. - (fetchpatch { - url = "https://github.com/html5lib/html5lib-python/commit/2c19b9899ab3a3e8bd0ca35e5d78544334204169.patch"; - hash = "sha256-VGCeB6o2QO/skeCZs8XLPfgEYVOSRL8cCpG7ajbZWEs="; - }) + # https://github.com/html5lib/html5lib-python/pull/583 + ./python314-compat.patch ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six webencodings ]; - # latest release not compatible with pytest 6 - doCheck = false; nativeCheckInputs = [ - mock pytest-expect pytestCheckHook ]; + passthru.updateScript = unstableGitUpdater { + branch = "master"; + }; + meta = { homepage = "https://github.com/html5lib/html5lib-python"; downloadPage = "https://github.com/html5lib/html5lib-python/releases"; diff --git a/pkgs/development/python-modules/html5lib/python314-compat.patch b/pkgs/development/python-modules/html5lib/python314-compat.patch new file mode 100644 index 000000000000..5351032f1232 --- /dev/null +++ b/pkgs/development/python-modules/html5lib/python314-compat.patch @@ -0,0 +1,26 @@ +From 379f9476c2a5ee370cd7ec856ee9092cace88499 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Wed, 30 Oct 2024 15:44:40 +0100 +Subject: [PATCH] Avoid ast.Str on Python 3.8+ + +It has been deprecated since Python 3.8 and was removed from Python 3.14+. +--- + setup.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 30ee0575..62272c18 100644 +--- a/setup.py ++++ b/setup.py +@@ -93,8 +93,9 @@ def default_environment(): + if (len(a.targets) == 1 and + isinstance(a.targets[0], ast.Name) and + a.targets[0].id == "__version__" and +- isinstance(a.value, ast.Str)): +- version = a.value.s ++ ((sys.version_info >= (3, 8) and isinstance(a.value, ast.Constant)) or ++ isinstance(a.value, ast.Str))): ++ version = a.value.value if sys.version_info >= (3, 8) else a.value.s + + setup(name='html5lib', + version=version, From 7634d27c828c12bc83c080570d64dfadc569cd5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 14:35:08 +0100 Subject: [PATCH 177/542] python3Packages.astor: 0.8.1 -> 0.8.1-unstable-2024-03-30 Fast forward 5 years to pick up a number of unrelease fixes. --- .../python-modules/astor/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index c13e6d4cfab0..f2bbfd03d615 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -1,30 +1,37 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, pytestCheckHook, + unstableGitUpdater, }: -buildPythonPackage rec { +buildPythonPackage { pname = "astor"; - version = "0.8.1"; - format = "setuptools"; + version = "0.8.1-unstable-2024-03-30"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "0ppscdzzvxpznclkmhhj53iz314x3pfv4yc7c6gwxqgljgdgyvka"; + src = fetchFromGitHub { + owner = "berkerpeksag"; + repo = "astor"; + rev = "df09001112f079db54e7c5358fa143e1e63e74c4"; + hash = "sha256-VF+harl/q2yRU2yqN1Txud3YBNSeedQNw2SZNYQFsno="; }; - # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # https://github.com/berkerpeksag/astor/issues/196 "test_convert_stdlib" - # https://github.com/berkerpeksag/astor/issues/212 - "test_huge_int" ]; + passthru.updateScript = unstableGitUpdater { + branch = "master"; + }; + meta = with lib; { description = "Library for reading, writing and rewriting python AST"; homepage = "https://github.com/berkerpeksag/astor"; From 8a8ddcc2ee39843f2b0a5e8434b79b3cbea80370 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 14:38:05 +0100 Subject: [PATCH 178/542] python314Packages.astor: backport patch for compat --- .../python-modules/astor/default.nix | 5 + .../astor/python314-compat.patch | 99 +++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 pkgs/development/python-modules/astor/python314-compat.patch diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index f2bbfd03d615..b416bc978155 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -19,6 +19,11 @@ buildPythonPackage { hash = "sha256-VF+harl/q2yRU2yqN1Txud3YBNSeedQNw2SZNYQFsno="; }; + patches = [ + # https://github.com/berkerpeksag/astor/pull/233 + ./python314-compat.patch + ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/astor/python314-compat.patch b/pkgs/development/python-modules/astor/python314-compat.patch new file mode 100644 index 000000000000..e5af45648393 --- /dev/null +++ b/pkgs/development/python-modules/astor/python314-compat.patch @@ -0,0 +1,99 @@ +From d0b5563cc1e263f08df9312d89a7691167448f4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 14 May 2025 19:52:30 +0200 +Subject: [PATCH] Fix compatibility with Python 3.14 (mostly) + +Fix the code and the test suite to work with Python 3.14, where +deprecated constant-like AST nodes were removed. Notably: + +1. Skip tests for deprecated nodes in Python 3.14. + +2. Use `ast.Constant` over `ast.Num` for non-deprecated code + in Python 3.6+. + +3. Check for `ast.Str` only in Python < 3.14, and handle `ast.Constant` + being used to represent a string instead. + +With these changes, all tests except for: + + tests/test_rtrip.py::RtripTestCase::test_convert_stdlib + +pass. However, this particular test also hanged for me with older Python +versions. + +Related to #217 +--- + astor/code_gen.py | 9 +++++++-- + tests/test_code_gen.py | 11 ++++++++--- + 2 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/astor/code_gen.py b/astor/code_gen.py +index b2bae12..4330f49 100644 +--- a/astor/code_gen.py ++++ b/astor/code_gen.py +@@ -692,6 +692,7 @@ def _handle_string_constant(self, node, value, is_joined=False): + current_line = ''.join(current_line) + + has_ast_constant = sys.version_info >= (3, 6) ++ has_ast_str = sys.version_info < (3, 14) + + if is_joined: + # Handle new f-strings. This is a bit complicated, because +@@ -700,7 +701,7 @@ def _handle_string_constant(self, node, value, is_joined=False): + + def recurse(node): + for value in node.values: +- if isinstance(value, ast.Str): ++ if has_ast_str and isinstance(value, ast.Str): + # Double up braces to escape them. + self.write(value.s.replace('{', '{{').replace('}', '}}')) + elif isinstance(value, ast.FormattedValue): +@@ -713,7 +714,11 @@ def recurse(node): + self.write(':') + recurse(value.format_spec) + elif has_ast_constant and isinstance(value, ast.Constant): +- self.write(value.value) ++ if isinstance(value.value, str): ++ # Double up braces to escape them. ++ self.write(value.value.replace('{', '{{').replace('}', '}}')) ++ else: ++ self.write(value.value) + else: + kind = type(value).__name__ + assert False, 'Invalid node %s inside JoinedStr' % kind +diff --git a/tests/test_code_gen.py b/tests/test_code_gen.py +index e828eb9..1825030 100644 +--- a/tests/test_code_gen.py ++++ b/tests/test_code_gen.py +@@ -28,7 +28,10 @@ def astorexpr(x): + return eval(astor.to_source(ast.Expression(body=x))) + + def astornum(x): +- return astorexpr(ast.Num(n=x)) ++ if sys.version_info >= (3, 6): ++ return astorexpr(ast.Constant(x)) ++ else: ++ return astorexpr(ast.Num(n=x)) + + class Comparisons(object): + +@@ -515,8 +518,8 @@ def test_deprecated_constants_as_name(self): + ast.Assign(targets=[ast.Name(id='spam')], value=ast.Name(id='None')), + "spam = None") + +- @unittest.skipUnless(sys.version_info >= (3, 4), +- "ast.NameConstant introduced in Python 3.4") ++ @unittest.skipUnless((3, 4) <= sys.version_info < (3, 14), ++ "ast.NameConstant introduced in Python 3.4, removed in 3.14") + def test_deprecated_name_constants(self): + self.assertAstEqualsSource( + ast.Assign(targets=[ast.Name(id='spam')], value=ast.NameConstant(value=True)), +@@ -530,6 +533,8 @@ def test_deprecated_name_constants(self): + ast.Assign(targets=[ast.Name(id='spam')], value=ast.NameConstant(value=None)), + "spam = None") + ++ @unittest.skipIf(sys.version_info >= (3, 14), ++ "Deprecated Constant nodes removed in Python 3.14") + def test_deprecated_constant_nodes(self): + self.assertAstEqualsSource( + ast.Assign(targets=[ast.Name(id='spam')], value=ast.Num(3)), From 0222a22c641ec00cab01855cdc7aaf08bf8304cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 14:41:02 +0100 Subject: [PATCH 179/542] python3Packages.parso: 0.8.4 -> 0.8.5 https://github.com/davidhalter/parso/blob/v0.8.5/CHANGELOG.rst --- .../python-modules/parso/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index e39173147e7d..0f321fe5026e 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -1,34 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, - pythonAtLeast, - pythonOlder, + fetchFromGitHub, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "parso"; - version = "0.8.4"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "0.8.5"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-6zp7WCQPuZCZo0VXHe7MD5VA6l9N0v4UwqmdaygauS0="; + src = fetchFromGitHub { + owner = "davidhalter"; + repo = "parso"; + tag = "v${version}"; + hash = "sha256-faSXCrOkybLr0bboF/8rPV/Humq8s158A3UOpdlYi0I="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ setuptools ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # python changed exception message format in 3.10, 3.10 not yet supported - "test_python_exception_matches" - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python Parser"; homepage = "https://parso.readthedocs.io/en/latest/"; - changelog = "https://github.com/davidhalter/parso/blob/master/CHANGELOG.rst"; + changelog = "https://github.com/davidhalter/parso/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; }; } From e8b5ce0fd1428cad133ff0ffacf2b40c2a7f35f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 14:43:04 +0100 Subject: [PATCH 180/542] python3Packages.rich: 14.1.0 -> 14.2.0 https://github.com/Textualize/rich/blob/v14.2.0/CHANGELOG.md --- pkgs/development/python-modules/rich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index fda066f3b813..3c1dd2af11b6 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "rich"; - version = "14.1.0"; + version = "14.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "rich"; tag = "v${version}"; - hash = "sha256-44L3eVf/gI0FlOlxzJ7/+A1jN6ILkeVEelaru1Io20U="; + hash = "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8="; }; build-system = [ poetry-core ]; From 967b0b77bc759717c578e49bd9337ec2086877df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 14:47:18 +0100 Subject: [PATCH 181/542] python3Packages.eventlet: 0.40.0 -> 0.40.3 https://github.com/eventlet/eventlet/blob/0.40.3/NEWS --- pkgs/development/python-modules/eventlet/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 2a652cfe73f6..0c568de38c55 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -22,24 +22,24 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.40.0"; + version = "0.40.3"; pyproject = true; src = fetchFromGitHub { owner = "eventlet"; repo = "eventlet"; tag = version; - hash = "sha256-fzCN+idYQ97nuDVfYn6VYQFBaaMxmnjWzFrmn+Aj+u4="; + hash = "sha256-yieyNx91jvKoh02zDFIEFk70yf3I27DWiumqoOjtdzQ="; }; pythonRelaxDeps = lib.optionals isPyPy [ "greenlet" ]; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ dnspython greenlet six @@ -78,7 +78,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "eventlet" ]; meta = with lib; { - changelog = "https://github.com/eventlet/eventlet/blob/v${version}/NEWS"; + changelog = "https://github.com/eventlet/eventlet/blob/${src.tag}/NEWS"; description = "Concurrent networking library for Python"; homepage = "https://github.com/eventlet/eventlet/"; license = licenses.mit; From 4040c029a7781067d6ed0d788b18137228ffd9e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 14:55:48 +0100 Subject: [PATCH 182/542] python314Packages.traitlets: disable failing tests These fail due to update help messages for argparse in 3.14. --- pkgs/development/python-modules/traitlets/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 09a4e2d944ac..8f469403ed14 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, pythonOlder, + pythonAtLeast, # build-system hatchling, @@ -36,6 +37,10 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/ipython/traitlets/issues/902 "test_complete_custom_completers" + ] ++ lib.optionals (pythonAtLeast "3.14") [ + # https://github.com/ipython/traitlets/issues/925 + "test_complete_simple_app" + "test_complete_subcommands_subapp1" ]; disabledTestPaths = [ From 7572f8c185dcdb3b33f3a7f224e951baaa279de1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 14:56:13 +0100 Subject: [PATCH 183/542] python3Packages.traitlets: refactor --- .../python-modules/traitlets/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 8f469403ed14..086c2590a8ad 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -1,8 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, pythonAtLeast, # build-system @@ -17,16 +16,16 @@ buildPythonPackage rec { pname = "traitlets"; version = "5.14.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-ntBXnTUCyUtLNzKsEgN1zalvkjEUUihH3ks7uYuWtrc="; + src = fetchFromGitHub { + owner = "ipython"; + repo = "traitlets"; + tag = "v${version}"; + hash = "sha256-lWtgzXW1ffzl1jkFaq99X0dU8agulUMHaghsYKX+8Dk="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; nativeCheckInputs = [ argcomplete @@ -37,7 +36,8 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/ipython/traitlets/issues/902 "test_complete_custom_completers" - ] ++ lib.optionals (pythonAtLeast "3.14") [ + ] + ++ lib.optionals (pythonAtLeast "3.14") [ # https://github.com/ipython/traitlets/issues/925 "test_complete_simple_app" "test_complete_subcommands_subapp1" From 5acb4b53426c2eb97773ec4d3e24553dbe90ce90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 15:02:22 +0100 Subject: [PATCH 184/542] python3Packages.attrs: 25.3.0 -> 25.4.0 https://github.com/python-attrs/attrs/releases/tag/25.4.0 --- pkgs/development/python-modules/attrs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 540ba092eff9..0ee291b37cec 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "attrs"; - version = "25.3.0"; + version = "25.4.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ddfO/H+1dnR7LIG0RC1NShzgkAlzUnwBHRAw/Tv0rxs="; + hash = "sha256-FtWWm4fwhZ7zOkizXVWsG+bkKuSdXoU7WX23DDXFfhE="; }; patches = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { postInstall = '' # Install tests as the tests output. mkdir $testout - cp -R conftest.py tests $testout + cp -R tests $testout ''; pythonImportsCheck = [ "attr" ]; From a3da737365227167fcbb9fd65fd2920d922caa6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 15:20:20 +0100 Subject: [PATCH 185/542] python3Packages.nest-asyncio: clean up, fix on 3.14 This packages is EOL upstream since 2024-03-06, but still used in too many places. --- .../python-modules/nest-asyncio/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 16e8fbddc63c..11a5ab58be8f 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, + pythonAtLeast, setuptools, setuptools-scm, }: @@ -13,8 +13,6 @@ buildPythonPackage rec { version = "1.6.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "erdewit"; repo = "nest_asyncio"; @@ -22,13 +20,17 @@ buildPythonPackage rec { hash = "sha256-5I5WItOl1QpyI4OXZgZf8GiQ7Jlo+SJbDicIbernaU4="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [ + "tests/nest_test.py::NestTest::test_timeout" + ]; + pythonImportsCheck = [ "nest_asyncio" ]; meta = with lib; { From bf091ba6b0f7f550efe4ebfcc2fefce87f0a6129 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 15:43:28 +0100 Subject: [PATCH 186/542] python3Packages.cattrs: 25.1.1 -> 25.3.0 https://github.com/python-attrs/cattrs/blob/v25.3.0/HISTORY.md --- pkgs/development/python-modules/cattrs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index 9d635cd1c9bb..670f51a6ea90 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "cattrs"; - version = "25.1.1"; + version = "25.3.0"; pyproject = true; src = fetchFromGitHub { owner = "python-attrs"; repo = "cattrs"; tag = "v${version}"; - hash = "sha256-kaB/UJcd4E4PUkz6mD53lXtmj4Z4P+Tuu7bSljYVOO4="; + hash = "sha256-6oQblSanvSZOMD5ossCP7fNjyxF54SRbU1cQrW1I5Ps="; }; build-system = [ From e9b7d6724019310042f19d0d14b892923cf4cf39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 15:52:10 +0100 Subject: [PATCH 187/542] python3Packages.ruamel-yaml-clib: 0.2.12 -> 0.2.14 --- pkgs/development/python-modules/ruamel-yaml-clib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix index 26b531530077..ffa5cd3027c1 100644 --- a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ruamel-yaml-clib"; - version = "0.2.12"; + version = "0.2.14"; pyproject = true; src = fetchhg { url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code"; rev = version; - hash = "sha256-VKiNt2WJttVjMR0z4bvdSYKOZqycRONCSPQacAy5PYo="; + hash = "sha256-fy+nzq/L3OKGujf6ExDowdxTWDnZGzVnDxL2e5t0Xcs="; }; build-system = [ setuptools ]; From 30cc89ef804e00c674a9cf0420f4f02470f68b40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 16:14:04 +0100 Subject: [PATCH 188/542] python3Packages.lz4: 4.4.4 -> 4.4.4-unstable-2025-10-21 Fast-forward 6 months to a release with Python 3.14 fixes. --- .../python-modules/lz4/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index a1f123b8ea2d..ca83fb842052 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -4,31 +4,26 @@ fetchFromGitHub, pkgconfig, psutil, + pytest-cov-stub, pytestCheckHook, python, - pythonOlder, setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage { pname = "lz4"; - version = "4.4.4"; + version = "4.4.4-unstable-2025-10-21"; pyproject = true; - disabled = pythonOlder "3.5"; - - # get full repository in order to run tests src = fetchFromGitHub { owner = "python-lz4"; repo = "python-lz4"; - tag = "v${version}"; - hash = "sha256-RoM2U47T5WLepJlbJhJAeqKRP8Zf3twndqmMSViI5Z8="; + rev = "59b2d8176072bdee50d38cc68ec65c33b928a980"; + hash = "sha256-2D30n5j5r4+gcrjEXPu+WpZ4QsugCPyC1xCZuJIPcI0="; }; - postPatch = '' - sed -i '/pytest-cov/d' setup.py - ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = "4.4.4"; build-system = [ pkgconfig @@ -45,6 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ psutil + pytest-cov-stub pytestCheckHook ]; @@ -60,7 +56,6 @@ buildPythonPackage rec { meta = with lib; { description = "LZ4 Bindings for Python"; homepage = "https://github.com/python-lz4/python-lz4"; - changelog = "https://github.com/python-lz4/python-lz4/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = [ ]; }; From a3380721542f9b04c52eb836675f8c18af0857d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 16:26:35 +0100 Subject: [PATCH 189/542] python3Packages.dissect-cstruct: 4.5 -> 4.6 https://github.com/fox-it/dissect.cstruct/releases/tag/4.6 --- pkgs/development/python-modules/dissect-cstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 7b27df5d45c5..71c84900b969 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "4.5"; + version = "4.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; tag = version; - hash = "sha256-2n7y6nHt7gJtJeJIKpobiC7A+dnD6O/o+psinfOnvT8="; + hash = "sha256-emxIFHSKAv4Fpzc5vQAkLaG91ezIszDnLKX8thVQKeo="; }; build-system = [ From 4b36437c8bb9b1845b6495ad5b0eaeb6032db8a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 16:55:22 +0100 Subject: [PATCH 190/542] python314Packages.dill: disable Failing test and upstream is not ready for 3.14. --- pkgs/development/python-modules/dill/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 30ba3551f269..03fc031da56e 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, python, - pythonOlder, + pythonAtLeast, setuptools, # passthru tests @@ -16,7 +16,8 @@ buildPythonPackage rec { version = "0.4.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + # https://github.com/uqfoundation/dill/issues/586 + disabled = pythonAtLeast "3.14"; src = fetchFromGitHub { owner = "uqfoundation"; From e77d8eaf5976b0171e714071571155c005423a94 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 18:00:22 +0100 Subject: [PATCH 191/542] python3Packages.pendulum: 3.1.0 -> 3.1.0-unstable-2025-10-28 Fixes the build on Python 3.14. --- pkgs/development/python-modules/pendulum/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index d1070a79a376..d96318c34ad1 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -27,21 +27,21 @@ buildPythonPackage rec { pname = "pendulum"; - version = "3.1.0"; + version = "3.1.0-unstable-2025-10-28"; pyproject = true; src = fetchFromGitHub { owner = "sdispater"; repo = "pendulum"; - tag = version; - hash = "sha256-ZjQaN5vT1+3UxwLNNsUmU4gSs6reUl90VSEumS0sEGY="; + rev = "2982f25feaad2e58ad1530d3b53cc30fc1c82bd6"; + hash = "sha256-1ULvlWLZx3z5eGmWJfrN46x0ohJ+mAxipm6l6rykGPY="; }; cargoRoot = "rust"; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; sourceRoot = "${src.name}/rust"; - hash = "sha256-F5bCuvI8DcyeUTS7UyYBixCjuGFKGOXPw8HLVlYKuxA="; + hash = "sha256-Ozg+TW/woJsqmbmyDsgdMua3Lmnn+KBvBhd9kVik3XY="; }; nativeBuildInputs = [ From 954573a23d5290fdcbb40a978ec82122280cd0a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Nov 2025 21:10:50 +0100 Subject: [PATCH 192/542] python3Packages.sphinx-autodoc-typehints: 3.4.0 -> 3.5.2 https://github.com/tox-dev/sphinx-autodoc-typehints/releases/tag/3.5.2 --- .../python-modules/sphinx-autodoc-typehints/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index f06e3580fddc..edf520cdbba6 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "3.4.0"; + version = "3.5.2"; in buildPythonPackage { @@ -20,7 +20,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-oknrcmSdBbS4fUKgykIln1UEmg/xVTk0FGP1nkslasU="; + hash = "sha256-X81KPreqiUJMHi4yvtymbtw4NnVpyRaagPSz6TQXH9s="; }; pythonRelaxDeps = [ "sphinx" ]; From a1a55880a8b423ec32a784155b310bde73f2698b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Nov 2025 00:47:27 +0100 Subject: [PATCH 193/542] python3Packages.sphinx: update disabled tests for python3.14 --- .../development/python-modules/sphinx/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index bd38b3260472..a58c43ac6b5c 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -37,6 +37,7 @@ pytestCheckHook, pytest-xdist, typing-extensions, + writableTmpDirAsHomeHook, # reverse dependencies to test breathe, @@ -97,12 +98,9 @@ buildPythonPackage rec { pytestCheckHook pytest-xdist typing-extensions + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME=$TMPDIR - ''; - disabledTestPaths = lib.optionals isPyPy [ # internals are asserted which are sightly different in PyPy "tests/test_extensions/test_ext_autodoc.py" @@ -135,8 +133,6 @@ buildPythonPackage rec { "test_document_toc_only" # Assertion error "test_gettext_literalblock_additional" - # requires cython_0, but fails miserably on 3.11 - "test_cython" # Could not fetch remote image: http://localhost:7777/sphinx.png "test_copy_images" # ModuleNotFoundError: No module named 'fish_licence.halibut' @@ -149,9 +145,10 @@ buildPythonPackage rec { "test_load_mappings_cache_update" "test_load_mappings_cache_revert_update" ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # https://github.com/sphinx-doc/sphinx/issues/12430 - "test_autodoc_type_aliases" + ++ lib.optionals (pythonAtLeast "3.14") [ + "test_autodoc_special_members" + "test_is_invalid_builtin_class" + "test_autosummary_generate_content_for_module_imported_members" ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted From 2cfaed45cfcc8c5c9fc243a2308c060e6efdfb0c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Nov 2025 01:57:08 +0100 Subject: [PATCH 194/542] python314Packages.exceptiongroup: disable failing tests --- pkgs/development/python-modules/exceptiongroup/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 8fb63dd1d074..e902f1abe60c 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -31,6 +31,12 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # RecursionError not raised + "test_deep_split" + "test_deep_subgroup" + ]; + pythonImportsCheck = [ "exceptiongroup" ]; meta = with lib; { From ce3db4f4f449d8158ab33079b044abb17e2308b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Nov 2025 02:05:52 +0100 Subject: [PATCH 195/542] python3Packages.toolz: 1.0.0 -> 1.1.0 https://github.com/pytoolz/toolz/releases/tag/1.1.0 --- pkgs/development/python-modules/toolz/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 6312d9a4f958..0534128f87a2 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -3,28 +3,27 @@ buildPythonPackage, fetchPypi, setuptools, + setuptools-git-versioning, pytestCheckHook, }: buildPythonPackage rec { pname = "toolz"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LIbj2aBHmKxVZ5O87YOIFilqLwhQF2ZOSZXLQKEEegI="; + hash = "sha256-J6XHcNBowRDZ7ZMj8k8VQ+g7LzAKaHt4kcGm1Wtpe1s="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-git-versioning + ]; nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # https://github.com/pytoolz/toolz/issues/577 - "test_inspect_wrapped_property" - ]; - meta = with lib; { homepage = "https://github.com/pytoolz/toolz"; changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}"; From b418c057f883c7e5685301db88ec63c3edfca65d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Nov 2025 02:21:52 +0100 Subject: [PATCH 196/542] python3Packages.hypothesis: 6.136.9 -> 6.145.1 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-145-1 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 22b65220f4e4..a607f633264e 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.136.9"; + version = "6.145.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; tag = "hypothesis-python-${version}"; - hash = "sha256-Q1wxIJwAYKZ0x6c85CJSGgcdKw9a3xFw8YpJROElSNU="; + hash = "sha256-xyUR3yY2tmF4LGhZRUlv6fdcfVyVWwukodA0WIW0bXU="; }; # I tried to package sphinx-selective-exclude, but it throws From ee65a42dd19b0f84bcfb0af2efdf44b25f8e05a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Nov 2025 02:02:47 +0100 Subject: [PATCH 197/542] python3Packages.cloudpickle: 3.1.1 -> 3.1.2 https://github.com/cloudpipe/cloudpickle/blob/v3.1.2/CHANGES.md --- pkgs/development/python-modules/cloudpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index ff5bad75b7dd..52dab834ee8d 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cloudpipe"; repo = "cloudpickle"; tag = "v${version}"; - hash = "sha256-e8kEznjuIrdjNsXwXJO3lcEEpiCR+UQzXnGrTarUb5E="; + hash = "sha256-BsCOEpNCNqq8PS+SdbzF1wq0LXEmtcHJs0pdt2qFw/w="; }; nativeBuildInputs = [ flit-core ]; From dd9cc028f03f6781533a2ef1d44a3d1675c70482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 4 Nov 2025 21:10:51 -0800 Subject: [PATCH 198/542] python3Packages.pydantic-core: 2.33.2 -> 2.41.5 Diff: https://github.com/pydantic/pydantic-core/compare/v2.33.2...v2.41.5 Changelog: https://github.com/pydantic/pydantic-core/releases/tag/v2.35.0 https://github.com/pydantic/pydantic-core/releases/tag/v2.35.1 https://github.com/pydantic/pydantic-core/releases/tag/v2.35.2 https://github.com/pydantic/pydantic-core/releases/tag/v2.36.0 https://github.com/pydantic/pydantic-core/releases/tag/v2.37.0 https://github.com/pydantic/pydantic-core/releases/tag/v2.37.1 https://github.com/pydantic/pydantic-core/releases/tag/v2.37.2 https://github.com/pydantic/pydantic-core/releases/tag/v2.38.0 https://github.com/pydantic/pydantic-core/releases/tag/v2.39.0 https://github.com/pydantic/pydantic-core/releases/tag/v2.40.0 https://github.com/pydantic/pydantic-core/releases/tag/v2.40.1 https://github.com/pydantic/pydantic-core/releases/tag/v2.41.0 https://github.com/pydantic/pydantic-core/releases/tag/v2.41.1 https://github.com/pydantic/pydantic-core/releases/tag/v2.41.2 https://github.com/pydantic/pydantic-core/releases/tag/v2.41.5 --- .../python-modules/pydantic-core/default.nix | 46 ++++++++----------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index 4f2e51111c90..c59679649a88 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -1,84 +1,74 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, cargo, rustPlatform, rustc, - libiconv, typing-extensions, pytestCheckHook, hypothesis, + inline-snapshot, + pytest-benchmark, + pytest-run-parallel, pytest-timeout, pytest-mock, dirty-equals, pydantic, + typing-inspection, }: let pydantic-core = buildPythonPackage rec { pname = "pydantic-core"; - version = "2.33.2"; + version = "2.41.5"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-core"; tag = "v${version}"; - hash = "sha256-2jUkd/Y92Iuq/A31cevqjZK4bCOp+AEC/MAnHSt2HLY="; + hash = "sha256-oIYHLSep8tWOXEaUybXG8Gv9WBoPGQ1Aj7QyqYksvMw="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-MY6Gxoz5Q7nCptR+zvdABh2agfbpqOtfTtor4pmkb9c="; + hash = "sha256-Kvc0a34C6oGc9oS/iaPaazoVUWn5ABUgrmPa/YocV+Y="; }; nativeBuildInputs = [ cargo rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook rustc ]; - build-system = [ - rustPlatform.maturinBuildHook - typing-extensions - ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - dependencies = [ typing-extensions ]; pythonImportsCheck = [ "pydantic_core" ]; - # escape infinite recursion with pydantic via dirty-equals + # escape infinite recursion with pydantic via inline-snapshot doCheck = false; - passthru.tests.pytest = pydantic-core.overrideAttrs { doCheck = true; }; + passthru.tests.pytest = pydantic-core.overridePythonAttrs { doCheck = true; }; nativeCheckInputs = [ pytestCheckHook hypothesis + inline-snapshot pytest-timeout dirty-equals + pytest-benchmark pytest-mock + pytest-run-parallel + typing-inspection ]; - disabledTests = [ - # RecursionError: maximum recursion depth exceeded while calling a Python object - "test_recursive" - ]; - - disabledTestPaths = [ - # no point in benchmarking in nixpkgs build farm - "tests/benchmarks" - ]; - - meta = with lib; { - changelog = "https://github.com/pydantic/pydantic-core/releases/tag/v${version}"; + meta = { + changelog = "https://github.com/pydantic/pydantic-core/releases/tag/${src.tag}"; description = "Core validation logic for pydantic written in rust"; homepage = "https://github.com/pydantic/pydantic-core"; - license = licenses.mit; - maintainers = pydantic.meta.maintainers; + license = lib.licenses.mit; + inherit (pydantic.meta) maintainers; }; }; in From c707b4a87778c92e1160d9a57a3c67e2ed11f1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 4 Nov 2025 21:12:00 -0800 Subject: [PATCH 199/542] python3Packages.pydantic: 2.11.7 -> 2.12.4 Diff: https://github.com/pydantic/pydantic/compare/v2.11.7...v2.12.4 Changelog: https://github.com/pydantic/pydantic/blob/v2.12.4/HISTORY.md --- .../python-modules/pydantic/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 5f0d1c58efe6..dc3b60a51152 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system hatchling, @@ -23,22 +22,19 @@ pytest-codspeed, pytest-mock, pytest-run-parallel, - eval-type-backport, - rich, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "pydantic"; - version = "2.11.7"; + version = "2.12.4"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic"; tag = "v${version}"; - hash = "sha256-5EQwbAqRExApJvVUJ1C6fsEC1/rEI6/bQEQkStqgf/Q="; + hash = "sha256-CHJahAgs+vQQzhIZjP+6suvbmRrGZI0H5UxoXg4I90o="; }; postPatch = '' @@ -69,14 +65,9 @@ buildPythonPackage rec { pytest-mock pytest-run-parallel pytestCheckHook - rich + writableTmpDirAsHomeHook ] - ++ lib.flatten (lib.attrValues optional-dependencies) - ++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; + ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ "tests/benchmarks" From 4a4f91ef06f092717ab5474aa9e5aa4bce199cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 3 Nov 2025 22:46:38 -0800 Subject: [PATCH 200/542] python3Packages.markdown: 3.9.0 -> 3.10.0 Diff: https://github.com/Python-Markdown/markdown/compare/3.9.0...3.10.0 Changelog: https://github.com/Python-Markdown/markdown/blob/3.10.0/docs/changelog.md --- pkgs/development/python-modules/markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 18711d9c4dd7..6e77f9ea621a 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.9.0"; + version = "3.10.0"; pyproject = true; src = fetchFromGitHub { owner = "Python-Markdown"; repo = "markdown"; tag = version; - hash = "sha256-wrDS7ajP031YKejD9Y83xg5bMl8ihBMSVZGov+1Y7Kg="; + hash = "sha256-GqYmlSNCJ8qLz4uJBJJAkiMwa+Q96f1S0jPuHrHwqpE="; }; build-system = [ setuptools ]; From 2dc383ebbc460c44bacad6a5dfa74470bb165cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 31 Oct 2025 20:41:52 -0700 Subject: [PATCH 201/542] python3Packages.pytest-codspeed: clean up dependencies --- .../python-modules/pytest-codspeed/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix index 0de2195da0fc..4b3eebde0119 100644 --- a/pkgs/development/python-modules/pytest-codspeed/default.nix +++ b/pkgs/development/python-modules/pytest-codspeed/default.nix @@ -3,9 +3,6 @@ buildPythonPackage, cffi, fetchFromGitHub, - filelock, - hatchling, - importlib-metadata, pytest-benchmark, pytest-cov-stub, pytest-xdist, @@ -44,16 +41,16 @@ buildPythonPackage rec { popd ''; - build-system = [ hatchling ]; + build-system = [ + cffi + setuptools + ]; buildInputs = [ pytest ]; dependencies = [ cffi - filelock - importlib-metadata rich - setuptools ]; optional-dependencies = { From a73bdc7d6edb4b47ab067007596d3d8236e4b37a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 31 Oct 2025 23:46:45 -0700 Subject: [PATCH 202/542] python3Packages.cython: 3.1.4 -> 3.1.6 Diff: https://github.com/cython/cython/compare/3.1.4...3.1.6 Changelog: https://github.com/cython/cython/blob/3.1.6/CHANGES.rst --- pkgs/development/python-modules/cython/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index c7ccfa5295cc..796df1cad647 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, gdb, - isPyPy, ncurses, numpy, pkg-config, @@ -16,31 +15,30 @@ buildPythonPackage rec { pname = "cython"; - version = "3.1.4"; + version = "3.1.6"; pyproject = true; src = fetchFromGitHub { owner = "cython"; repo = "cython"; tag = version; - hash = "sha256-qFj7w0fQY6X1oADLsAgwFefzx92/Pmgv9j5S6v0sdPg="; + hash = "sha256-OB9DsGabbn5pE+8Ru29D3Jp9Wu+gwlHYYy79x+M+HPI="; }; build-system = [ - pkg-config setuptools ]; + nativeBuildInputs = [ + pkg-config + ]; + nativeCheckInputs = [ gdb numpy ncurses ]; - env = lib.optionalAttrs (!isPyPy) { - LC_ALL = "en_US.UTF-8"; - }; - # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; From 70f775676a84000b1bbba40594d0afb8167bcb03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 31 Oct 2025 23:45:28 -0700 Subject: [PATCH 203/542] python3Packages.rapidfuzz: 3.14.1 -> 3.14.2 Diff: https://github.com/maxbachmann/RapidFuzz/compare/v3.14.1...v3.14.2 Changelog: https://github.com/maxbachmann/RapidFuzz/blob/v3.14.2/CHANGELOG.rst --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 91036cf45c07..14b7750358f9 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.14.1"; + version = "3.14.2"; pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; tag = "v${version}"; - hash = "sha256-p+Z2c+PBNdjfaRjZErWwWgihzuddV14PgTHE3NVNHs8="; + hash = "sha256-hnVSlKZxl4WE/YjobUg81qcuet8j5gZndCQdKLpOS8Y="; }; patches = [ From 80e3b70555da4ae65e51f3b37fa142e7f431863c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 30 Oct 2025 13:13:08 -0700 Subject: [PATCH 204/542] python3Packages.pytest-benchmark: 5.1.0 -> 5.2.0 Diff: https://github.com/ionelmc/pytest-benchmark/compare/v5.1.0...v5.2.0 Changelog: https://github.com/ionelmc/pytest-benchmark/blob/v5.2.0/CHANGELOG.rst --- .../python-modules/pytest-benchmark/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 1b14abd0d189..24e50f91acb3 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -15,18 +15,19 @@ pythonAtLeast, pythonOlder, setuptools, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "pytest-benchmark"; - version = "5.1.0"; + version = "5.2.0"; pyproject = true; src = fetchFromGitHub { owner = "ionelmc"; repo = "pytest-benchmark"; tag = "v${version}"; - hash = "sha256-4fD9UfZ6jtY7Gx/PVzd1JNWeQNz+DJ2kQmCku2TgxzI="; + hash = "sha256-BM17nrJfoOHkl7hOeY/VdoH5oEQP6EJWeNXa5x8/5UM="; }; build-system = [ setuptools ]; @@ -55,12 +56,12 @@ buildPythonPackage rec { mercurial nbmake pytestCheckHook + writableTmpDirAsHomeHook ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export PATH="$out/bin:$PATH" - export HOME=$(mktemp -d) ''; disabledTests = @@ -78,7 +79,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/ionelmc/pytest-benchmark/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/ionelmc/pytest-benchmark/blob/${src.tag}/CHANGELOG.rst"; description = "Pytest fixture for benchmarking code"; homepage = "https://github.com/ionelmc/pytest-benchmark"; license = lib.licenses.bsd2; From 0784af710c9d210b6d1629f64a7ce18f09b6a94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:31:38 -0700 Subject: [PATCH 205/542] python3Packages.zope-interface: 7.2 -> 8.0.1 Diff: https://github.com/zopefoundation/zope.interface/compare/7.2...8.0.1 Changelog: https://github.com/zopefoundation/zope.interface/blob/8.0.1/CHANGES.rst --- .../python-modules/zope-interface/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/zope-interface/default.nix b/pkgs/development/python-modules/zope-interface/default.nix index 3c5f5b0c478f..59f156489e38 100644 --- a/pkgs/development/python-modules/zope-interface/default.nix +++ b/pkgs/development/python-modules/zope-interface/default.nix @@ -7,21 +7,16 @@ buildPythonPackage rec { pname = "zope-interface"; - version = "7.2"; + version = "8.0.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.interface"; tag = version; - hash = "sha256-WrS/YHkEmV1G/Scg0xpyu2uFVWTWnEpajqNDvGioVgc="; + hash = "sha256-IYtfd9mJLcwk3FGPWlD5PbrKdIwDQf1Thn6fWFa5Rpo="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools < 74" "setuptools" - ''; - build-system = [ setuptools ]; pythonImportsCheck = [ "zope.interface" ]; @@ -31,8 +26,8 @@ buildPythonPackage rec { pythonNamespaces = [ "zope" ]; meta = { - changelog = "https://github.com/zopefoundation/zope.interface/blob/${version}/CHANGES.rst"; - description = "Zope.Interface"; + changelog = "https://github.com/zopefoundation/zope.interface/blob/${src.tag}/CHANGES.rst"; + description = "Implementation of object interfaces, a mechanism for labeling objects as conforming to a given API or contract"; homepage = "https://github.com/zopefoundation/zope.interface"; license = lib.licenses.zpl21; maintainers = [ ]; From 509ff20016707cbeac4166d9fafc923ba5ebd849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:34:46 -0700 Subject: [PATCH 206/542] python3Packages.zope-exceptions: 5.2 -> 6.0 Diff: https://github.com/zopefoundation/zope.exceptions/compare/5.2...6.0 Changelog: https://github.com/zopefoundation/zope.exceptions/blob/6.0/CHANGES.rst --- .../python-modules/zope-exceptions/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/zope-exceptions/default.nix b/pkgs/development/python-modules/zope-exceptions/default.nix index 8141e1a90165..96f7aaf9ae26 100644 --- a/pkgs/development/python-modules/zope-exceptions/default.nix +++ b/pkgs/development/python-modules/zope-exceptions/default.nix @@ -2,31 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, zope-interface, }: buildPythonPackage rec { pname = "zope-exceptions"; - version = "5.2"; + version = "6.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.exceptions"; tag = version; - hash = "sha256-jbzUUB6ifTfxiGEiyAmsDoDLyRVuZPgIsN8mCNJkv4Q="; + hash = "sha256-LLKS/O1sfrHRfEgbb3GO+/hBtIC9CvfNjorqiKTgujo="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; dependencies = [ - setuptools zope-interface ]; From 15eb9596bc1004bf1e80d67ca1728dadddba198d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:36:50 -0700 Subject: [PATCH 207/542] python3Packages.zope-testrunner: 6.6.1 -> 8.1 Diff: https://github.com/zopefoundation/zope.testrunner/compare/6.6.1...8.1 Changelog: https://github.com/zopefoundation/zope.testrunner/blob/8.1/CHANGES.rst --- pkgs/development/python-modules/zope-testrunner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-testrunner/default.nix b/pkgs/development/python-modules/zope-testrunner/default.nix index 85ef9af02889..6947177911c6 100644 --- a/pkgs/development/python-modules/zope-testrunner/default.nix +++ b/pkgs/development/python-modules/zope-testrunner/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "zope-testrunner"; - version = "6.6.1"; + version = "8.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.testrunner"; tag = version; - hash = "sha256-cvZXQzbIUBq99P0FYSydG1tLNBMFTTvuMvqWGaNFhJc="; + hash = "sha256-MqlS/VkLAv9M1WtJ6t2nPMZPH+Cz5wfy2VhtCx/Fwmw="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; From ac89335d939b4f657e1f64a1e723f0da2e8144c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:38:13 -0700 Subject: [PATCH 208/542] python3Packages.zope-event: 5.0 -> 6.0 Diff: https://github.com/zopefoundation/zope.event/compare/5.0...6.0 Changelog: https://github.com/zopefoundation/zope.event/blob/6.0/CHANGES.rst --- pkgs/development/python-modules/zope-event/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-event/default.nix b/pkgs/development/python-modules/zope-event/default.nix index ee9ea2639f02..61c26a939355 100644 --- a/pkgs/development/python-modules/zope-event/default.nix +++ b/pkgs/development/python-modules/zope-event/default.nix @@ -8,16 +8,21 @@ buildPythonPackage rec { pname = "zope-event"; - version = "5.0"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.event"; tag = version; - hash = "sha256-85jXSrploTcskdOBI84KGGf9Bno41ZTtT/TrbgmTxiA="; + hash = "sha256-1ZdhJwxzYsMT2s+z4MLR71cLFzIEmwE0KFilwg7BQ1E="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; pythonImportsCheck = [ "zope.event" ]; From 399d2c3417bf7035771c0d2be84c38e620723421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:39:45 -0700 Subject: [PATCH 209/542] python3Packages.zope-schema: 7.0.1 -> 8.0 Diff: https://github.com/zopefoundation/zope.schema/compare/7.0.1...8.0 Changelog: https://github.com/zopefoundation/zope.schema/blob/8.0/CHANGES.rst --- pkgs/development/python-modules/zope-schema/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-schema/default.nix b/pkgs/development/python-modules/zope-schema/default.nix index 739e55795ced..dc72078d66b8 100644 --- a/pkgs/development/python-modules/zope-schema/default.nix +++ b/pkgs/development/python-modules/zope-schema/default.nix @@ -11,16 +11,21 @@ buildPythonPackage rec { pname = "zope-schema"; - version = "7.0.1"; + version = "8.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.schema"; tag = version; - hash = "sha256-aUjlSgMfoKQdE0ta8jxNjh+L7OKkfOVvUWnvhx+QRsI="; + hash = "sha256-qZ7OWpDTBV/wT3FZBUhe6D4olCTBaYkilj+JSwjHKOU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; dependencies = [ From 8758e1b57d7c3d5b55900e719105c66e4debf1d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:40:59 -0700 Subject: [PATCH 210/542] python3Packages.zope-security: 7.3 -> 8.1 Diff: https://github.com/zopefoundation/zope.security/compare/7.3...8.1 Changelog: https://github.com/zopefoundation/zope.security/blob/8.1/CHANGES.rst --- .../python-modules/zope-security/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zope-security/default.nix b/pkgs/development/python-modules/zope-security/default.nix index a102151ee2e5..3f23c1243e6d 100644 --- a/pkgs/development/python-modules/zope-security/default.nix +++ b/pkgs/development/python-modules/zope-security/default.nix @@ -19,22 +19,25 @@ buildPythonPackage rec { pname = "zope-security"; - version = "7.3"; + version = "8.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.security"; tag = version; - hash = "sha256-p+9pCcBsCJY/V6vraVZHMr5VwYHFe217AbRVoSnDphs="; + hash = "sha256-qik1tuH0w0W21Md6YXc5csCbMrFifxaJvGgi2nB4FrI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; - build-system = [ setuptools ]; + build-system = [ + setuptools + zope-proxy + ]; dependencies = [ zope-component From a669b39441355805d01fbc02077dafc88e37caff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:44:29 -0700 Subject: [PATCH 211/542] python3Packages.zope-cachedescriptors: 5.1 -> 6.0 Diff: https://github.com/zopefoundation/zope.cachedescriptors/compare/5.1...6.0 Changelog: https://github.com/zopefoundation/zope.cachedescriptors/blob/6.0/CHANGES.rst --- .../python-modules/zope-cachedescriptors/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 39403aa09ddf..d78bf62bb4e4 100644 --- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "zope-cachedescriptors"; - version = "5.1"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.cachedescriptors"; tag = version; - hash = "sha256-2cb8XosPCAV2BfMisCN9mr0KIu5xcsLPIcPkmpeVT+k="; + hash = "sha256-PlezUzuO4P/BOVT6Ll8dYIKssC/glmVd8SCM0afgNC0="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; From b3773d5bfe647b305b7e104c0c773884f6dd95ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:48:05 -0700 Subject: [PATCH 212/542] python3Packages.zope-component: 6.0 -> 7.0 Diff: https://github.com/zopefoundation/zope.component/compare/6.0...7.0 Changelog: https://github.com/zopefoundation/zope.component/blob/7.0/CHANGES.rst --- .../python-modules/zope-component/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index 81f90593b528..4db532448b8c 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, zope-event, zope-hookable, @@ -17,15 +17,21 @@ buildPythonPackage rec { pname = "zope-component"; - version = "6.0"; + version = "7.0"; pyproject = true; - src = fetchPypi { - pname = "zope.component"; - inherit version; - hash = "sha256-mgoEcq0gG5S0/mdBzprCwwuLsixRYHe/A2kt7E37aQY="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.component"; + tag = version; + hash = "sha256-3Hl2sm2M0we+fpdt4GSjAStLSAJ1c4Za1vfm9Bj8z8s="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; dependencies = [ @@ -35,6 +41,7 @@ buildPythonPackage rec { ]; optional-dependencies = { + hook = [ ]; persistentregistry = [ persistent ]; security = [ zope-location From e93673ebbbe5b19f48350eb344292623bd583401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:50:08 -0700 Subject: [PATCH 213/542] python3Packages.zope-configuration: 6.0 -> 7.0 Diff: https://github.com/zopefoundation/zope.configuration/compare/6.0...7.0 Changelog: https://github.com/zopefoundation/zope.configuration/blob/7.0/CHANGES.rst --- .../python-modules/zope-configuration/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index bd10c096a65e..99cf1f2e4ea7 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "zope-configuration"; - version = "6.0"; + version = "7.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.configuration"; tag = version; - hash = "sha256-dkEVIHaXk/oP4uYYzI1hgSnPZXBMDjDu97zmOXnj9NA="; + hash = "sha256-G87VAEqMxF5Y3LuDJnDcOox5+ngJuRhUGSj9K8c3mYY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools < 74" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; From 43ccf4eebcb11d1799fd7a5ea61b30a3edc90e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:51:08 -0700 Subject: [PATCH 214/542] python3Packages.zope-contenttype: 5.2 -> 6.0 Diff: https://github.com/zopefoundation/zope.contenttype/compare/5.2...6.0 Changelog: https://github.com/zopefoundation/zope.contenttype/blob/6.0/CHANGES.rst --- .../development/python-modules/zope-contenttype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-contenttype/default.nix b/pkgs/development/python-modules/zope-contenttype/default.nix index f53485b5462a..e5f867ec3e90 100644 --- a/pkgs/development/python-modules/zope-contenttype/default.nix +++ b/pkgs/development/python-modules/zope-contenttype/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "zope-contenttype"; - version = "5.2"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.contenttype"; tag = version; - hash = "sha256-mY6LlJn44hUfXpxEa99U6FNcsV9xJbR5w/iIS6hG+m4="; + hash = "sha256-fEbFFc6/R/fv9q9diKVcEPH12hVt/kbyGyNXqM8xzWM="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; From c9b513c3b9a088b9a916b9421644fe27e4b8a3cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:51:56 -0700 Subject: [PATCH 215/542] python3Packages.zope-copy: 5.0 -> 6.0 Diff: https://github.com/zopefoundation/zope.copy/compare/5.0...6.0 Changelog: https://github.com/zopefoundation/zope.copy/blob/6.0/CHANGES.rst --- pkgs/development/python-modules/zope-copy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-copy/default.nix b/pkgs/development/python-modules/zope-copy/default.nix index d92b4b1ebc1a..453542bbec60 100644 --- a/pkgs/development/python-modules/zope-copy/default.nix +++ b/pkgs/development/python-modules/zope-copy/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "zope-copy"; - version = "5.0"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.copy"; tag = version; - hash = "sha256-uQUvfZGrMvtClXa8tLKZFYehbcBIRx7WQnumUrdQjIk="; + hash = "sha256-hYeLUSwAq5rK4TRngvNQGR4Fdimb2k5dHtFdptMVqPo="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools < 74" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; From e52d45cc00a3b01ef7daeda6ad12f06d4723638e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:54:06 -0700 Subject: [PATCH 216/542] python3Packages.zope-deferredimport: 5.0 -> 6.0 Diff: https://github.com/zopefoundation/zope.deferredimport/compare/5.0...6.0 Changelog: https://github.com/zopefoundation/zope.deferredimport/blob/6.0/CHANGES.rst --- .../zope-deferredimport/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 7f79f55b32b9..0fbd5e147763 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, zope-proxy, unittestCheckHook, @@ -9,15 +9,21 @@ buildPythonPackage rec { pname = "zope-deferredimport"; - version = "5.0"; + version = "6.0"; pyproject = true; - src = fetchPypi { - pname = "zope.deferredimport"; - inherit version; - hash = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.deferredimport"; + tag = version; + hash = "sha256-7Q8+Cew5987+CjUOxqpwMFXWdw+/B28tOEXRYC0SRyI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; dependencies = [ zope-proxy ]; From ef8a4a19974e8f89bbeaa0a8b45ae16ff7172dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 18:55:23 -0700 Subject: [PATCH 217/542] python3Packages.zope-deprecation: 5.1 -> 6.0 Diff: https://github.com/zopefoundation/zope.deprecation/compare/5.1...6.0 Changelog: https://github.com/zopefoundation/zope.deprecation/blob/6.0/CHANGES.rst --- .../zope-deprecation/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/zope-deprecation/default.nix b/pkgs/development/python-modules/zope-deprecation/default.nix index d2f6adc39c59..fe3010399a01 100644 --- a/pkgs/development/python-modules/zope-deprecation/default.nix +++ b/pkgs/development/python-modules/zope-deprecation/default.nix @@ -3,31 +3,37 @@ buildPythonPackage, fetchFromGitHub, setuptools, - pytestCheckHook, + zope-testrunner, }: buildPythonPackage rec { pname = "zope-deprecation"; - version = "5.1"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.deprecation"; tag = version; - hash = "sha256-5gqZuO3fGXkQl493QrvK7gl77mDteUp7tpo4DhSRI+o="; + hash = "sha256-N/+RtilRY/8NfhUjd/Y4T6dmZHt6PW4ofP1UE8Aj1e8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ zope-testrunner ]; - enabledTestPaths = [ "src/zope/deprecation/tests.py" ]; + checkPhase = '' + runHook preCheck + + zope-testrunner --test-path=src + + runHook postCheck + ''; pythonImportsCheck = [ "zope.deprecation" ]; From 07664d00978f9af03f44a3a30464dee35079c8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:01:26 -0700 Subject: [PATCH 218/542] python3Packages.zope-dottedname: 6.0 -> 7.0 Diff: https://github.com/zopefoundation/zope.dottedname/compare/6.0...7.0 Changelog: https://github.com/zopefoundation/zope.dottedname/blob/7.0/CHANGES.rst --- .../python-modules/zope-dottedname/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/zope-dottedname/default.nix b/pkgs/development/python-modules/zope-dottedname/default.nix index 242aa87aa2ab..121e4e642bc7 100644 --- a/pkgs/development/python-modules/zope-dottedname/default.nix +++ b/pkgs/development/python-modules/zope-dottedname/default.nix @@ -1,22 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "zope-dottedname"; - version = "6.0"; + version = "7.0"; pyproject = true; - src = fetchPypi { - pname = "zope.dottedname"; - inherit version; - hash = "sha256-28S4W/vzSx74jasWJSrG7xbZBDnyIjstCiYs9Bnq6QI="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.dottedname"; + tag = version; + hash = "sha256-bWURUr+BCQsMNBYqJD2+YPdfA+FWrJuBGypQ/c8w6kA="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; From be9153de51e85475f78a7980d1cf04260faba69b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:02:49 -0700 Subject: [PATCH 219/542] python3Packages.zope-filerepresentation: 6.1 -> 7.0 Diff: https://github.com/zopefoundation/zope.filerepresentation/compare/6.1...7.0 Changelog: https://github.com/zopefoundation/zope.filerepresentation/blob/7.0/CHANGES.rst --- .../python-modules/zope-filerepresentation/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-filerepresentation/default.nix b/pkgs/development/python-modules/zope-filerepresentation/default.nix index bd5fcb23d63e..72757227cd69 100644 --- a/pkgs/development/python-modules/zope-filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope-filerepresentation/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "zope-filerepresentation"; - version = "6.1"; + version = "7.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.filerepresentation"; tag = version; - hash = "sha256-6J4munk2yyZ6e9rpU2Op+Gbf0OXGI6GpHjmpUZVRjsY="; + hash = "sha256-VWi00b7m+aKwkg/Gfzo5fJWMqdMqgowBpkqsYcEO2gY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; From 3d929af1dd977e78d3c639be1616ceb2fde136fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:03:55 -0700 Subject: [PATCH 220/542] python3Packages.zope-hookable: 7.0 -> 8.0 Diff: https://github.com/zopefoundation/zope.hookable/compare/7.0...8.0 Changelog: https://github.com/zopefoundation/zope.hookable/blob/8.0/CHANGES.rst --- pkgs/development/python-modules/zope-hookable/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index 66f599332f22..a4d5d5abd531 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "zope-hookable"; - version = "7.0"; + version = "8.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.hookable"; tag = version; - hash = "sha256-qJJc646VSdNKors6Au4UAGvm7seFbvjEfpdqf//vJNE="; + hash = "sha256-5ps/H9bL2oN9IHxXzpWw/9uMLhwV+OpQ26kXlsP4hgw="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; From c3911bc390677b216baf9dd986770bb39d98e0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:04:36 -0700 Subject: [PATCH 221/542] python3Packages.zope-i18nmessageid: 7.0 -> 8.0 Diff: https://github.com/zopefoundation/zope.i18nmessageid/compare/7.0...8.0 Changelog: https://github.com/zopefoundation/zope.i18nmessageid/blob/8.0/CHANGES.rst --- .../python-modules/zope-i18nmessageid/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix index ff6c15ac9746..f236aae772a3 100644 --- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -3,32 +3,25 @@ buildPythonPackage, fetchFromGitHub, setuptools, - zope-testrunner, unittestCheckHook, }: buildPythonPackage rec { pname = "zope-i18nmessageid"; - version = "7.0"; + version = "8.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.i18nmessageid"; tag = version; - hash = "sha256-rdTs1pNMKpPAR2CewXdg1KmI61Sw5r62OobYlJHsUaQ="; + hash = "sha256-lMHmKWwR9D9HW+paV1mDVAirOe0wBD8VrJ67NZoROtg="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" - ''; - build-system = [ setuptools ]; nativeCheckInputs = [ unittestCheckHook - zope-testrunner ]; unittestFlagsArray = [ "src/zope/i18nmessageid" ]; From 091fc4cfd420a26b9b40b231f5ab53ff4b680930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:05:32 -0700 Subject: [PATCH 222/542] python3Packages.zope-lifecycleevent: 5.1 -> 6.0 Diff: https://github.com/zopefoundation/zope.lifecycleevent/compare/5.1...6.0 Changelog: https://github.com/zopefoundation/zope.lifecycleevent/blob/6.0/CHANGES.rst --- .../python-modules/zope-lifecycleevent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-lifecycleevent/default.nix b/pkgs/development/python-modules/zope-lifecycleevent/default.nix index 6baee99659d9..10e880d4a1fe 100644 --- a/pkgs/development/python-modules/zope-lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope-lifecycleevent/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "zope-lifecycleevent"; - version = "5.1"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.lifecycleevent"; tag = version; - hash = "sha256-vTonbZSeQxnLA6y1wAnBpobEKAs+gaAYN25dx5Fla9k="; + hash = "sha256-HgxOUseRYc+mkwESUDqauoH2D2E4PL8XxM1C0FC35w8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; From fc31dda14c1f0b5850da9dac14e54a031a8663bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:06:27 -0700 Subject: [PATCH 223/542] python3Packages.zope-location: 5.0 -> 6.0 Diff: https://github.com/zopefoundation/zope.location/compare/5.0...6.0 Changelog: https://github.com/zopefoundation/zope.location/blob/6.0/CHANGES.rst --- .../python-modules/zope-location/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/zope-location/default.nix b/pkgs/development/python-modules/zope-location/default.nix index 8b4ff8bf7e88..c4d05a2e06ce 100644 --- a/pkgs/development/python-modules/zope-location/default.nix +++ b/pkgs/development/python-modules/zope-location/default.nix @@ -8,21 +8,27 @@ zope-schema, zope-component, zope-configuration, + zope-copy, unittestCheckHook, }: buildPythonPackage rec { pname = "zope-location"; - version = "5.0"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.location"; tag = version; - hash = "sha256-C8tQ4qqzkQx+iU+Pm3iCEchtqOZT/qcYFSzJWzqlhnI="; + hash = "sha256-s7HZda+U87P62elX/KbDp2o9zAplgFVmnedDI/uq2sk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; dependencies = [ @@ -34,18 +40,13 @@ buildPythonPackage rec { optional-dependencies = { zcml = [ zope-configuration ]; component = [ zope-component ]; + copy = [ zope-copy ]; }; pythonImportsCheck = [ "zope.location" ]; nativeCheckInputs = [ unittestCheckHook ]; - # prevent cirtular import - preCheck = '' - rm src/zope/location/tests/test_configure.py - rm src/zope/location/tests/test_pickling.py - ''; - unittestFlagsArray = [ "src/zope/location/tests" ]; pythonNamespaces = [ "zope" ]; From 12fd76201a0d46460d753b7ab138f7b69259049f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:08:50 -0700 Subject: [PATCH 224/542] python3Packages.zope-size: 5.1 -> 6.0 Diff: https://github.com/zopefoundation/zope.size/compare/5.1...6.0 Changelog: https://github.com/zopefoundation/zope.size/blob/6.0/CHANGES.rst --- .../python-modules/zope-size/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/zope-size/default.nix b/pkgs/development/python-modules/zope-size/default.nix index 1077201a61bd..f6219f6cf56a 100644 --- a/pkgs/development/python-modules/zope-size/default.nix +++ b/pkgs/development/python-modules/zope-size/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "zope-size"; - version = "5.1"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.size"; tag = version; - hash = "sha256-9r7l3RgE9gvxJ2I5rFvNn/XIztecXW3GseGeM3MzfTU="; + hash = "sha256-jjI9NvfxnIWZrqDEpZ6FDlhDWZoqEUBliiyh+5PxOAg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; @@ -35,14 +35,22 @@ buildPythonPackage rec { zope-interface ]; + optional-dependencies = { + zcml = [ + zope-component + zope-configuration + zope-security + ] + ++ zope-component.optional-dependencies.zcml + ++ zope-security.optional-dependencies.zcml; + }; + pythonImportsCheck = [ "zope.size" ]; nativeCheckInputs = [ unittestCheckHook - zope-component - zope-configuration - zope-security - ]; + ] + ++ lib.flatten (lib.attrValues optional-dependencies); unittestFlagsArray = [ "src/zope/size" ]; From 3547d1778bcffe95059d90adb282c8a766eb09ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:13:20 -0700 Subject: [PATCH 225/542] python3Packages.zope-testbrowser: 7.0.1 -> 8.0 Diff: https://github.com/zopefoundation/zope.testbrowser/compare/7.0.1...8.0 Changelog: https://github.com/zopefoundation/zope.testbrowser/blob/refs/tags/8.0/CHANGES.rst --- .../python-modules/zope-testbrowser/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix index 7e5c17e2e2c5..c1598c60ecab 100644 --- a/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -11,6 +11,7 @@ beautifulsoup4, soupsieve, wsgiproxy2, + legacy-cgi, mock, zope-testing, zope-testrunner, @@ -19,17 +20,20 @@ buildPythonPackage rec { pname = "zope-testbrowser"; - version = "7.0.1"; + version = "8.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.testbrowser"; tag = version; - hash = "sha256-GxSH3JBuQ3B4CeHzr58FEYv0gsTlUhlO/0CCHcTdOfg="; + hash = "sha256-CcNlK7EKYng0GKYTZ2U2slkyQ9wTqwzOXGHt9S5p3L0="; }; postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + # remove test that requires network access substituteInPlace src/zope/testbrowser/tests/test_doctests.py \ --replace-fail "suite.addTests(wire)" "" @@ -47,6 +51,7 @@ buildPythonPackage rec { beautifulsoup4 soupsieve wsgiproxy2 + legacy-cgi ]; nativeCheckInputs = [ From 85a77204026a0b89766d854d4933f52d9b127f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:17:18 -0700 Subject: [PATCH 226/542] python3Packages.zope-testing: 5.1 -> 6.0 Diff: https://github.com/zopefoundation/zope.testing/compare/5.1...6.0 Changelog: https://github.com/zopefoundation/zope.testing/blob/6.0/CHANGES.rst --- pkgs/development/python-modules/zope-testing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix index e95da7af7d88..4966f8e5224e 100644 --- a/pkgs/development/python-modules/zope-testing/default.nix +++ b/pkgs/development/python-modules/zope-testing/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "zope-testing"; - version = "5.1"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.testing"; tag = version; - hash = "sha256-G9RfRsXSzQ92HeBF5dRTI+1XEz1HM3DuB0ypZ61uHfw="; + hash = "sha256-px1+lS1U0lmmQrXJuxFTsX3N8e2mj5Yhckfis5++EX8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; From f2e28d17f94ef5ea98526bc0eb6ac4e4dd52798e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:18:26 -0700 Subject: [PATCH 227/542] python3Packages.zope-proxy: 6.1 -> 7.0 Diff: https://github.com/zopefoundation/zope.proxy/compare/6.1...7.0 Changelog: https://github.com/zopefoundation/zope.proxy/blob/7.0/CHANGES.rst --- pkgs/development/python-modules/zope-proxy/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index b480cdd9396e..71f559e4423c 100644 --- a/pkgs/development/python-modules/zope-proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -8,21 +8,16 @@ buildPythonPackage rec { pname = "zope-proxy"; - version = "6.1"; + version = "7.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.proxy"; tag = version; - hash = "sha256-RgkUojCAfwAGv8Jek2Ucg0KMtPviwXjuiO70iisParM="; + hash = "sha256-1u9Yn6j8tBMmAZmb/0L/lZUE/yC0OP8K825QBixxKQM="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" - ''; - build-system = [ setuptools ]; dependencies = [ zope-interface ]; From 1ccd8ca4d5251699340bdb3a0de2bd5dcbabd259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 19:21:30 -0700 Subject: [PATCH 228/542] python3Packages.zodb: 6.0.1 -> 6.1 Diff: https://github.com/zopefoundation/zodb/compare/6.0.1...6.1 Changelog: https://github.com/zopefoundation/ZODB/blob/6.1/CHANGES.rst --- pkgs/development/python-modules/zodb/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index ed00f0677ca1..49baf1a63efa 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -18,18 +18,21 @@ buildPythonPackage rec { pname = "zodb"; - version = "6.0.1"; + version = "6.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zodb"; tag = version; - hash = "sha256-2OK1ezHFEpOMOrpB8Nzf/6+4AlV3S7p11dQHkeMqhoo="; + hash = "sha256-O6mu4RWi5qNcPyIgre5+bk4ZGZOZdG1vIdc8HqbfcaQ="; }; - # remove broken test postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + + # remove broken test rm -vf src/ZODB/tests/testdocumentation.py ''; From 2cdd6003e1c2547fa7bcfaeab7d4ce3e144ddae3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Nov 2025 03:17:39 +0100 Subject: [PATCH 229/542] python3Packages.clarifai-protocol: fix eval with python314 Properly throw when we have no src hash for wheel flavor. --- .../clarifai-protocol/default.nix | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-protocol/default.nix b/pkgs/development/python-modules/clarifai-protocol/default.nix index 16efdbca2878..d3036cb894ae 100644 --- a/pkgs/development/python-modules/clarifai-protocol/default.nix +++ b/pkgs/development/python-modules/clarifai-protocol/default.nix @@ -18,23 +18,34 @@ let "x86_64-darwin" = "macosx_11_0_universal2"; }; - hashes = { - "39-x86_64-linux" = "sha256-uGbsxSHGfYVzRiy1YEkQMkJi2yPLdSj3fe3adp1WjP0="; - "310-x86_64-linux" = "sha256-1SO/1lpB3aRWisxFlt8K5lwFEOiDXjC4iQRai77L+8E="; - "311-x86_64-linux" = "sha256-99VdM1fAcuiblReWL5I8+H0psCKR00HYZr/wRGT7nd8="; - "312-x86_64-linux" = "sha256-bbggF4rGDrXOpSegreFHgK0H/z7xaR9hb7z6SYp7nlU="; - "313-x86_64-linux" = "sha256-M9/t7JgIjh7yiZeEq9K2tGQ4oLneVhXf0rUfL8p09Tg="; - "39-aarch64-linux" = "sha256-wuEncCbqWdqO72zovzHrmb34on73eaQgFBmQZdUnwkE="; - "310-aarch64-linux" = "sha256-uLHEEPcVakctNT428pNlaq0yKDpvMLynDP2lDobiebA="; - "311-aarch64-linux" = "sha256-d2A4mKP4Dlnm6J31wPyAHg8d5MjFF4wcREe5FVFeayU="; - "312-aarch64-linux" = "sha256-aW295fQogAjaVK6saHhduKsVsncIv4BsfRW6qHlyb3g="; - "313-aarch64-linux" = "sha256-mloW8TGkBJWXqO6xOqHhra3ZXuGQWf6dEGSrkdD0sb0="; - "39-darwin" = "sha256-uU9RGo5glYOPp8nEYqj4c1TB3Xa1KwrNWMqNDpJsSjY="; - "310-darwin" = "sha256-80U0geHKJLVhhmvHayXWHWaV9ifJjWtR9mbwCUDfPu0="; - "311-darwin" = "sha256-kM2YVzPa22QgIRV4zP4kcvTE8al/RW0Oo6lyxJl3JxU="; - "312-darwin" = "sha256-t4qbP5wqE8cgkvN+vG6zOeS+s5+U/GjmbeeHytIo9/o="; - "313-darwin" = "sha256-ds2kj87miODVUE8Lrjuzz8L+2HxaQ7jTxGQF0/Odrpg="; - }; + key = + if stdenv.hostPlatform.isDarwin then + "${pythonVersionNoDot}-darwin" + else + "${pythonVersionNoDot}-${stdenv.hostPlatform.system}"; + + hash = + { + "39-x86_64-linux" = "sha256-uGbsxSHGfYVzRiy1YEkQMkJi2yPLdSj3fe3adp1WjP0="; + "310-x86_64-linux" = "sha256-1SO/1lpB3aRWisxFlt8K5lwFEOiDXjC4iQRai77L+8E="; + "311-x86_64-linux" = "sha256-99VdM1fAcuiblReWL5I8+H0psCKR00HYZr/wRGT7nd8="; + "312-x86_64-linux" = "sha256-bbggF4rGDrXOpSegreFHgK0H/z7xaR9hb7z6SYp7nlU="; + "313-x86_64-linux" = "sha256-M9/t7JgIjh7yiZeEq9K2tGQ4oLneVhXf0rUfL8p09Tg="; + "314-x86_64-linux" = ""; + "39-aarch64-linux" = "sha256-wuEncCbqWdqO72zovzHrmb34on73eaQgFBmQZdUnwkE="; + "310-aarch64-linux" = "sha256-uLHEEPcVakctNT428pNlaq0yKDpvMLynDP2lDobiebA="; + "311-aarch64-linux" = "sha256-d2A4mKP4Dlnm6J31wPyAHg8d5MjFF4wcREe5FVFeayU="; + "312-aarch64-linux" = "sha256-aW295fQogAjaVK6saHhduKsVsncIv4BsfRW6qHlyb3g="; + "313-aarch64-linux" = "sha256-mloW8TGkBJWXqO6xOqHhra3ZXuGQWf6dEGSrkdD0sb0="; + "314-aarch64-linux" = ""; + "39-darwin" = "sha256-uU9RGo5glYOPp8nEYqj4c1TB3Xa1KwrNWMqNDpJsSjY="; + "310-darwin" = "sha256-80U0geHKJLVhhmvHayXWHWaV9ifJjWtR9mbwCUDfPu0="; + "311-darwin" = "sha256-kM2YVzPa22QgIRV4zP4kcvTE8al/RW0Oo6lyxJl3JxU="; + "312-darwin" = "sha256-t4qbP5wqE8cgkvN+vG6zOeS+s5+U/GjmbeeHytIo9/o="; + "313-darwin" = "sha256-ds2kj87miODVUE8Lrjuzz8L+2HxaQ7jTxGQF0/Odrpg="; + "314-darwin" = ""; + } + .key or (throw "clarifai-protocol: unsupported system/python (${key}) version combination"); in buildPythonPackage rec { pname = "clarifai-protocol"; @@ -49,12 +60,7 @@ buildPythonPackage rec { abi = "cp${pythonVersionNoDot}"; dist = "cp${pythonVersionNoDot}"; platform = systemToPlatform.${stdenv.hostPlatform.system} or (throw "unsupported system"); - hash = - if stdenv.hostPlatform.isDarwin then - hashes."${pythonVersionNoDot}-darwin" - else - hashes."${pythonVersionNoDot}-${stdenv.hostPlatform.system}" - or (throw "unsupported system/python version combination"); + inherit hash; }; nativeBuildInputs = [ From 16812a18f98c1600f9c9a37a729f946bd7d0d816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 5 Nov 2025 22:59:04 -0800 Subject: [PATCH 230/542] python3Packages.dacite: fix tests on Python 3.14 --- pkgs/development/python-modules/dacite/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix index ffc7deb5fe34..a90274f50d96 100644 --- a/pkgs/development/python-modules/dacite/default.nix +++ b/pkgs/development/python-modules/dacite/default.nix @@ -2,16 +2,15 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, pytestCheckHook, + pythonAtLeast, + setuptools, }: buildPythonPackage rec { pname = "dacite"; version = "1.9.2"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "konradhalas"; @@ -23,8 +22,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "--benchmark-autosave --benchmark-json=benchmark.json" "" + '' + + lib.optionalString (pythonAtLeast "3.14") '' + substituteInPlace tests/core/test_union.py \ + --replace-fail "typing.Union[int, str]" "int | str" ''; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "dacite" ]; From 6be9b99dbc680f65685b75a5bd92266e7fadfd9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 5 Nov 2025 23:02:08 -0800 Subject: [PATCH 231/542] python3Packages.ciso8601: 2.3.2 -> 2.3.3 Diff: https://github.com/closeio/ciso8601/compare/v2.3.2...v2.3.3 Changelog: https://github.com/closeio/ciso8601/blob/v2.3.3/CHANGELOG.md --- pkgs/development/python-modules/ciso8601/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix index 2ee7f02383e6..9bdc7cea16f3 100644 --- a/pkgs/development/python-modules/ciso8601/default.nix +++ b/pkgs/development/python-modules/ciso8601/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ciso8601"; - version = "2.3.2"; + version = "2.3.3"; pyproject = true; src = fetchFromGitHub { owner = "closeio"; repo = "ciso8601"; tag = "v${version}"; - hash = "sha256-oVnQ0vHhWs8spfOnJOgTJ6MAHcY8VGZHZ0E/T8JsKqE="; + hash = "sha256-14HiCn8BPALPaW53k118lHb5F4oG9mMNN6sdLdKB6v0="; }; build-system = [ setuptools ]; From e1ca4653fa782270df51574649461232c28b201c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 5 Nov 2025 23:08:33 -0800 Subject: [PATCH 232/542] python3Packages.capturer: fix tests on Python 3.14 --- .../python-modules/capturer/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index b9895dd18f97..ad9cd3e0ecfd 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -3,14 +3,16 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, humanfriendly, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "capturer"; version = "3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "xolox"; @@ -19,7 +21,18 @@ buildPythonPackage rec { sha256 = "0fwrxa049gzin5dck7fvwhdp1856jrn0d7mcjcjsd7ndqvhgvjj1"; }; - propagatedBuildInputs = [ humanfriendly ]; + patches = [ + # https://github.com/xolox/python-capturer/pull/16 + (fetchpatch { + name = "python314-compat.patch"; + url = "https://github.com/xolox/python-capturer/commit/3d0a9a040ecaa78ce2d39ec76ff5084ee7be6653.patch"; + hash = "sha256-NW+X6wdXMHSLswO7M7/YeIyHu+EDYTLJE/mBkqyhKUM="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ humanfriendly ]; # hangs on darwin doCheck = !stdenv.hostPlatform.isDarwin; From fab1afedd4bfcd8a2c51fed9ae14332ada8425ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Nov 2025 01:13:37 +0100 Subject: [PATCH 233/542] python3Packages.uvicorn: 0.35.0 -> 0.38.0 https://github.com/encode/uvicorn/blob/0.38.0/CHANGELOG.md --- pkgs/development/python-modules/uvicorn/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index ed7eb42839f7..cdd138f9df68 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -18,16 +18,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.35.0"; - disabled = pythonOlder "3.8"; - + version = "0.38.0"; pyproject = true; src = fetchFromGitHub { owner = "encode"; repo = "uvicorn"; tag = version; - hash = "sha256-6tuLL0KMggujYI97HSSBHjiLrePwEkxFHjq2HWl8kqE="; + hash = "sha256-A0YpFA/Oug5a37+33ac8++lh30jzRl48IhC8pflZ0S0="; }; outputs = [ From e02d5f29f0d28a9290ed9bbc2ca9f25f0813d067 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Nov 2025 01:39:46 +0100 Subject: [PATCH 234/542] python3Packages.starlette: 0.47.2 -> 0.50.0 https://www.starlette.io/release-notes/#0500 --- pkgs/development/python-modules/starlette/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index c327f0bf46db..ded7d6534096 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -28,16 +28,14 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.47.2"; + version = "0.50.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "encode"; repo = "starlette"; tag = version; - hash = "sha256-FseSZrLWuNaLro2iLMcfiCrbx2Gz8+aEmLaSk/+PgN4="; + hash = "sha256-8REOizYQQkyLZwV4/yRiNGmGV07V0NNky7gtiAdWa7o="; }; build-system = [ hatchling ]; From e8634318d011ca9364c347796cc4914633080c36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Nov 2025 01:41:04 +0100 Subject: [PATCH 235/542] python3Packages.uvicorn-worker: 0.3.0 -> 0.4.0 https://github.com/Kludex/uvicorn-worker/releases/tag/0.4.0 --- pkgs/development/python-modules/uvicorn-worker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uvicorn-worker/default.nix b/pkgs/development/python-modules/uvicorn-worker/default.nix index 320dee57a853..28a680bc4ea3 100644 --- a/pkgs/development/python-modules/uvicorn-worker/default.nix +++ b/pkgs/development/python-modules/uvicorn-worker/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "uvicorn-worker"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Kludex"; repo = "uvicorn-worker"; tag = version; - hash = "sha256-a5L4H1Bym5Dx9/pGL/Vz6ZO699t/1Wmc1ExIb0t/ISc="; + hash = "sha256-qfk3lkHwuGbRWj4D65EontmEgKtk7ILq6gZCrxcrrJU="; }; build-system = [ hatchling ]; From edecdd9e3f3ee4c3048bf55ed5ef796baf5fb370 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 00:38:36 +0100 Subject: [PATCH 236/542] python3Packages.pydantic-extra-types: 2.10.5 -> 2.10.6 https://github.com/pydantic/pydantic-extra-types/blob/v2.10.6/HISTORY.md --- .../pydantic-extra-types/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix index 7ca5fb4a06aa..fe6cde0e3210 100644 --- a/pkgs/development/python-modules/pydantic-extra-types/default.nix +++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -6,6 +6,7 @@ hatchling, pydantic, typing-extensions, + cron-converter, semver, pendulum, phonenumbers, @@ -13,19 +14,20 @@ pymongo, python-ulid, pytz, + tzdata, pytestCheckHook, }: buildPythonPackage rec { pname = "pydantic-extra-types"; - version = "2.10.5"; + version = "2.10.6"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-extra-types"; tag = "v${version}"; - hash = "sha256-05yGIAgN/sW+Nj7F720ZAHeMz/AyvwHMfzp4OdLREe4="; + hash = "sha256-g2a7tfldt39RCZxd9ta/JTPYnfZTTsLE6kA2fuo3fFg="; }; build-system = [ hatchling ]; @@ -37,6 +39,7 @@ buildPythonPackage rec { optional-dependencies = { all = [ + cron-converter pendulum phonenumbers pycountry @@ -44,7 +47,9 @@ buildPythonPackage rec { python-ulid pytz semver + tzdata ]; + cron = [ cron-converter ]; phonenumbers = [ phonenumbers ]; pycountry = [ pycountry ]; semver = [ semver ]; @@ -52,6 +57,15 @@ buildPythonPackage rec { pendulum = [ pendulum ]; }; + pytestFlags = [ + "-Wignore::DeprecationWarning" + ]; + + disabledTests = [ + # https://github.com/pydantic/pydantic-extra-types/issues/346 + "test_json_schema" + ]; + pythonImportsCheck = [ "pydantic_extra_types" ]; nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; From 12928b102faa922572b54977d9b8f0bec4f76f5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 00:42:03 +0100 Subject: [PATCH 237/542] python3Packages.annotated-doc: init at 0.0.3 New dependency for fastapi. --- .../python-modules/annotated-doc/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/annotated-doc/default.nix diff --git a/pkgs/development/python-modules/annotated-doc/default.nix b/pkgs/development/python-modules/annotated-doc/default.nix new file mode 100644 index 000000000000..d3e9777a97e1 --- /dev/null +++ b/pkgs/development/python-modules/annotated-doc/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + uv-build, + pytestCheckHook, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "annotated-doc"; + version = "0.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fastapi"; + repo = "annotated-doc"; + tag = version; + hash = "sha256-PFB+GqFRe5vF8xoWJPsXligSpzkUIt8TOqsmrKlfwyc="; + }; + + build-system = [ + uv-build + ]; + + nativeCheckInputs = [ + pytestCheckHook + typing-extensions + ]; + + pythonImportsCheck = [ + "annotated_doc" + ]; + + meta = { + description = "Document parameters, class attributes, return types, and variables inline, with Annotated"; + homepage = "https://github.com/fastapi/annotated-doc"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d556f008d00..2c3cc9b4cc97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -702,6 +702,8 @@ self: super: with self; { annexremote = callPackage ../development/python-modules/annexremote { }; + annotated-doc = callPackage ../development/python-modules/annotated-doc { }; + annotated-types = callPackage ../development/python-modules/annotated-types { }; annotatedyaml = callPackage ../development/python-modules/annotatedyaml { }; From 5a8cbd2150aa61fa4c1d019c0611c979852b730e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 00:50:46 +0100 Subject: [PATCH 238/542] python3Packages.fastapi: 0.116.1 -> 0.121.1 https://github.com/fastapi/fastapi/releases/tag/0.121.1 --- pkgs/development/python-modules/fastapi/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 77246fb7eb78..948c6363cbdd 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -8,6 +8,7 @@ pdm-backend, # dependencies + annotated-doc, starlette, pydantic, typing-extensions, @@ -18,6 +19,7 @@ flask, inline-snapshot, passlib, + pwdlib, pyjwt, pytest-asyncio, pytestCheckHook, @@ -41,7 +43,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.116.1"; + version = "0.121.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,7 +52,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; tag = version; - hash = "sha256-sd0SnaxuuF3Zaxx7rffn4ttBpRmWQoOtXln/amx9rII="; + hash = "sha256-uUUARIHY8VBoLfWfMvveapypqiB00cTTWpJ4fi9nvUo="; }; build-system = [ pdm-backend ]; @@ -61,6 +63,7 @@ buildPythonPackage rec { ]; dependencies = [ + annotated-doc starlette pydantic typing-extensions @@ -103,6 +106,7 @@ buildPythonPackage rec { flask inline-snapshot passlib + pwdlib pyjwt pytestCheckHook pytest-asyncio From 89c216599afd8f47017e9bb3331efe993c44ce36 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 9 Nov 2025 23:22:40 +0900 Subject: [PATCH 239/542] python314Packages.trio: fix build jedi has no compatibility with Python 3.14 yet, so conditionally include it only for older Python versions to allow trio to build successfully. --- pkgs/development/python-modules/trio/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 99a6a5e5d221..c6a6fd857fb0 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -63,13 +63,15 @@ buildPythonPackage rec { nativeCheckInputs = [ astor - jedi pyopenssl pytestCheckHook pytest-trio' pyyaml trustme - ]; + ] + # jedi has no compatibility with python 3.14 yet + # https://github.com/davidhalter/jedi/issues/2064 + ++ lib.optional (pythonOlder "3.14") jedi; preCheck = '' export HOME=$TMPDIR From f00478cf69458d9142dd710c63bad2536082313a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 9 Nov 2025 23:30:34 +0900 Subject: [PATCH 240/542] python314Packages.async-lru: fix build --- pkgs/development/python-modules/async-lru/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index e86fa73e88e4..7f79a96c3768 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch2, setuptools, typing-extensions, pytestCheckHook, @@ -23,6 +24,15 @@ buildPythonPackage rec { hash = "sha256-FJ1q6W9IYs0OSMZc+bI4v22hOAAWAv2OW3BAqixm8Hs="; }; + patches = [ + (fetchpatch2 { + # https://github.com/aio-libs/async-lru/issues/635 + name = "python314-compatibility.patch"; + url = "https://github.com/aio-libs/async-lru/commit/4df3785d3e5210ce6277b3137c4625cd73918088.patch"; + hash = "sha256-B9KCJPbiZTQJrnxC/7VI+jgr2PKfwOmS7naXZwKtF9c="; + }) + ]; + build-system = [ setuptools ]; dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; From 649a3997f751a8b007eb8caa3ee78d250fd1f768 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 9 Nov 2025 23:49:22 +0900 Subject: [PATCH 241/542] python314Packages.anyio: fix test --- pkgs/development/python-modules/anyio/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 2565129d2215..1e971d6d42cf 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -77,6 +77,9 @@ buildPythonPackage rec { pytestFlags = [ "-Wignore::trio.TrioDeprecationWarning" + # DeprecationWarning for asyncio.iscoroutinefunction is propagated from uvloop used internally + # https://github.com/agronholm/anyio/commit/e7bb0bd496b1ae0d1a81b86de72312d52e8135ed + "-Wignore::DeprecationWarning" ]; disabledTestMarks = [ From ac5d83b6b75b1331a050952e5c515de777bf0f4d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 14:34:24 +0100 Subject: [PATCH 242/542] python3Packages.astroid: 3.3.11 -> 4.0.1 https://github.com/PyCQA/astroid/blob/v4.0.1/ChangeLog --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 645fa378aea7..feeea934a2a2 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "3.3.11"; # Check whether the version is compatible with pylint + version = "4.0.1"; # Check whether the version is compatible with pylint pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "astroid"; tag = "v${version}"; - hash = "sha256-lv+BQDYP7N4UGMf7XhB6HVDORPU0kZQPYveQWOcAqfQ="; + hash = "sha256-Ulifj+ym0j0LqhmKPfM8vVCjz71Gwd483ke3PkMnHb8="; }; nativeBuildInputs = [ setuptools ]; From 568fb3c70b569d577ab232ab34fb6e3d31bb036e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 14:58:36 +0100 Subject: [PATCH 243/542] python3Packages.pylint: 3.3.7 -> 4.0.2 https://github.com/pylint-dev/pylint/releases/tag/v4.0.2 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 78cfec1a22be..698da478fced 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "3.3.7"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "pylint-dev"; repo = "pylint"; tag = "v${version}"; - hash = "sha256-EMLnwFurIhTdUJqy9/DLTuucDhlmA5fCPZZ6TA87nEU="; + hash = "sha256-DzS5ORhFWmA+eEhGDdpXdHLgWTfw198S7pQueBk44Cw="; }; build-system = [ setuptools ]; From 20f3082d0c4cbed7bb047f1e8ba822a0019fe5b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 15:06:40 +0100 Subject: [PATCH 244/542] python3Packages.dill: 0.4.0 -> 0.4.0-unstable-2025-11-09 https://github.com/uqfoundation/dill/releases/tag/dill-0.4.0-unstable-2025-11-09 --- pkgs/development/python-modules/dill/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 03fc031da56e..3f1886dc61f6 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, python, - pythonAtLeast, setuptools, # passthru tests @@ -13,17 +12,14 @@ buildPythonPackage rec { pname = "dill"; - version = "0.4.0"; - format = "pyproject"; - - # https://github.com/uqfoundation/dill/issues/586 - disabled = pythonAtLeast "3.14"; + version = "0.4.0-unstable-2025-11-09"; + pyproject = true; src = fetchFromGitHub { owner = "uqfoundation"; repo = "dill"; - tag = version; - hash = "sha256-RIyWTeIkK5cS4Fh3TK48XLa/EU9Iwlvcml0CTs5+Uh8="; + rev = "d948ecd748772f2812361982ec1496da0cd47b53"; + hash = "sha256-/A84BpZnwSwsEYqLL0Xdf8OjJtg1UMu6dig3QEN+n1A="; }; nativeBuildInputs = [ setuptools ]; From 41c694a14cadc4995d1f64f4df5459d3aaf931fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 15:07:26 +0100 Subject: [PATCH 245/542] python3Packages.eradicate: 3.0.0 -> 3.0.1 https://github.com/wemake-services/eradicate/releases/tag/3.0.1 --- .../development/python-modules/eradicate/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index 621f0bdb5dd8..cde043f56791 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -2,24 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "eradicate"; - version = "3.0.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "wemake-services"; repo = "eradicate"; tag = version; - hash = "sha256-V3g9qYM/TiOz83IMoUwu0CvFWBxB5Yk3Dy3G/Dz3vYw="; + hash = "sha256-D9V9PQ3HVmShmPgTInOJaVmujy1fQyQn6qYn/Pa0kMg="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "eradicate" ]; From 35aa6adac8ad991ea55103ea8a21303194699782 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 15:19:52 +0100 Subject: [PATCH 246/542] python3Packages.asttokens: 3.0.0 -> 3.0.0-unstable-2025-11-08 Fast-forward for Python 3.14 support. --- .../python-modules/asttokens/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index b8ec38924bbc..1124145ba9ce 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -2,24 +2,25 @@ lib, astroid, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage { pname = "asttokens"; - version = "3.0.0"; + version = "3.0.0-unstable-2025-11-08"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-Dc2Lqo1isMHRGLOZst26PEr/Jx0Nep4NTBaBx5A1u8c="; + src = fetchFromGitHub { + owner = "gristlabs"; + repo = "asttokens"; + rev = "f859c055e8453650e1987c5aefaaec36582d3a07"; + hash = "sha256-dHtKyd5rj1Y7m1vTL9toyQ+GLV5fBNUFNkBM9t4e8yM="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = "3.0.0"; + build-system = [ setuptools-scm ]; nativeCheckInputs = [ From c88688de9cf00e0fa4a2ade5eaa442486aac1b83 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 16:20:12 +0100 Subject: [PATCH 247/542] python314Packages.jedi: disable failing tests --- .../python-modules/jedi/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 0c51b535ea88..dc6b87d43a9c 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - pythonOlder, + pythonAtLeast, fetchFromGitHub, # build-system @@ -21,8 +21,6 @@ buildPythonPackage rec { version = "0.19.2"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi"; @@ -57,6 +55,20 @@ buildPythonPackage rec { "test_dict_completion" ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [ + # Jedi.api.environment.InvalidPythonEnvironment: The python binary is potentially unsafe + "test/test_inference/test_sys_path.py::test_venv_and_pths" + "test/test_api/test_environment.py::test_create_environment_venv_path" + "test/test_api/test_environment.py::test_create_environment_executable" + # can't find system env nor venv + "test/test_api/test_environment.py::test_find_system_environments" + "test/test_api/test_environment.py::test_scanning_venvs" + # https://github.com/davidhalter/jedi/issues/2064 + "test/test_api/test_interpreter.py::test_string_annotation" + # type repr mismatch: Union[Type, int] vs Type | int + "test/test_inference/test_mixed.py::test_compiled_signature_annotation_string" + ]; + meta = with lib; { description = "Autocompletion tool for Python that can be used for text editors"; homepage = "https://github.com/davidhalter/jedi"; From d509596d0af1c594d3c78b973a2d2839952efddc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 17:36:33 +0100 Subject: [PATCH 248/542] python3Packages.django-ninja: 1.4.3t -> 1.4.5 https://github.com/vitalik/django-ninja/releases/tag/v1.4.5 --- pkgs/development/python-modules/django-ninja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix index 8813c6d2f9fa..b81cf6f9830f 100644 --- a/pkgs/development/python-modules/django-ninja/default.nix +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "django-ninja"; - version = "1.4.3t"; + version = "1.4.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vitalik"; repo = "django-ninja"; tag = "v${version}"; - hash = "sha256-IiOj2fBuClHyIdn/r3XxKwO+DyrgahagUKrxp+YKZ4E="; + hash = "sha256-C54Y5Rmhk9trEeNhE+i3aeKcnoeUc6BqFbp3dzL9xjA="; }; build-system = [ flit-core ]; From 403bc4fa607bdbfce5ba74b89682321d2f68342e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 20:34:21 +0100 Subject: [PATCH 249/542] python3Packages.pip: 25.0.1 -> 25.3 https://pip.pypa.io/en/stable/news/#v25-3 --- pkgs/development/python-modules/pip/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index dd789fdb9727..f4c66ee881e3 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -6,8 +6,7 @@ # build-system installShellFiles, - wheel, - setuptools, + flit-core, # docs sphinx, @@ -32,14 +31,14 @@ let self = buildPythonPackage rec { pname = "pip"; - version = "25.0.1"; - format = "pyproject"; + version = "25.3"; + pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "pip"; tag = version; - hash = "sha256-V069rAL6U5KBnSc09LRCu0M7qQCH5NbMghVttlmIoRY="; + hash = "sha256-aHV4j9OMLD6I6Fe6A04bE7xk6eS5CxeUEw4Psqj7xz0="; }; postPatch = '' @@ -50,8 +49,6 @@ let nativeBuildInputs = [ installShellFiles - setuptools - wheel ] ++ lib.optionals (pythonAtLeast "3.11") [ # docs @@ -60,6 +57,8 @@ let sphinx-issues ]; + build-system = [ flit-core ]; + outputs = [ "out" ] From 350ea6f84319c50bf6293539434c26e76df0a563 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Nov 2025 01:40:35 +0100 Subject: [PATCH 250/542] python3Packages.argparse-manpage: disable failing tests --- pkgs/development/python-modules/argparse-manpage/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix index 5b4fbdaeff6e..b067a20c59d7 100644 --- a/pkgs/development/python-modules/argparse-manpage/default.nix +++ b/pkgs/development/python-modules/argparse-manpage/default.nix @@ -41,6 +41,11 @@ buildPythonPackage rec { "test_old_example_file_name" ]; + disabledTestPaths = [ + # network access to install setuptools, likely due to pip update + "tests/test_examples.py" + ]; + pythonImportsCheck = [ "argparse_manpage" ]; optional-dependencies = { From f02c7304aa03338a5c7cc62c41e93ddfe9f711f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Nov 2025 02:28:28 +0100 Subject: [PATCH 251/542] Revert "python3Packages.pip: 25.0.1 -> 25.3" This reverts commit 3f493a2b8dda0c9b564f96b5f7c4dc22c93c6d71. --- pkgs/development/python-modules/pip/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index f4c66ee881e3..dd789fdb9727 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -6,7 +6,8 @@ # build-system installShellFiles, - flit-core, + wheel, + setuptools, # docs sphinx, @@ -31,14 +32,14 @@ let self = buildPythonPackage rec { pname = "pip"; - version = "25.3"; - pyproject = true; + version = "25.0.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "pip"; tag = version; - hash = "sha256-aHV4j9OMLD6I6Fe6A04bE7xk6eS5CxeUEw4Psqj7xz0="; + hash = "sha256-V069rAL6U5KBnSc09LRCu0M7qQCH5NbMghVttlmIoRY="; }; postPatch = '' @@ -49,6 +50,8 @@ let nativeBuildInputs = [ installShellFiles + setuptools + wheel ] ++ lib.optionals (pythonAtLeast "3.11") [ # docs @@ -57,8 +60,6 @@ let sphinx-issues ]; - build-system = [ flit-core ]; - outputs = [ "out" ] From 399a37aabe5c2ffae680fca97a32e209c5afef7a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Nov 2025 03:19:58 +0100 Subject: [PATCH 252/542] python3Packages.pip-tools: 7.4.1 -> 7.5.1-unstable-2025-11-08 https://github.com/jazzband/pip-tools/releases/tag/v7.5.0 https://github.com/jazzband/pip-tools/releases/tag/v7.5.1 --- .../python-modules/pip-tools/default.nix | 31 ++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 594d00194db2..8b75e1b35691 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -4,8 +4,7 @@ buildPythonPackage, build, click, - fetchPypi, - fetchpatch, + fetchFromGitHub, pep517, pip, pytest-xdist, @@ -20,33 +19,22 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "7.4.1"; + version = "7.5.1-unstable-2025-11-08"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-hkgm9Qc4ZEUOJNvuuFzjkgzfsJhIo9aev1N7Uh8UvMk="; + src = fetchFromGitHub { + owner = "jazzband"; + repo = "pip-tools"; + rev = "785ed5e30f4c86c24141898553a356402b142adf"; + hash = "sha256-2mYUjLqrpN/sjR79t/ZIfpvVXAgpk/tpZWFcT/6e7uk="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch - - # Backport click 8.2 + 8.3 compatibility from 7.5.1 - # We can't update to 7.5.1 because of https://github.com/jazzband/pip-tools/issues/2231, - # which breaks home-assisstant-chip-wheels. - (fetchpatch { - url = "https://github.com/jazzband/pip-tools/commit/c7f128e7c533033c2436b52c972eee521fe3890c.diff"; - excludes = [ "pyproject.toml" ]; - hash = "sha256-cIFAE/VKyyDWVQktPtPPuxY85DtTvH6pK539WD2cDn4="; - }) - (fetchpatch { - url = "https://github.com/jazzband/pip-tools/commit/816ee196c543be53ddba0ea33fb4c7e84217b3b3.diff"; - hash = "sha256-3GTUNWoy/AmpWv7NUCWIZ+coxb1vUgg6CZhwh6FehZo="; - }) ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = "7.5.1"; + build-system = [ setuptools-scm ]; dependencies = [ @@ -80,6 +68,7 @@ buildPythonPackage rec { "test_bad_setup_file" # Assertion error "test_compile_recursive_extras" + "test_compile_build_targets_setuptools_no_wheel_dep" "test_combine_different_extras_of_the_same_package" "test_diff_should_not_uninstall" "test_cli_compile_all_extras_with_multiple_packages" From e03ed4631b9762dacae718b3cceaf5e57f32efce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Nov 2025 16:01:18 -0800 Subject: [PATCH 253/542] python3Packages.rapidfuzz: 3.14.2 -> 3.14.3 Diff: https://github.com/maxbachmann/RapidFuzz/compare/v3.14.2...v3.14.3 Changelog: https://github.com/maxbachmann/RapidFuzz/blob/v3.14.3/CHANGELOG.rst --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 14b7750358f9..1d7ecaf813a2 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.14.2"; + version = "3.14.3"; pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; tag = "v${version}"; - hash = "sha256-hnVSlKZxl4WE/YjobUg81qcuet8j5gZndCQdKLpOS8Y="; + hash = "sha256-DOXeZaD21Qsum4brBlMSFcBAUbNEOgCXc6AqEboP1e4="; }; patches = [ From 6e9e0b372854608b5837dd82e213a67a32570441 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Nov 2025 17:06:44 +0100 Subject: [PATCH 254/542] python314Packages.distutils: disable failing test --- pkgs/development/python-modules/distutils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/distutils/default.nix b/pkgs/development/python-modules/distutils/default.nix index 33d0aed2d89e..d39c5be3d97d 100644 --- a/pkgs/development/python-modules/distutils/default.nix +++ b/pkgs/development/python-modules/distutils/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, setuptools-scm, setuptools, python, @@ -61,6 +62,11 @@ buildPythonPackage { # jaraco-path depends ob pyobjc doCheck = !stdenv.hostPlatform.isDarwin; + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # AssertionError: assert '(?s:foo[^/]*)\\z' == '(?s:foo[^/]*)\\Z' + "test_glob_to_re" + ]; + meta = { description = "Distutils as found in cpython"; homepage = "https://github.com/pypa/distutils"; From 5521119ae87548e57650d8ba738e3d2992ebe4cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Nov 2025 19:14:32 +0100 Subject: [PATCH 255/542] python3Packages.executing: 2.2.0 -> 2.2.1 https://github.com/alexmojaki/executing/compare/v2.2.0...v2.2.1 --- .../python-modules/executing/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index edf61a807868..9aa684389e96 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonAtLeast, pythonOlder, @@ -19,26 +18,16 @@ buildPythonPackage rec { pname = "executing"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "alexmojaki"; repo = "executing"; rev = "v${version}"; - hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g="; + hash = "sha256-UlXuXBW9TmJ0xG/0yMdx8EDQDSzVgtsgFJIj/O7pmio="; }; - patches = [ - (fetchpatch { - name = "pytest-8.4.1-compat.patch"; - url = "https://github.com/alexmojaki/executing/commit/fae0dd2f4bd0e74b8a928e19407fd4167f4b2295.patch"; - hash = "sha256-ccYBeP4yXf3U4sRyeGUYhLz7QHbXFiMviQ1n+AIVMdo="; - }) - ]; - build-system = [ setuptools setuptools-scm @@ -59,9 +48,6 @@ buildPythonPackage rec { # if the test runs fast enough. That makes the test flaky when # running on slow systems or cross- / emulated building "test_many_source_for_filename_calls" - - # https://github.com/alexmojaki/executing/issues/91 - "test_exception_catching" ]; pythonImportsCheck = [ "executing" ]; From 3095fa5abd921c70db0de682fbc339738adb2e7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Nov 2025 19:31:03 +0100 Subject: [PATCH 256/542] maturin: 1.9.6 -> 1.10.0 https://github.com/PyO3/maturin/blob/v1.10.0/Changelog.md --- pkgs/build-support/rust/hooks/maturin-build-hook.sh | 7 ++++++- pkgs/by-name/ma/maturin/package.nix | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 57e4e12b4f1e..3f4625a4bc32 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -23,11 +23,16 @@ maturinBuildHook() { "--target" "@rustcTargetSpec@" "--manylinux" "off" "--strip" - "--release" "--out" "$dist" "--interpreter" "$interpreter_name" ) + if [ -n "${maturinBuildProfile}" ]; then + flagsArray+=("--profile" "${maturinBuildProfile}") + else + flagsArray+=("--release") + fi + concatTo flagsArray maturinBuildFlags echoCmd 'maturinBuildHook flags' "${flagsArray[@]}" diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 51d013195197..0ef8df0dc624 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.9.6"; + version = "1.10.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-hMMX59nq9Wusb0XZb8i5/EmQiPL4WopuZX7maycj0J4="; + hash = "sha256-txbMVkbws/3mvYsxf332WhTymsVdr6JlgQoi85e4pgE="; }; - cargoHash = "sha256-hNFbRtt/sVlEffu7RgXxC1NHzakP8miMyHIV/cf4sfM="; + cargoHash = "sha256-2eLzT9Ozz7p43hbysoE5isLuithqJhvo8TfRZnklzf4="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv From 10a882e1ad93a0723443000ad4baae2c4c3d8462 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Nov 2025 15:39:15 +0100 Subject: [PATCH 257/542] python3Packages.uv-build: 0.9.7 -> 0.9.8 https://github.com/astral-sh/uv/blob/0.9.8/CHANGELOG.md --- pkgs/development/python-modules/uv-build/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/uv-build/default.nix b/pkgs/development/python-modules/uv-build/default.nix index e9111bd69b13..0ebef2a455ba 100644 --- a/pkgs/development/python-modules/uv-build/default.nix +++ b/pkgs/development/python-modules/uv-build/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "uv-build"; - version = "0.9.7"; + version = "0.9.8"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-I0Oe6vaH7iQh+Ubp5RIk8Ol6Ni7OPu8HKX0fqLdewyk="; + hash = "sha256-e7yvEQggfBLq4akqnVoZTfvcpZLlbQRWr2fruGfF/N4="; }; nativeBuildInputs = [ @@ -26,13 +26,13 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-K/RP7EA0VAAI8TGx+VwfKPmyT6+x4p3kekuoMZ0/egc="; + hash = "sha256-lEGhXwzotvCuDAvVyrt22e/ReotWT7m1lt6d2GL8lFU="; }; buildAndTestSubdir = "crates/uv-build"; # $src/.github/workflows/build-binaries.yml#L139 - maturinBuildFlags = [ "--profile=minimal-size" ]; + maturinBuildProfile = "minimal-size"; pythonImportsCheck = [ "uv_build" ]; From 91b8bef98cb1a5209f13116eff56376749c99f87 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Nov 2025 16:53:23 +0100 Subject: [PATCH 258/542] python3Packages.pdm-backend: 2.4.5 -> 2.4.6 https://github.com/pdm-project/pdm-backend/releases/tag/2.4.6 --- pkgs/development/python-modules/pdm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 8e536996aca7..0134f2c98beb 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.4.5"; + version = "2.4.6"; pyproject = true; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; tag = version; - hash = "sha256-tXgojVE/Bh2OVeMG/P5aCK5HEeUhiypUjTrS4yOwvZU="; + hash = "sha256-lR3ZxwPvyv/Ffez6cfz8Gzc6h4PeqmgsTGNEVv9K+tU="; }; env.PDM_BUILD_SCM_VERSION = version; From 565948bedf7650f65c0d428b10bec0efb37ff878 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Nov 2025 17:14:24 +0100 Subject: [PATCH 259/542] python3Packages.sentry-sdk: 2.43.0 -> 2.44.0 https://github.com/getsentry/sentry-python/blob/2.44.0/CHANGELOG.md --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 0745d055e92a..d8ab7be9eb8f 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -67,14 +67,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "2.43.0"; + version = "2.44.0"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; tag = version; - hash = "sha256-ua/ojnyKZXnc1li65EMmPzhmY2Pu8B7A/NXlBzzPyRQ="; + hash = "sha256-i2rd4JFcGYToWMJeOuHaCKnwKtC/LFrpnWCf1taGqhc="; }; postPatch = '' From 03f76f410eee146ec1e61ebaabf90b993e930eb8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 01:16:11 +0100 Subject: [PATCH 260/542] python314Packages.pytest-subprocess: fix tests --- .../python-modules/pytest-subprocess/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index 9b61a0526f83..d32aca5b45e4 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, setuptools, pytest, pytestCheckHook, @@ -28,6 +29,14 @@ buildPythonPackage rec { hash = "sha256-3vBYOk/P78NOjAbs3fT6py5QOOK3fX+AKtO4j5vxZfk="; }; + patches = [ + (fetchpatch { + # python 3.14 compat + url = "https://github.com/aklajnert/pytest-subprocess/commit/be30d9a94ba45afb600717e3fcd95b8b2ff2c60e.patch"; + hash = "sha256-TYk/Zu2MF+ROEKTgZI1rzA2MlW2it++xElfGZS0Dn5s="; + }) + ]; + build-system = [ setuptools ]; buildInputs = [ pytest ]; From b8e3da536540d64cb4dff70d1ada3bd5d759d7ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 01:18:56 +0100 Subject: [PATCH 261/542] python3Packages.scikit-learn: 1.7.1 -> 1.7.2 https://scikit-learn.org/stable/whats_new/v1.7.html#version-1-7-2 --- pkgs/development/python-modules/scikit-learn/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 1aae2aafb6f9..17c8c6612ab4 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { __structuredAttrs = true; pname = "scikit-learn"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,16 +34,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "scikit_learn"; inherit version; - hash = "sha256-JLPx6XakZlqnTuD8qsK4/Mxq53yOB6sl2jum0ykrmAI="; + hash = "sha256-IOnkns0TBZjxyjih2FCQ4aYAFHucAvpvFdactT2Wj9o="; }; postPatch = '' substituteInPlace meson.build --replace-fail \ "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \ "'${version}'," - substituteInPlace pyproject.toml \ - --replace-fail "numpy>=2,<2.3.0" numpy \ - --replace-fail "scipy>=1.8.0,<1.16.0" scipy ''; buildInputs = [ From a1fc63631222cf90afd3dee62819060e1a1d5693 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 01:35:34 +0100 Subject: [PATCH 262/542] python3Packages.xarray: 2025.07.1 -> 2025.10.1 https://github.com/pydata/xarray/blob/v2025.10.1/doc/whats-new.rst --- .../python-modules/xarray/default.nix | 73 +++++++++++++++++-- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 012d46b52a06..c437b89e54b0 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -2,27 +2,52 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, + + # build-system + setuptools, + setuptools-scm, + + # dependenices numpy, packaging, pandas, + + # optional-dependencies + bottleneck, + cartopy, + cftime, + dask, + fsspec, + h5netcdf, + matplotlib, + netcdf4, + numba, + numbagg, + opt-einsum, + pooch, + scipy, + seaborn, + sparse, + zarr, + + # tests + pytest-asyncio, pytestCheckHook, - pythonOlder, - setuptools, - setuptools-scm, }: buildPythonPackage rec { pname = "xarray"; - version = "2025.07.1"; + version = "2025.10.1"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "pydata"; repo = "xarray"; tag = "v${version}"; - hash = "sha256-UvBRGYZFkjxUYT+S4By+7xQZW6h0usQ26iFeJvWcxo0="; + hash = "sha256-Yk1nZkCsb54Rynlr4x1BEjT4ldZXUA96w31MzULB+Yo="; }; postPatch = '' @@ -41,10 +66,46 @@ buildPythonPackage rec { pandas ]; + optional-dependencies = lib.fix (self: { + accel = [ + bottleneck + # flox + numba + numbagg + opt-einsum + scipy + ]; + io = [ + netcdf4 + h5netcdf + # pydap + scipy + zarr + fsspec + cftime + pooch + ]; + etc = [ sparse ]; + parallel = [ dask ] ++ dask.optional-dependencies.complete; + viz = [ + cartopy + matplotlib + # nc-time-axis + seaborn + ]; + complete = with self; accel ++ io ++ etc ++ parallel + viz; + }); + nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ]; + pytestFlags = [ + # [2025.10.0] ChainedAssignmentError: behaviour will change in pandas 3.0! + "-Wignore::FutureWarning" + ]; + pythonImportsCheck = [ "xarray" ]; meta = { From 85868aa93b8aa8806b0085dd7d91d54c78cbc59c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 02:20:00 +0100 Subject: [PATCH 263/542] python314Packages.graphviz: fix tests --- pkgs/development/python-modules/graphviz/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 49d7d3d68b34..556fbf0c315c 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, replaceVars, graphviz-nox, xdg-utils, @@ -33,6 +34,11 @@ buildPythonPackage rec { graphviz = graphviz-nox; xdgutils = xdg-utils; }) + (fetchpatch { + # python314 compat; https://github.com/xflr6/graphviz/pull/238 + url = "https://github.com/xflr6/graphviz/commit/7e0fae6d28792a628a25cadd4ec1582c7351a7a3.patch"; + hash = "sha256-cZhNsQFi30uFpPXbEJHQ9eol7g6pdv6w8kp1GxLTBD4="; + }) ]; # Fontconfig error: Cannot load default config file From 28d7a0f7c9363f29fc53abf0543cf9b5cfeaa07e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 02:27:08 +0100 Subject: [PATCH 264/542] python3Packages.marshmallow: 3.26.1 -> 4.1.0 https://github.com/marshmallow-code/marshmallow/blob/4.1.0/CHANGELOG.rst --- .../python-modules/marshmallow/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 0ab9cf7f5dab..5b7dcfe0396d 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -3,27 +3,38 @@ stdenv, buildPythonPackage, fetchFromGitHub, + pythonOlder, + + # build-system flit-core, - packaging, + + # dependencies + backports-datetime-fromisoformat, + typing-extensions, + + # tests pytestCheckHook, simplejson, }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.26.1"; + version = "4.1.0"; pyproject = true; src = fetchFromGitHub { owner = "marshmallow-code"; repo = "marshmallow"; tag = version; - hash = "sha256-l5pEhv8D6jRlU24SlsGQEkXda/b7KUdP9mAqrZCbl38="; + hash = "sha256-h1wkeJbJY/0K3Vpxz+Bc2/2PDWgOMqropG0XMBzAOq8="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ packaging ]; + dependencies = lib.optionals (pythonOlder "3.11") [ + backports-datetime-fromisoformat + typing-extensions + ]; nativeCheckInputs = [ pytestCheckHook From 008112cab2d02ccea03e21e5eb1abaa0cfe24744 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 May 2025 17:33:06 +0200 Subject: [PATCH 265/542] python3Packages.dataclasses-json: patch marshmallow 4.0 compat --- .../dataclasses-json/default.nix | 11 ++++ .../marshmallow-4.0-compat.patch | 62 +++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/dataclasses-json/marshmallow-4.0-compat.patch diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 1227553fc55e..3785a5023b9c 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -25,6 +25,10 @@ buildPythonPackage rec { hash = "sha256-AH/T6pa/CHtQNox67fqqs/BBnUcmThvbnSHug2p33qM="; }; + patches = [ + ./marshmallow-4.0-compat.patch + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'documentation =' 'Documentation =' \ @@ -36,6 +40,8 @@ buildPythonPackage rec { poetry-dynamic-versioning ]; + pythonRelaxDeps = [ "marshmallow" ]; + dependencies = [ typing-inspect marshmallow @@ -46,6 +52,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # fails to deserialize None with marshmallow 4.0 + "test_deserialize" + ]; + disabledTestPaths = [ # fails with the following error and avoid dependency on mypy # mypy_main(None, text_io, text_io, [__file__], clean_exit=True) diff --git a/pkgs/development/python-modules/dataclasses-json/marshmallow-4.0-compat.patch b/pkgs/development/python-modules/dataclasses-json/marshmallow-4.0-compat.patch new file mode 100644 index 000000000000..aafbb08b63eb --- /dev/null +++ b/pkgs/development/python-modules/dataclasses-json/marshmallow-4.0-compat.patch @@ -0,0 +1,62 @@ +diff --git a/dataclasses_json/api.py b/dataclasses_json/api.py +index 3481e93..a19eb0a 100644 +--- a/dataclasses_json/api.py ++++ b/dataclasses_json/api.py +@@ -79,7 +79,6 @@ class DataClassJsonMixin(abc.ABC): + only=None, + exclude=(), + many: bool = False, +- context=None, + load_only=(), + dump_only=(), + partial: bool = False, +@@ -95,7 +94,6 @@ class DataClassJsonMixin(abc.ABC): + return Schema(only=only, + exclude=exclude, + many=many, +- context=context, + load_only=load_only, + dump_only=dump_only, + partial=partial, + +diff --git a/dataclasses_json/mm.py b/dataclasses_json/mm.py +index 9cfacf1..cecd3b0 100644 +--- a/dataclasses_json/mm.py ++++ b/dataclasses_json/mm.py +@@ -248,7 +248,7 @@ def build_type(type_, options, mixin, field, cls): + options['field_many'] = bool( + _is_supported_generic(field.type) and _is_collection( + field.type)) +- return fields.Nested(type_.schema(), **options) ++ return fields.Nested(type_.schema(), metadata=options) + else: + warnings.warn(f"Nested dataclass field {field.name} of type " + f"{field.type} detected in " + +From b5ea169f19cea0e346ba152c75ab49802f307e5e Mon Sep 17 00:00:00 2001 +From: Steven Packard +Date: Sat, 9 Apr 2022 03:37:52 -0400 +Subject: [PATCH] fix(mm): Replace deprecated Marshmallow Field parameters + +In Marshmallow 3.13.0, the `default` and `missing` parameters of the +`Field` object were deprecated and replaced with `dump_default` and +`load_default` respectively. + +fixes: #328 +--- + dataclasses_json/mm.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dataclasses_json/mm.py b/dataclasses_json/mm.py +index 9cfacf1d..b9e54d8e 100644 +--- a/dataclasses_json/mm.py ++++ b/dataclasses_json/mm.py +@@ -305,7 +305,7 @@ def schema(cls, mixin, infer_missing): + else: + type_ = field.type + options: typing.Dict[str, typing.Any] = {} +- missing_key = 'missing' if infer_missing else 'default' ++ missing_key = 'load_default' if infer_missing else 'dump_default' + if field.default is not MISSING: + options[missing_key] = field.default + elif field.default_factory is not MISSING: From 2ac0bbdae1ef9b988b826736577300de3296fbba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 02:36:17 +0100 Subject: [PATCH 266/542] python3Packages.marshmallow-polyfield: mark broken Not compatible with marshmallow 4.x. --- .../python-modules/marshmallow-polyfield/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 5230a614c6b1..b6d3df57aea0 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "marshmallow" ]; meta = with lib; { + # https://github.com/Bachmann1234/marshmallow-polyfield/issues/45 + broken = true; description = "Extension to Marshmallow to allow for polymorphic fields"; homepage = "https://github.com/Bachmann1234/marshmallow-polyfield"; license = licenses.asl20; From 65046a041c660acc4a4b3d295935a291057bb3f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 02:39:38 +0100 Subject: [PATCH 267/542] python3Packages.typing-inspect: 0.9.0 -> 0.9.0-unstable-2025-10-20 Fast-forward for Python 3.14 compat. --- .../python-modules/typing-inspect/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index ce03e47d7614..f3db11b741ea 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -1,35 +1,34 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, typing-extensions, mypy-extensions, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "typing-inspect"; - version = "0.9.0"; + version = "0.9.0-unstable-2025-10-20"; format = "setuptools"; - src = fetchPypi { - inherit version; - pname = "typing_inspect"; - hash = "sha256-sj/EL/b272lU5IUsH7USzdGNvqAxNPkfhWqVzMlGH3g="; + src = fetchFromGitHub { + owner = "ilevkivskyi"; + repo = "typing_inspect"; + rev = "58c98c084ebeb45ee51935506ed1cc3449105fa9"; + hash = "sha256-uGGtV32TGckoM3JALNu2OjIE+gmzJc7VMJlQeKJVFd8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ typing-extensions mypy-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # https://github.com/ilevkivskyi/typing_inspect/issues/84 - "test_typed_dict_typing_extension" - ]; - pythonImportsCheck = [ "typing_inspect" ]; meta = with lib; { From f9996ad70007fff04af0402c6571a5ff1268159c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 12:09:17 +0100 Subject: [PATCH 268/542] python314Packages.django_4: disable --- pkgs/development/python-modules/django/4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 570ee2e03b8b..30da46ef262e 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { version = "4.2.26"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.14"; src = fetchFromGitHub { owner = "django"; From bf99d6c4ca9a67ed22864bbe481fadb2b2f393c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 12:17:33 +0100 Subject: [PATCH 269/542] python3Packages.django: 4.x -> 5.x With django 4.2 LTS going EOL in this cycle it is time to switch the default off of it. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c3cc9b4cc97..fbc2167f1f41 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3917,7 +3917,7 @@ self: super: with self; { dj-static = callPackage ../development/python-modules/dj-static { }; # LTS with mainsteam support - django = self.django_4; + django = self.django_5; django-admin-datta = callPackage ../development/python-modules/django-admin-datta { }; From 3d12805d1c05e5faeeb9df595bdca597fda822f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 14:22:53 +0100 Subject: [PATCH 270/542] mailman: pin to django_4 Marks the django module as broken with django>=5.1. --- pkgs/development/python-modules/django-mailman3/default.nix | 3 ++- pkgs/servers/mail/mailman/python.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index b2836f93bc56..c90a20445ae0 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -64,6 +64,7 @@ buildPythonPackage rec { homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss ]; - broken = lib.versionAtLeast django-allauth.version "65.0.0"; + broken = + lib.versionAtLeast django-allauth.version "65.0.0" || lib.versionAtLeast django.version "5.1"; }; } diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index ffa3b18ea88b..f99f5a9bc825 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -26,6 +26,7 @@ lib.fix ( [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 */ + django = super.django_4; django-allauth = super.django-allauth.overrideAttrs ( new: From 4088835e0c94880c5d3c271e3a9601859e6e8d01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 14:38:45 +0100 Subject: [PATCH 271/542] python314Packages.vcrpy: fix build --- pkgs/development/python-modules/vcrpy/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 32cc24efffa7..99a228d7d1fc 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, pytest-httpbin, pytestCheckHook, pythonOlder, @@ -23,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-F2ORrQQl7d4WgMWyBzjqPcf7lCUgpI0pk0SAUJhrOlA="; }; + patches = [ + (fetchpatch { + # python 3.14 compat + url = "https://github.com/kevin1024/vcrpy/commit/558c7fc625e66775da11ee406001f300e6188fb2.patch"; + hash = "sha256-keShvz8zwqkenEtQ+NAnGKwSLYGbtXfpfMP8Zje2p+o="; + }) + ]; + propagatedBuildInputs = [ pyyaml six From fad4117d7711f57b9cc8248fe5e41a3fcd351c40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 14:42:00 +0100 Subject: [PATCH 272/542] python3Packages.vcrpy: modernize --- .../python-modules/vcrpy/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 99a228d7d1fc..a458423b7bf6 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -1,13 +1,14 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, fetchpatch, + setuptools, pytest-httpbin, pytestCheckHook, - pythonOlder, pyyaml, six, + urllib3, yarl, wrapt, }: @@ -15,13 +16,13 @@ buildPythonPackage rec { pname = "vcrpy"; version = "7.0.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-F2ORrQQl7d4WgMWyBzjqPcf7lCUgpI0pk0SAUJhrOlA="; + src = fetchFromGitHub { + owner = "kevin1024"; + repo = "vcrpy"; + tag = "v${version}"; + hash = "sha256-uKVPU1DU0GcpRqPzPMSNTLLVetZeQjUMC9vcaGwy0Yk="; }; patches = [ @@ -32,11 +33,14 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyyaml six - yarl + urllib3 wrapt + yarl ]; nativeCheckInputs = [ From 604b11e7e018550ea466a112b6a7370321ee4dda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 14:45:22 +0100 Subject: [PATCH 273/542] python314Packages.pyhamcrest: fix build --- .../python-modules/pyhamcrest/default.nix | 5 + .../pyhamcrest/python314-compat.patch | 130 ++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 pkgs/development/python-modules/pyhamcrest/python314-compat.patch diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 698906b19fc5..397b82666d90 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { hash = "sha256-VkfHRo4k8g9/QYG4r79fXf1NXorVdpUKUgVrbV2ELMU="; }; + patches = [ + # https://github.com/hamcrest/PyHamcrest/pull/270 + ./python314-compat.patch + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace 'dynamic = ["version"]' 'version = "${version}"' diff --git a/pkgs/development/python-modules/pyhamcrest/python314-compat.patch b/pkgs/development/python-modules/pyhamcrest/python314-compat.patch new file mode 100644 index 000000000000..18f990723b33 --- /dev/null +++ b/pkgs/development/python-modules/pyhamcrest/python314-compat.patch @@ -0,0 +1,130 @@ +From bfe0ff68d1b1c9601a7a4bf4b6ce8aded1ea0c9e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= + +Date: Wed, 24 Sep 2025 12:33:18 +0200 +Subject: [PATCH 1/2] use `asyncio.new_event_loop` in tests for compatibility + with Python 3.14 + +--- + tests/hamcrest_unit_test/core/future_test.py | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/tests/hamcrest_unit_test/core/future_test.py b/tests/hamcrest_unit_test/core/future_test.py +index 7963d9e..147286e 100644 +--- a/tests/hamcrest_unit_test/core/future_test.py ++++ b/tests/hamcrest_unit_test/core/future_test.py +@@ -40,13 +40,13 @@ async def test(): + await resolved(raise_exception()), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfActualIsNotAFuture(self): + async def test(): + self.assert_does_not_match("Not a future", future_raising(TypeError), 23) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfFutureIsNotDone(self): + future = asyncio.Future() +@@ -69,7 +69,7 @@ async def test(): + expected_message, future_raising(TypeError), await resolved(raise_exception()) + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testMatchesIfFutureHasASubclassOfTheExpectedException(self): + async def test(): +@@ -79,7 +79,7 @@ async def test(): + await resolved(raise_exception()), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfFutureDoesNotHaveException(self): + async def test(): +@@ -87,7 +87,7 @@ async def test(): + "No exception", future_raising(ValueError), await resolved(no_exception()) + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchExceptionIfRegularExpressionDoesNotMatch(self): + async def test(): +@@ -102,7 +102,7 @@ async def test(): + await resolved(raise_exception()), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testMatchesRegularExpressionToStringifiedException(self): + async def test(): +@@ -118,7 +118,7 @@ async def test(): + await resolved(raise_exception(3, 1, 4)), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testMachesIfExceptionMatchesAdditionalMatchers(self): + async def test(): +@@ -128,7 +128,7 @@ async def test(): + await resolved(raise_exception_with_properties(prip="prop")), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfAdditionalMatchersDoesNotMatch(self): + async def test(): +@@ -143,7 +143,7 @@ async def test(): + await resolved(raise_exception_with_properties(prip="prop")), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfNeitherPatternOrMatcherMatch(self): + async def test(): +@@ -162,4 +162,4 @@ async def test(): + await resolved(raise_exception_with_properties(prip="prop")), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + +From 5f5ca0424cc9315504e8445cae2076e55764859b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= + +Date: Wed, 24 Sep 2025 12:58:33 +0200 +Subject: [PATCH 2/2] create loop in asyncio.Future + +--- + tests/hamcrest_unit_test/core/future_test.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/hamcrest_unit_test/core/future_test.py b/tests/hamcrest_unit_test/core/future_test.py +index 147286e..3ddde49 100644 +--- a/tests/hamcrest_unit_test/core/future_test.py ++++ b/tests/hamcrest_unit_test/core/future_test.py +@@ -49,11 +49,11 @@ async def test(): + asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfFutureIsNotDone(self): +- future = asyncio.Future() ++ future = asyncio.Future(loop=asyncio.new_event_loop()) + self.assert_does_not_match("Unresolved future", future_raising(TypeError), future) + + def testDoesNotMatchIfFutureIsCancelled(self): +- future = asyncio.Future() ++ future = asyncio.Future(loop=asyncio.new_event_loop()) + future.cancel() + self.assert_does_not_match("Cancelled future", future_raising(TypeError), future) + + From 1dc6e702b608d7e0fa10ca1caaee48f31444c969 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 14:46:33 +0100 Subject: [PATCH 274/542] python3Packages.pyhamcrest: modernize --- pkgs/development/python-modules/pyhamcrest/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 397b82666d90..16ae24193b5f 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -7,15 +7,12 @@ numpy, pytest-xdist, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pyhamcrest"; version = "2.1.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "hamcrest"; @@ -34,7 +31,7 @@ buildPythonPackage rec { --replace 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; From 06ee9149aa687977056a5a5b976d2921e3dfda07 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 14:50:37 +0100 Subject: [PATCH 275/542] python314Packages.et-xmlfile: fix tests --- pkgs/development/python-modules/et-xmlfile/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/et-xmlfile/default.nix b/pkgs/development/python-modules/et-xmlfile/default.nix index b12bc700c5fb..4957e5c61fc8 100644 --- a/pkgs/development/python-modules/et-xmlfile/default.nix +++ b/pkgs/development/python-modules/et-xmlfile/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitLab, + fetchpatch, lxml, pytestCheckHook, pythonOlder, @@ -23,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-JZ1fJ9o4/Z+9uSlaoq+pNpLSwl5Yv6BJCI1G7GOaQ1I="; }; + patches = [ + (fetchpatch { + # python 3.14 compat + url = "https://foss.heptapod.net/openpyxl/et_xmlfile/-/commit/73172a7ce6d819ce13e6706f9a1c6d50f1646dde.patch"; + hash = "sha256-PMtzIGtXJ/vp0VRmBodvyaG/Ptn2DwrTTC1EyLSChHU="; + }) + ]; + build-system = [ setuptools ]; nativeCheckInputs = [ From 0fcff72c0642b253c7d885147bc32cee653b0f43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 14:54:02 +0100 Subject: [PATCH 276/542] python314Packages.tenacity: fix build --- .../development/python-modules/tenacity/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 39d0ab9086f2..74b25ca57c6f 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -22,6 +23,18 @@ buildPythonPackage rec { hash = "sha256-EWnTdsKX5944jRi0SBdg1Hiw6Zp3fK06nIblVvS2l8s="; }; + patches = [ + (fetchpatch { + url = "https://github.com/jd/tenacity/commit/eed7d785e667df145c0e3eeddff59af64e4e860d.patch"; + includes = [ + "tenacity/__init__.py" + "tests/test_asyncio.py" + "tests/test_issue_478.py" + ]; + hash = "sha256-TMhBjRmG7pBP3iKq83RQzkV9yO2TEcA+3mo9cz6daxs="; + }) + ]; + build-system = [ setuptools-scm ]; nativeCheckInputs = [ From 20aa588eecdcdc8b111da2604c1f51b72e37f50e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 14:59:49 +0100 Subject: [PATCH 277/542] python314Packages.backoff: fix build --- .../python-modules/backoff/default.nix | 5 + .../backoff/python314-compat.patch | 108 ++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 pkgs/development/python-modules/backoff/python314-compat.patch diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix index 1d7cb898d244..7724ceb0ada2 100644 --- a/pkgs/development/python-modules/backoff/default.nix +++ b/pkgs/development/python-modules/backoff/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { hash = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI="; }; + patches = [ + # https://github.com/litl/backoff/pull/220 + ./python314-compat.patch + ]; + nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/backoff/python314-compat.patch b/pkgs/development/python-modules/backoff/python314-compat.patch new file mode 100644 index 000000000000..2393be2868fd --- /dev/null +++ b/pkgs/development/python-modules/backoff/python314-compat.patch @@ -0,0 +1,108 @@ +diff --git a/tests/test_backoff_async.py b/tests/test_backoff_async.py +index 226ef08..9298b5f 100644 +--- a/tests/test_backoff_async.py ++++ b/tests/test_backoff_async.py +@@ -692,7 +692,7 @@ def test_on_predicate_on_regular_function_without_event_loop(monkeypatch): + monkeypatch.setattr('time.sleep', lambda x: None) + + # Set default event loop to None. +- loop = asyncio.get_event_loop() ++ loop = asyncio.new_event_loop() + asyncio.set_event_loop(None) + + try: +@@ -716,7 +716,7 @@ def test_on_exception_on_regular_function_without_event_loop(monkeypatch): + monkeypatch.setattr('time.sleep', lambda x: None) + + # Set default event loop to None. +- loop = asyncio.get_event_loop() ++ loop = asyncio.new_event_loop() + asyncio.set_event_loop(None) + + try: + +From 401709d040df302cdf3cd4a7e0d7703c90ff2d9e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Edgar=20Ram=C3=ADrez-Mondrag=C3=B3n?= +Date: Thu, 17 Oct 2024 16:28:46 -0600 +Subject: [PATCH] Use `inspect.iscoroutinefunction` instead of + `asyncio.iscoroutinefunction` + +--- + backoff/_async.py | 13 +++++++------ + backoff/_decorator.py | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/backoff/_async.py b/backoff/_async.py +index 82fd477..c24587c 100644 +--- a/backoff/_async.py ++++ b/backoff/_async.py +@@ -1,5 +1,6 @@ + # coding:utf-8 + import datetime ++import inspect + import functools + import asyncio + from datetime import timedelta +@@ -8,7 +9,7 @@ + + + def _ensure_coroutine(coro_or_func): +- if asyncio.iscoroutinefunction(coro_or_func): ++ if inspect.iscoroutinefunction(coro_or_func): + return coro_or_func + else: + @functools.wraps(coro_or_func) +@@ -47,10 +48,10 @@ def retry_predicate(target, wait_gen, predicate, + on_giveup = _ensure_coroutines(on_giveup) + + # Easy to implement, please report if you need this. +- assert not asyncio.iscoroutinefunction(max_tries) +- assert not asyncio.iscoroutinefunction(jitter) ++ assert not inspect.iscoroutinefunction(max_tries) ++ assert not inspect.iscoroutinefunction(jitter) + +- assert asyncio.iscoroutinefunction(target) ++ assert inspect.iscoroutinefunction(target) + + @functools.wraps(target) + async def retry(*args, **kwargs): +@@ -124,8 +125,8 @@ def retry_exception(target, wait_gen, exception, + giveup = _ensure_coroutine(giveup) + + # Easy to implement, please report if you need this. +- assert not asyncio.iscoroutinefunction(max_tries) +- assert not asyncio.iscoroutinefunction(jitter) ++ assert not inspect.iscoroutinefunction(max_tries) ++ assert not inspect.iscoroutinefunction(jitter) + + @functools.wraps(target) + async def retry(*args, **kwargs): +diff --git a/backoff/_decorator.py b/backoff/_decorator.py +index 77ed8c2..ca5d0ff 100644 +--- a/backoff/_decorator.py ++++ b/backoff/_decorator.py +@@ -1,5 +1,5 @@ + # coding:utf-8 +-import asyncio ++import inspect + import logging + import operator + from typing import Any, Callable, Iterable, Optional, Type, Union +@@ -98,7 +98,7 @@ def decorate(target): + log_level=giveup_log_level + ) + +- if asyncio.iscoroutinefunction(target): ++ if inspect.iscoroutinefunction(target): + retry = _async.retry_predicate + else: + retry = _sync.retry_predicate +@@ -198,7 +198,7 @@ def decorate(target): + log_level=giveup_log_level, + ) + +- if asyncio.iscoroutinefunction(target): ++ if inspect.iscoroutinefunction(target): + retry = _async.retry_exception + else: + retry = _sync.retry_exception From 29a40627e025bb5957b0d886b403eca500b1a669 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 15:06:35 +0100 Subject: [PATCH 278/542] python314Packages.fs: disable The fs package has not been updated to Python 3.14. --- pkgs/development/python-modules/fs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 70284bcf8f6a..405eacd6df77 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -8,7 +8,7 @@ psutil, pyftpdlib, pytestCheckHook, - pythonOlder, + pythonAtLeast, pytz, setuptools, six, @@ -19,7 +19,8 @@ buildPythonPackage rec { version = "2.4.16"; pyproject = true; - disabled = pythonOlder "3.8"; + # https://github.com/PyFilesystem/pyfilesystem2/issues/596 + disabled = pythonAtLeast "3.14"; src = fetchPypi { inherit pname version; From acdb679ce84956b1961708ffea868f8c9ffc669b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 15:11:16 +0100 Subject: [PATCH 279/542] python314Packages.loguru: fix build and cleanup --- .../python-modules/loguru/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 22d760edd6a5..e75482ac7cee 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -3,24 +3,20 @@ stdenv, buildPythonPackage, colorama, - exceptiongroup, fetchFromGitHub, + fetchpatch, flit-core, freezegun, pytest-mypy-plugins, pytest-xdist, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "loguru"; version = "0.7.3"; - pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Delgan"; repo = "loguru"; @@ -28,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-tccEzzs9TtFAZM9s43cskF9llc81Ng28LqedjLiE1m4="; }; + patches = [ + (fetchpatch { + # python 3.14 compat + url = "https://github.com/Delgan/loguru/commit/84023e2bd8339de95250470f422f096edcb8f7b7.patch"; + hash = "sha256-yXRSwI7Yjm1myL20EoU/jVuEdadmbMlCpP19YKn1MAU="; + }) + ]; + build-system = [ flit-core ]; nativeCheckInputs = [ @@ -36,8 +40,7 @@ buildPythonPackage rec { colorama freezegun pytest-mypy-plugins - ] - ++ lib.optional (pythonOlder "3.10") exceptiongroup; + ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ]; From b591a4a218cf920a91b93d8063c71001747205ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 15:31:50 +0100 Subject: [PATCH 280/542] python314Packages.uncertainties: fix build --- .../development/python-modules/uncertainties/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 5b130b5ffea9..d03fa46dab17 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system setuptools, @@ -26,6 +27,14 @@ buildPythonPackage rec { hash = "sha256-YapujmwTlmUfTQwHsuh01V+jqsBbTd0Q9adGNiE8Go0="; }; + patches = [ + (fetchpatch { + # python 3.14 compat + url = "https://github.com/lmfit/uncertainties/commit/633da70494ae6570cc69a910e1f6231538acf374.patch"; + hash = "sha256-P1LiIqA2p58bjupJaf18A6YxBeu+PNpueHACry24OwQ="; + }) + ]; + build-system = [ setuptools setuptools-scm From 879cb4284a09e63a5b8aaf6154eef0edb875b4e9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 16:02:46 +0100 Subject: [PATCH 281/542] python3Packages.tiktoken: 0.9.0 -> 0.12.0 --- .../python-modules/tiktoken/Cargo.lock | 122 ++++++++++-------- .../python-modules/tiktoken/default.nix | 6 +- 2 files changed, 69 insertions(+), 59 deletions(-) diff --git a/pkgs/development/python-modules/tiktoken/Cargo.lock b/pkgs/development/python-modules/tiktoken/Cargo.lock index cde04e361bb0..5073ae5c848c 100644 --- a/pkgs/development/python-modules/tiktoken/Cargo.lock +++ b/pkgs/development/python-modules/tiktoken/Cargo.lock @@ -1,21 +1,21 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "bit-set" @@ -34,21 +34,15 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bstr" -version = "1.11.3" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", "regex-automata", "serde", ] -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - [[package]] name = "fancy-regex" version = "0.13.0" @@ -68,21 +62,24 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indoc" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] [[package]] name = "libc" -version = "0.2.171" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memoffset" @@ -101,26 +98,25 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "portable-atomic" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ - "cfg-if", "indoc", "libc", "memoffset", @@ -134,19 +130,18 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", "pyo3-build-config", @@ -154,9 +149,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -166,9 +161,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck", "proc-macro2", @@ -179,18 +174,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.40" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -200,9 +195,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -211,30 +206,45 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -243,9 +253,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.100" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -254,13 +264,13 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "tiktoken" -version = "0.9.0" +version = "0.12.0" dependencies = [ "bstr", "fancy-regex", @@ -271,9 +281,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unindent" diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix index dc6270518095..db54ea0b2c82 100644 --- a/pkgs/development/python-modules/tiktoken/default.nix +++ b/pkgs/development/python-modules/tiktoken/default.nix @@ -16,10 +16,10 @@ }: let pname = "tiktoken"; - version = "0.9.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - hash = "sha256-0Cpcpqk44EkOH/lXvEjIsHjIjLg5d74WJbH9iqx5LF0="; + hash = "sha256-sYun7isJOGOXj8sU90s3B83I1NTTg2hTzn7GB3ITmTE="; }; postPatch = '' cp ${./Cargo.lock} Cargo.lock @@ -48,7 +48,7 @@ buildPythonPackage { src postPatch ; - hash = "sha256-MfTTRbSM+KgrYrWHYlJkGDc1qn3oulalDJM+huTaJ0g="; + hash = "sha256-daIKasW/lwYwIqMs3KvCDJWAoMn1CkPRpNqhl1jKpYY="; }; nativeBuildInputs = [ From 7219056c126e124e2db3b487e9af17bfb429d460 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 16:07:57 +0100 Subject: [PATCH 282/542] python3Packages.fsspec: 2025.3.2 -> 2025.10.0 https://github.com/fsspec/filesystem_spec/raw/2025.10.0/docs/source/changelog.rst --- pkgs/development/python-modules/fsspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 9143470c44b0..231c0b27f051 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2025.3.2"; + version = "2025.10.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "filesystem_spec"; tag = version; - hash = "sha256-FsgDILnnr+WApoTv/y1zVFSeBNysvkizdKtMeRegbfI="; + hash = "sha256-rIn2m3lRhlJwkB54X4sRT9JH+e4pIIEt7dPjnknczjs="; }; build-system = [ From 3b50030cdaa52317b2a42573ff6fb770e842f631 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 16:16:30 +0100 Subject: [PATCH 283/542] sqlite: 3.50.4 -> 3.51.0 https://www.sqlite.org/releaselog/3_51_0.html --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- pkgs/development/libraries/sqlite/tools.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 5820c50b4497..d2602c8486f4 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -27,17 +27,17 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.50.4"; + version = "3.51.0"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-o9tYehuS7l3awvZrPttBsm+chnJ1eC1Gw6CIl31qWxg="; + hash = "sha256-QuJt/dlqouaxsb5ciLCIf5lZCT9lDWk8sC65w20UbKU="; }; docsrc = fetchurl { url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip"; - hash = "sha256-+KA89GFQAxDHp4XJ1vhhIayUZWAZgs3Kxt4MWYfb/C8="; + hash = "sha256-4+NAcVRyc84ClYZGDTPiU27Eb3+qiv4Kbpl1OTMVGXY="; }; outputs = [ diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index f4ddd98c692b..8f7fd71d0ffe 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -19,14 +19,14 @@ let }: stdenv.mkDerivation rec { inherit pname; - version = "3.50.4"; + version = "3.51.0"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-t7TcBg82BTkC+2WzRLu+1ZLmSyKRomrAb+d+7Al4UOk="; + hash = "sha256-UzBxm4uAv1Y5kf96NzBSlD9TV6rnbNHzNn6rhF06dbc="; }; nativeBuildInputs = [ unzip ]; From 702f944bd79bb058ddac8f47ea24c8cc7e014587 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 16:35:41 +0100 Subject: [PATCH 284/542] python3Packages.apsw: 3.48.0.0 -> 3.51.0.0 https://github.com/rogerbinns/apsw/blob/3.51.0.0/doc/changes.rst --- pkgs/development/python-modules/apsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 54e37bf56a3b..c7e0e5ef3a1c 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.48.0.0"; + version = "3.51.0.0"; pyproject = true; # https://github.com/rogerbinns/apsw/issues/548 src = fetchurl { url = "https://github.com/rogerbinns/apsw/releases/download/${version}/apsw-${version}.tar.gz"; - hash = "sha256-iwvUW6vOQu2EiUuYWVaz5D3ePSLrj81fmLxoGRaTzRk="; + hash = "sha256-8I1/HnGO9eOs9CUFwvN5BcpHtCxXD7qlF9WBA4E1Rls="; }; build-system = [ setuptools ]; From f8b41928217a9e4d993ef8834a3f4834d7f3377d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 23:19:56 +0100 Subject: [PATCH 285/542] python3Packages.cmsis-pack-manager: 0.5.2 -> 0.6.0 https://github.com/pyocd/cmsis-pack-manager/compare/v0.5.2...v0.6.0 --- .../python-modules/cmsis-pack-manager/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 69eb6c9bc925..dcb49de7af0e 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -15,19 +15,19 @@ buildPythonPackage rec { pname = "cmsis-pack-manager"; - version = "0.5.2"; + version = "0.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pyocd"; repo = "cmsis-pack-manager"; tag = "v${version}"; - hash = "sha256-PeyJf3TGUxv8/MKIQUgWrenrK4Hb+4cvtDA2h3r6kGg="; + hash = "sha256-kb0VSg89qglL6Q5kx1nEN1OW1GYoccBTITtPw2/dXTY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-OBh5WWSekrqdLLmxEXS0LfPIfy4QWKYgO+8o6PYWjN4="; + hash = "sha256-yRNSFlEwFhfkSNjbFHipVZvJZ40pKbI9HhLtciws7nc="; }; nativeBuildInputs = [ From ccf3c1ae95a2738f317ffaeb5088b0f7ab106a73 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Nov 2025 23:28:40 +0100 Subject: [PATCH 286/542] python3Packages.cryptography: 46.0.2 -> 46.0.3 https://cryptography.io/en/latest/changelog/#v46-0-3 --- pkgs/development/python-modules/cryptography/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index d9b3a68715ae..15016552b3d4 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cryptography"; - version = "46.0.2"; + version = "46.0.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,12 +31,12 @@ buildPythonPackage rec { owner = "pyca"; repo = "cryptography"; tag = version; - hash = "sha256-gsEHKEYiMw2eliEpxwzFGDetOp77PivlMoBD3HBbbFA="; + hash = "sha256-6t7f/BaMkA24MY05B7aYa0myxnCjrCsh1qk6RgAjeQc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-aCQzY2gBjVVwiqlqAxkH4y6yf4lqdQuSEnQSIjLPRJg="; + hash = "sha256-5ElDEl7MdcQfu/hy+POSBcvkNCFAMo6La5s6uRhZ/fM="; }; postPatch = '' From ae19445f8d99e33b2899224898836351ba3b4ea6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 01:50:47 +0100 Subject: [PATCH 287/542] python3Packages.datafusion: 50.0.0 -> 50.1.0 https://github.com/apache/arrow-datafusion-python/blob/50.1.0/CHANGELOG.md --- pkgs/development/python-modules/datafusion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index fb8e804edde4..64d95c66e6e6 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "datafusion"; - version = "50.0.0"; + version = "50.1.0"; pyproject = true; src = fetchFromGitHub { @@ -32,12 +32,12 @@ buildPythonPackage rec { tag = version; # Fetch arrow-testing and parquet-testing (tests assets) fetchSubmodules = true; - hash = "sha256-to1GJQqI4aJOW8pGhWvU44ePrRo0cgeNwEGRJlb9grM="; + hash = "sha256-+r3msFc9yu3aJBDRI66A/AIctCbLxfZB3Ur/raDV3x8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-ZACp7bBLYKmuZVAWEa2YxoCbQqwALv2bWf+zz6jbV9w="; + hash = "sha256-XJ2x/EtMZu/fdS6XB/IydMfHmlaxEWJ3XJPY73WoGqs="; }; nativeBuildInputs = with rustPlatform; [ From 3825ecf1129958b0933d3f4e46c55d3c2fc829cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 01:59:27 +0100 Subject: [PATCH 288/542] python3Packages.clarabel: 0.10.0 -> 0.11.1 https://github.com/oxfordcontrol/Clarabel.rs/releases/tag/v0.11.1/CHANGELOG.md --- pkgs/development/python-modules/clarabel/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix index b21bf0cdab14..66891ba7decc 100644 --- a/pkgs/development/python-modules/clarabel/default.nix +++ b/pkgs/development/python-modules/clarabel/default.nix @@ -5,6 +5,7 @@ fetchPypi, rustPlatform, libiconv, + cffi, numpy, scipy, nix-update-script, @@ -12,17 +13,17 @@ buildPythonPackage rec { pname = "clarabel"; - version = "0.10.0"; + version = "0.11.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-qKIQUFj9fbVHGL5TxIcVpQkQUAsQ/wuPU4BDTmnBChA="; + hash = "sha256-58QcR/Dlmuq5mu//nlivSodT7lJpu+7L1VJvxvQblZg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Ohbeavkayl6vMyYX9kVVLRddvVB9gWOxfzdWAOg+gac="; + hash = "sha256-Cmxbz1zPA/J7EeJhGfD4Zt+QvyJK6BOZ+YQAsf8H+is="; }; nativeBuildInputs = with rustPlatform; [ @@ -32,7 +33,8 @@ buildPythonPackage rec { buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; - propagatedBuildInputs = [ + dependencies = [ + cffi numpy scipy ]; From ef71b0d608f01a356333ed878db85903f478403e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 02:37:05 +0100 Subject: [PATCH 289/542] python3Packages.zenoh: 1.4.0 -> 1.6.2 https://github.com/eclipse-zenoh/zenoh-python/compare/1.4.0...1.6.2 --- pkgs/development/python-modules/zenoh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix index a9d2eefb9371..8946bcc4b3ea 100644 --- a/pkgs/development/python-modules/zenoh/default.nix +++ b/pkgs/development/python-modules/zenoh/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "zenoh"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.6.2"; # nixpkgs-update: no auto update pyproject = true; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-python"; rev = version; - hash = "sha256-X9AUjuJYA8j41JVS+ZLRYcQUzSRoGwmkNIH0UK5+QoU="; + hash = "sha256-GGqZGtHSCaPeO6wFFBxPjdjhsIdcgI1RJ4mZbGq4uzc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-Z6Wtor/aAdO1JUUafFEo9RdI7OXmsAD5MMtMUF6CZEg="; + hash = "sha256-2Hieow0+GzcNQmvqsJd+5bpE9RWUDbaBR9jah+O4GtI="; }; build-system = [ From f6fc13459e8162ded34ccd53dd16ff8acdfd1bf5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 02:37:38 +0100 Subject: [PATCH 290/542] python3Packages.watchfiles: 1.0.5 -> 1.1.1 https://github.com/samuelcolvin/watchfiles/releases/tag/v1.1.1 --- pkgs/development/python-modules/watchfiles/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index b6dcbfd889e6..6f9dcc814388 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -15,19 +15,19 @@ buildPythonPackage rec { pname = "watchfiles"; - version = "1.0.5"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "samuelcolvin"; repo = "watchfiles"; tag = "v${version}"; - hash = "sha256-a6SHqYRNMGXNkVvwj9RpLj449dAQtWXO44v1ko5suaw="; + hash = "sha256-UlQnCYSNU9H4x31KenSfYExGun94ekrOCwajORemSco="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-2RMWxeOjitbEqer9+ETpMX9WxHEiPzVmEv7LpSiaRVg="; + hash = "sha256-6sxtH7KrwAWukPjLSMAebguPmeAHbC7YHOn1QiRPigs="; }; nativeBuildInputs = [ From 0801f850a4d78886f72882c47a53a3513f7aae33 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 02:41:25 +0100 Subject: [PATCH 291/542] python3Packages.uv-build: 0.9.8 -> 0.9.9 https://github.com/astral-sh/uv/blob/0.9.8/CHANGELOG.md --- pkgs/development/python-modules/uv-build/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uv-build/default.nix b/pkgs/development/python-modules/uv-build/default.nix index 0ebef2a455ba..02db3b5064ae 100644 --- a/pkgs/development/python-modules/uv-build/default.nix +++ b/pkgs/development/python-modules/uv-build/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "uv-build"; - version = "0.9.8"; + version = "0.9.9"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-e7yvEQggfBLq4akqnVoZTfvcpZLlbQRWr2fruGfF/N4="; + hash = "sha256-i9vdpHA9EfXmw5fhK1tTZG0T2zOlDbjPCGBIizvQzZw="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-lEGhXwzotvCuDAvVyrt22e/ReotWT7m1lt6d2GL8lFU="; + hash = "sha256-RZkIjHQElqrj+UAz+q6w1CYW3E5/YW9uy2E5KpKvw+w="; }; buildAndTestSubdir = "crates/uv-build"; From 9eee8677b82de04a56d5318170e46c2b1d3cc290 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 02:47:31 +0100 Subject: [PATCH 292/542] python3Packages.rpds-py: 0.25.0 -> 0.28.0 https://github.com/crate-py/rpds/releases/tag/v0.28.0 --- pkgs/development/python-modules/rpds-py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index 55bff605038c..fec5533fd9f4 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.25.0"; + version = "0.28.0"; pyproject = true; src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-TZdmG/WEjdnl633tSA3sz50yzizVALiKJqy/e9KGSYU="; + hash = "sha256-q9TfIEhaCYPiyjNKIWJJthhtbjwWJ+EGZRlD29t5Guo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-0wMmhiUjXY5DaA43l7kBKE7IX1UoEFZBJ8xnafVlU60="; + hash = "sha256-mhFAV3KTVIUG/hU524cyeLv3sELv8wMtx820kPWeftE="; }; nativeBuildInputs = [ From 0ccc8a5fad1b5676b12aca936f12767e9baf1ad1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 03:08:49 +0100 Subject: [PATCH 293/542] python3Packages.fastcrc: 0.3.2 -> 0.3.4 https://github.com/overcat/fastcrc/compare/v0.3.2...v0.3.4 --- pkgs/development/python-modules/fastcrc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fastcrc/default.nix b/pkgs/development/python-modules/fastcrc/default.nix index 94c4fed846b0..478b9dcaee93 100644 --- a/pkgs/development/python-modules/fastcrc/default.nix +++ b/pkgs/development/python-modules/fastcrc/default.nix @@ -10,13 +10,13 @@ }: let pname = "fastcrc"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "overcat"; repo = "fastcrc"; tag = "v${version}"; - hash = "sha256-yLrv/zqsjgygJAIJtztwxlm4s9o9EBVsCyx1jUXd7hA="; + hash = "sha256-iBbYiF0y/3Cax4P9+/gKS6FUBqZ3BleCwnpItsVd7Ps="; }; in buildPythonPackage { @@ -32,7 +32,7 @@ buildPythonPackage { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-9Vap8E71TkBIf4eIB2lapUqcMukdsHX4LR7U8AD77SU="; + hash = "sha256-VbS5xTqj+Flxxdg06MO34AZCVozlNgFvc+yKemEmCzs="; }; pythonImportsCheck = [ "fastcrc" ]; From acd5155f1767950c22afda2f4d7599161c2f901e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 03:18:32 +0100 Subject: [PATCH 294/542] python3Packages.python-calamine: 0.4.0 -> 0.5.4 https://github.com/dimastbk/python-calamine/releases/tag/v0.5.4 --- pkgs/development/python-modules/python-calamine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-calamine/default.nix b/pkgs/development/python-modules/python-calamine/default.nix index 4c859ff4683d..821c19901f26 100644 --- a/pkgs/development/python-modules/python-calamine/default.nix +++ b/pkgs/development/python-modules/python-calamine/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "python-calamine"; - version = "0.4.0"; + version = "0.5.4"; pyproject = true; src = fetchFromGitHub { owner = "dimastbk"; repo = "python-calamine"; tag = "v${version}"; - hash = "sha256-qbme5P/oo7djoKbGFd+mVz6p4sHl1zejQI9wOarHzMA="; + hash = "sha256-IDcYmrdSfOOpe2t3sWQrz2MRNyINvKdyrYi6agFSHEo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-8X6TDCxeDLHObJ+q/bEYTonHe0bgXMnBrIz3rKalfyk="; + hash = "sha256-+LnYT2Y6SnTKG7aTCHWCtF3E/gSapEoSDQWhFSjKsso="; }; buildInputs = [ libiconv ]; From ee01340dbf5bc0cb96bf1e5702eeb976554fde7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 03:20:38 +0100 Subject: [PATCH 295/542] python3Packages.python-bidi: 0.6.6 -> 0.6.7 https://github.com/MeirKriheli/python-bidi/compare/v0.6.6...v0.6.7 --- pkgs/development/python-modules/python-bidi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix index 10b0c5f523b7..e163bc58c9a2 100644 --- a/pkgs/development/python-modules/python-bidi/default.nix +++ b/pkgs/development/python-modules/python-bidi/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "python-bidi"; - version = "0.6.6"; + version = "0.6.7"; pyproject = true; src = fetchFromGitHub { owner = "MeirKriheli"; repo = "python-bidi"; tag = "v${version}"; - hash = "sha256-8erpcrjAp/1ugPe6cOvjH2CVfy2/hO6xg+cfWWUbj0w="; + hash = "sha256-8LNoQwUOa2pKEviBq24IHihUfhyMoA/IV+sBuFUhHdc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Oqtva9cTHAcuOXr/uPbqZczDbPVr0zeIEr5p6PoJ610="; + hash = "sha256-27DtYoxd0bPS4A/7HBmuLYCZrG5yu0Tp8jXIBPSrAdc="; }; buildInputs = [ libiconv ]; From d8b3f00095d547a908909059f661672d3d661ad1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 03:24:37 +0100 Subject: [PATCH 296/542] python3Packages.gb-io: 0.3.6 -> 0.3.8 https://github.com/althonos/gb-io.py/compare/v0.3.6...v0.3.8 --- pkgs/development/python-modules/gb-io/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 66325b22dd17..c328cbf5f821 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gb-io"; - version = "0.3.6"; + version = "0.3.8"; pyproject = true; src = fetchFromGitHub { owner = "althonos"; repo = "gb-io.py"; rev = "v${version}"; - hash = "sha256-iLRXyiVji9q4C5YtBsTT9bklSueY9RlX7Kz4cu+hmpE="; + hash = "sha256-ArJTK6YcuyExIMBUYBxpr7TpKeVMF6Nk4ObAZLuOgJA="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -27,7 +27,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-miwCgZpaFVMaNJLUTYSGEkmg+uT7lbzJZnBa9yZqC8U="; + hash = "sha256-3mgvT8b4tpoUScs5yk6IbGBUJ/czu3XSdFXhfT/c5S8="; }; sourceRoot = src.name; From 77745909bb6b99327d44365a3d2ef31826c4af38 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 03:40:53 +0100 Subject: [PATCH 297/542] python3Packages.granian: 2.5.6 -> 2.5.7 https://github.com/emmett-framework/granian/releases/tag/v2.5.7 --- pkgs/development/python-modules/granian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index 5bbceb734299..aa760a4a03b7 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "granian"; - version = "2.5.6"; + version = "2.5.7"; pyproject = true; src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; tag = "v${version}"; - hash = "sha256-XSDBSl7QWqIN5u48z4H5yPHR+ltRmmmrP0JSmvcCcsA="; + hash = "sha256-IXL4T3y7OBU+/Kv1593NHaS6fKG+a3SkEWdNVDSuKKA="; }; # Granian forces a custom allocator for all the things it runs, @@ -39,7 +39,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-zQAHJcBWNx5IT/t2wtm7UeOfVNnvfowcp137TePnwiM="; + hash = "sha256-xqAUspCRKQfXa8sPJ/ZbgOXrds7KdTUKBk0k4085wMo="; }; nativeBuildInputs = with rustPlatform; [ From 0327c3f790cac62af995a81dae52b51afba13bc1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 03:56:22 +0100 Subject: [PATCH 298/542] python3Packages.graspologic-native: 1.2.1 -> 1.2.5 --- .../graspologic-native/Cargo.lock | 559 ++++++------------ .../graspologic-native/default.nix | 4 +- 2 files changed, 192 insertions(+), 371 deletions(-) diff --git a/pkgs/development/python-modules/graspologic-native/Cargo.lock b/pkgs/development/python-modules/graspologic-native/Cargo.lock index e2133ee8c5d5..1dcb0bef624b 100644 --- a/pkgs/development/python-modules/graspologic-native/Cargo.lock +++ b/pkgs/development/python-modules/graspologic-native/Cargo.lock @@ -1,104 +1,99 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] -name = "android-tzdata" -version = "0.1.1" +name = "anstream" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ - "libc", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "anstyle" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" + +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ - "winapi", + "utf8parse", ] [[package]] -name = "atty" -version = "0.2.14" +name = "anstyle-query" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" dependencies = [ - "hermit-abi", - "libc", - "winapi", + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "cc" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets", -] +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "clap" -version = "2.34.0" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", + "clap_builder", ] +[[package]] +name = "clap_builder" +version = "4.5.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" + [[package]] name = "cli" -version = "0.1.0" +version = "0.1.1" dependencies = [ "clap", "network_partitions", @@ -107,16 +102,16 @@ dependencies = [ ] [[package]] -name = "core-foundation-sys" -version = "0.8.6" +name = "colorchoice" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", @@ -125,9 +120,8 @@ dependencies = [ [[package]] name = "graspologic_native" -version = "1.2.1" +version = "1.2.5" dependencies = [ - "chrono", "network_partitions", "pyo3", "rand", @@ -135,242 +129,153 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.1.19" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indoc" -version = "0.3.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" dependencies = [ - "indoc-impl", - "proc-macro-hack", + "rustversion", ] [[package]] -name = "indoc-impl" -version = "0.3.6" +name = "is_terminal_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] -name = "lock_api" -version = "0.4.12" +name = "memoffset" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", - "scopeguard", ] -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - [[package]] name = "network_partitions" version = "0.1.0" dependencies = [ - "chrono", "rand", "rand_xorshift", ] -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - [[package]] name = "once_cell" -version = "1.19.0" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] -name = "parking_lot" -version = "0.11.2" +name = "once_cell_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] -name = "parking_lot_core" -version = "0.8.6" +name = "portable-atomic" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.15.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752" +checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" dependencies = [ "cfg-if", "indoc", "libc", - "parking_lot", - "paste", + "memoffset", + "once_cell", + "portable-atomic", "pyo3-build-config", + "pyo3-ffi", "pyo3-macros", "unindent", ] [[package]] name = "pyo3-build-config" -version = "0.15.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" +checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" dependencies = [ "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +dependencies = [ + "libc", + "pyo3-build-config", ] [[package]] name = "pyo3-macros" -version = "0.15.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a" +checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" dependencies = [ + "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "pyo3-macros-backend" -version = "0.15.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095" +checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" dependencies = [ + "heck", "proc-macro2", "pyo3-build-config", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -415,37 +320,22 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "rustversion" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "strsim" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "1.0.109" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -453,146 +343,57 @@ dependencies = [ ] [[package]] -name = "syn" -version = "2.0.69" +name = "target-lexicon" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unindent" -version = "0.1.11" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" [[package]] -name = "vec_map" -version = "0.8.2" +name = "utf8parse" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasm-bindgen" -version = "0.2.92" +name = "windows-link" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" +name = "windows-sys" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.69", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.69", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ + "windows-link", "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", @@ -605,48 +406,68 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "zerocopy" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/development/python-modules/graspologic-native/default.nix b/pkgs/development/python-modules/graspologic-native/default.nix index c0928551c287..658a97ec0050 100644 --- a/pkgs/development/python-modules/graspologic-native/default.nix +++ b/pkgs/development/python-modules/graspologic-native/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "graspologic-native"; - version = "1.2.1"; + version = "1.2.5"; pyproject = true; src = fetchFromGitHub { owner = "graspologic-org"; repo = "graspologic-native"; tag = version; - hash = "sha256-fgiBUzYBerYX59uj+I0Yret94vA+FpQK+MckskCBqj4="; + hash = "sha256-JIFg+JIxRKXgWLAGgOyKZTe2gXa8wZW5pEubTBLqwmQ="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; From 46a4f4f44cd4ad38ce0143ac8433fef7d97f2a12 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 04:01:56 +0100 Subject: [PATCH 299/542] python3Packages.jellyfish: 1.1.2 -> 1.2.1 https://github.com/jamesturk/jellyfish/releases/tag/v1.2.1 --- .../python-modules/jellyfish/Cargo.lock | 207 +++++++++++------- .../python-modules/jellyfish/default.nix | 6 +- 2 files changed, 134 insertions(+), 79 deletions(-) diff --git a/pkgs/development/python-modules/jellyfish/Cargo.lock b/pkgs/development/python-modules/jellyfish/Cargo.lock index b8e248240923..47b4d56322d7 100644 --- a/pkgs/development/python-modules/jellyfish/Cargo.lock +++ b/pkgs/development/python-modules/jellyfish/Cargo.lock @@ -1,12 +1,12 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "getrandom", @@ -17,46 +17,63 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "cc" +version = "1.2.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" +dependencies = [ + "find-msvc-tools", + "shlex", +] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "csv" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" +checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" dependencies = [ "csv-core", "itoa", "ryu", - "serde", + "serde_core", ] [[package]] name = "csv-core" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" dependencies = [ "memchr", ] [[package]] -name = "getrandom" -version = "0.2.15" +name = "find-msvc-tools" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "wasi", + "r-efi", + "wasip2", ] [[package]] @@ -67,19 +84,22 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indoc" -version = "2.0.5" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jellyfish" -version = "1.1.2" +version = "1.2.1" dependencies = [ "ahash", "csv", @@ -92,15 +112,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.169" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memoffset" @@ -122,32 +142,31 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "portable-atomic" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ - "cfg-if", "indoc", "libc", "memoffset", @@ -161,19 +180,19 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", + "python3-dll-a", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", "pyo3-build-config", @@ -181,9 +200,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -193,9 +212,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck", "proc-macro2", @@ -205,34 +224,55 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.38" +name = "python3-dll-a" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] [[package]] -name = "ryu" -version = "1.0.18" +name = "r-efi" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] -name = "serde" -version = "1.0.217" +name = "rustversion" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -240,16 +280,22 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.13.2" +name = "shlex" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "syn" -version = "2.0.95" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -258,15 +304,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "tinyvec" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -279,15 +325,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] @@ -300,9 +346,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unindent" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" [[package]] name = "version_check" @@ -311,25 +357,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 39a96abbe261..e442e9d87f9d 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "1.1.2"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jamesturk"; repo = "jellyfish"; - rev = version; - hash = "sha256-xInjoTXYgZuHyvyKm+N4PAwHozE5BOkxoYhRzZnPs3Q="; + rev = "v${version}"; + hash = "sha256-jKz7FYzV66TUkJZfWDTy8GXmTZ6SU5jEdtkjYLDfS/8="; }; cargoDeps = rustPlatform.importCargoLock { From 05de24ec4718d542602ca9b6761e5fed0a5033e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 04:05:12 +0100 Subject: [PATCH 300/542] python3Packages.jiter: 0.11.1 -> 0.12.0 https://github.com/pydantic/jiter/releases/tag/v0.12.0 --- .../python-modules/jiter/Cargo.lock | 111 ++++++++---------- .../python-modules/jiter/default.nix | 4 +- 2 files changed, 48 insertions(+), 67 deletions(-) diff --git a/pkgs/development/python-modules/jiter/Cargo.lock b/pkgs/development/python-modules/jiter/Cargo.lock index 8d4e23c2c22b..b2a86580589f 100644 --- a/pkgs/development/python-modules/jiter/Cargo.lock +++ b/pkgs/development/python-modules/jiter/Cargo.lock @@ -17,9 +17,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -74,9 +74,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.41" +version = "1.2.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7" +checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" dependencies = [ "find-msvc-tools", "jobserver", @@ -119,18 +119,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" +checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" +checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" dependencies = [ "anstyle", "clap_lex", @@ -270,7 +270,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "fuzz" -version = "0.11.1" +version = "0.12.0" dependencies = [ "indexmap", "jiter", @@ -343,13 +343,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -369,7 +369,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiter" -version = "0.11.1" +version = "0.12.0" dependencies = [ "ahash", "bitvec", @@ -387,7 +387,7 @@ dependencies = [ [[package]] name = "jiter-python" -version = "0.11.1" +version = "0.12.0" dependencies = [ "jiter", "pyo3", @@ -405,9 +405,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.81" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" dependencies = [ "once_cell", "wasm-bindgen", @@ -460,12 +460,6 @@ dependencies = [ "cc", ] -[[package]] -name = "log" -version = "0.4.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" - [[package]] name = "memchr" version = "2.7.6" @@ -563,23 +557,24 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "proc-macro2" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e0f6df8eaa422d97d72edcd152e1451618fed47fabbdbd5a8864167b1d4aff7" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" +checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf" dependencies = [ "indoc", "libc", "memoffset", "num-bigint", + "num-traits", "once_cell", "portable-atomic", "pyo3-build-config", @@ -590,9 +585,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" +checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb" dependencies = [ "python3-dll-a", "target-lexicon", @@ -600,9 +595,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" +checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be" dependencies = [ "libc", "pyo3-build-config", @@ -610,9 +605,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" +checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -622,9 +617,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" +checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b" dependencies = [ "heck", "proc-macro2", @@ -644,9 +639,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -791,9 +786,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "syn" -version = "2.0.108" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -824,9 +819,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unindent" @@ -872,9 +867,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", @@ -883,25 +878,11 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - [[package]] name = "wasm-bindgen-macro" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -909,31 +890,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.81" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/pkgs/development/python-modules/jiter/default.nix b/pkgs/development/python-modules/jiter/default.nix index ce44681e80aa..5ee0d5846d89 100644 --- a/pkgs/development/python-modules/jiter/default.nix +++ b/pkgs/development/python-modules/jiter/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "jiter"; - version = "0.11.1"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "jiter"; tag = "v${version}"; - hash = "sha256-/OSLwqSy/CkAFv0hn1zED70MRsWV8/NTrSfqP7OSRFc="; + hash = "sha256-d87RUXKEmZXxVQZnAvjwRKSP6F3Z+kXxg/LdY2l9B+k="; }; postPatch = '' From cc071f4ff2b3237c776a22e247d931fa5096f149 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 04:18:43 +0100 Subject: [PATCH 301/542] python3Packages.deltalake: 1.1.4 -> 1.2.1 https://github.com/delta-io/delta-rs/releases/tag/python-v1.2.0 https://github.com/delta-io/delta-rs/releases/tag/python-v1.2.1 --- .../python-modules/deltalake/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix index 1bd5b6634a56..452a6fa3330d 100644 --- a/pkgs/development/python-modules/deltalake/default.nix +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -8,6 +8,8 @@ openssl, stdenv, libiconv, + opentelemetry-api, + opentelemetry-sdk, pkg-config, polars, pytestCheckHook, @@ -18,21 +20,22 @@ pandas, deprecated, azure-storage-blob, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "deltalake"; - version = "1.1.4"; + version = "1.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-LpeJUNQg4FC73LX2LjvpPTMctRarTJsWlM8aeIfGPiU="; + hash = "sha256-dqzkiWHeAbfXzEsaKyRiJx+0m/dIOMi9+gxjcuBT2QU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-4VmNhUijQMC/Wazcx+uT7mQqD+wutXrBJ+HN3AyxQRw="; + hash = "sha256-MPwoGJ7xcsBRgaaM4jxhC6Vv2+Jhh0oYYtbji/Hc+vQ="; }; env.OPENSSL_NO_VENDOR = 1; @@ -51,25 +54,32 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config # openssl-sys needs this + writableTmpDirAsHomeHook ] ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]); + optional-dependencies = { + pandas = [ pandas ]; + pyarrow = [ pyarrow ]; + }; + pythonImportsCheck = [ "deltalake" ]; nativeCheckInputs = [ - pytestCheckHook - pandas + azure-storage-blob + opentelemetry-api + opentelemetry-sdk polars + pytestCheckHook pytest-benchmark pytest-cov-stub pytest-mock pytest-timeout - azure-storage-blob - pyarrow - ]; + ] + ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' # For paths in test to work, we have to be in python dir From 0edf2bc9ff8de0620334d615df462bcf1c1bc449 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 05:33:20 +0100 Subject: [PATCH 302/542] python3Packages.nh3: 0.2.21 -> 0.3.2 https://github.com/messense/nh3/compare/v0.2.21...v0.3.2 --- pkgs/development/python-modules/nh3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index 2e5bd5687fe6..9a896c3a7be7 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -9,12 +9,12 @@ }: let pname = "nh3"; - version = "0.2.21"; + version = "0.3.2"; src = fetchFromGitHub { owner = "messense"; repo = "nh3"; rev = "v${version}"; - hash = "sha256-DskjcKjdz1HmKzmA568zRCjh4UK1/LBD5cSIu7Rfwok="; + hash = "sha256-2D8ZLmVRA+SuMqeUsSXyY+0zlgqp7TSRyQuJMjmRVFk="; }; in buildPythonPackage { @@ -24,7 +24,7 @@ buildPythonPackage { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-1Ytca/GiHidR8JOcz+DydN6N/iguLchbP8Wnrd/0NTk="; + hash = "sha256-dN6zdwMGh8stgDuGiO+T/ZZ3/3P9Wu/gUw5gHJ1pPGA="; }; nativeBuildInputs = with rustPlatform; [ From 502fa133fe563c8bb44ca834ed8178d008582741 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 05:37:14 +0100 Subject: [PATCH 303/542] python3Packages.orjson: 3.11.3 -> 3.11.4 https://github.com/ijl/orjson/blob/3.11.4/CHANGELOG.md --- pkgs/development/python-modules/orjson/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 9111239fe8d6..b4cb5b0d0220 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.11.3"; + version = "3.11.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "ijl"; repo = "orjson"; tag = version; - hash = "sha256-oTrmDYmUHXMKxgxzBIStw7nnWXcyH9ir0ohnbX4bdjU="; + hash = "sha256-LK3Up6bAWZkou791nrA9iHlgfDLbk196iTn3CBfeyYc="; }; patches = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -49,7 +49,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-y6FmK1RR1DAswVoTlnl19CmoYXAco1dY7lpV/KTypzE="; + hash = "sha256-TdZtbb9zR0T+0eauEgRVrDKN2eyCNfEQCJziPlKPWpI="; }; nativeBuildInputs = [ From 407f6c03ca1be022504644e012711621b51686ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 16:24:50 +0100 Subject: [PATCH 304/542] python3Packages.kornia-rs: 0.1.9 -> 0.1.10 https://github.com/kornia/kornia-rs/releases/tag/v0.1.10 --- .../python-modules/kornia-rs/Cargo.lock | 702 +++++++----------- .../python-modules/kornia-rs/default.nix | 4 +- 2 files changed, 277 insertions(+), 429 deletions(-) diff --git a/pkgs/development/python-modules/kornia-rs/Cargo.lock b/pkgs/development/python-modules/kornia-rs/Cargo.lock index 66a5b60cfafc..78401674a000 100644 --- a/pkgs/development/python-modules/kornia-rs/Cargo.lock +++ b/pkgs/development/python-modules/kornia-rs/Cargo.lock @@ -19,9 +19,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "arbitrary" @@ -60,9 +60,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "av1-grain" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3efb2ca85bc610acfa917b5aaa36f3fcbebed5b3182d7f877b02531c4b80c8" +checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8" dependencies = [ "anyhow", "arrayvec", @@ -89,18 +89,23 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "bincode" -version = "1.3.3" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" dependencies = [ + "bincode_derive", "serde", + "unty", ] [[package]] -name = "bit_field" -version = "0.10.3" +name = "bincode_derive" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" +checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09" +dependencies = [ + "virtue", +] [[package]] name = "bitflags" @@ -110,9 +115,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.3" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bitstream-io" @@ -143,18 +148,18 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytemuck" -version = "1.23.2" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", @@ -175,10 +180,11 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "cc" -version = "1.2.34" +version = "1.2.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc" +checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -196,15 +202,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" - -[[package]] -name = "circular-buffer" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bdce1da528cadbac4654b5632bfcd8c6c63e25b1d42cea919a95958790b51d" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cmake" @@ -227,12 +227,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e8f1e641542c07631228b1e0dc04b69ae3c1d58ef65d5691a439711d805c698" -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - [[package]] name = "cpufeatures" version = "0.2.17" @@ -284,9 +278,9 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "typenum", @@ -316,15 +310,15 @@ checksum = "69dde51e8fef5e12c1d65e0929b03d66e4c0c18282bc30ed2ca050ad6f44dd82" [[package]] name = "doc-comment" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9" [[package]] name = "document-features" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" +checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" dependencies = [ "litrs", ] @@ -340,13 +334,20 @@ dependencies = [ [[package]] name = "dyn-stack" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490bd48eb68fffcfed519b4edbfd82c69cbe741d175b84f0e0cbe8c57cbe0bdd" +checksum = "1c4713e43e2886ba72b8271aa66c93d722116acf7a75555cce11dcde84388fe8" dependencies = [ "bytemuck", + "dyn-stack-macros", ] +[[package]] +name = "dyn-stack-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d926b4d407d372f141f93bb444696142c29d32962ccbd3531117cf3aa0bfa9" + [[package]] name = "either" version = "1.15.0" @@ -411,26 +412,11 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" -[[package]] -name = "exr" -version = "1.73.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0" -dependencies = [ - "bit_field", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - [[package]] name = "faer" -version = "0.20.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2b19b8c3570ea226e507fe3dbae2aa9d7e0f16676abd35ea3adeeb9f90f7b5d" +checksum = "c23c499be0d3ad8167878497cd114ec5ff356556652c651eb5f209a1579032d2" dependencies = [ "bytemuck", "coe-rs", @@ -472,16 +458,39 @@ dependencies = [ [[package]] name = "fast_image_resize" -version = "5.2.2" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80af28351fb3cb22f67880126f65034892e7b414d3be3d6b0aa85d79ecf0c" +checksum = "d372ab3252d8f162d858d675a3d88a8c33ba24a6238837c50c8851911c7e89cd" dependencies = [ + "bytemuck", "cfg-if", "document-features", + "image", "num-traits", + "rayon", "thiserror 1.0.69", ] +[[package]] +name = "fax" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" +dependencies = [ + "fax_derive", +] + +[[package]] +name = "fax_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "fdeflate" version = "0.3.7" @@ -491,6 +500,12 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + [[package]] name = "fixed" version = "1.29.0" @@ -506,9 +521,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.2" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "miniz_oxide", @@ -526,7 +541,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab96b703d31950f1aeddded248bc95543c9efc7ac9c4a21fda8703a83ee35451" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-c32", "gemm-c64", "gemm-common", @@ -546,7 +561,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6db9fd9f40421d00eea9dd0770045a5603b8d684654816637732463f4073847" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-common", "num-complex", "num-traits", @@ -561,7 +576,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfcad8a3d35a43758330b635d02edad980c1e143dc2f21e6fd25f9e4eada8edf" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-common", "num-complex", "num-traits", @@ -577,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a352d4a69cbe938b9e2a9cb7a3a63b7e72f9349174a2752a558a8a563510d0f3" dependencies = [ "bytemuck", - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "half", "libm", "num-complex", @@ -597,7 +612,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cff95ae3259432f3c3410eaa919033cd03791d81cebd18018393dc147952e109" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-common", "gemm-f32", "half", @@ -615,7 +630,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc8d3d4385393304f407392f754cd2dc4b315d05063f62cf09f47b58de276864" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-common", "num-complex", "num-traits", @@ -630,7 +645,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35b2a4f76ce4b8b16eadc11ccf2e083252d8237c1b589558a49b0183545015bd" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-common", "num-complex", "num-traits", @@ -677,48 +692,39 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", "r-efi", - "wasi 0.14.3+wasi-0.2.4", -] - -[[package]] -name = "gif" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b" -dependencies = [ - "color_quant", - "weezl", + "wasip2", ] [[package]] name = "half" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "bytemuck", "cfg-if", "crunchy", "num-traits", + "zerocopy", ] [[package]] name = "hashbrown" -version = "0.15.5" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" [[package]] name = "heck" @@ -728,48 +734,29 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "image" -version = "0.25.6" +version = "0.25.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a" +checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7" dependencies = [ "bytemuck", "byteorder-lite", - "color_quant", - "exr", - "gif", - "image-webp", + "moxcms", "num-traits", - "png", - "qoi", "ravif", "rayon", - "rgb", - "tiff", - "zune-core", - "zune-jpeg", -] - -[[package]] -name = "image-webp" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3" -dependencies = [ - "byteorder-lite", - "quick-error", ] [[package]] name = "imgref" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" +checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" [[package]] name = "indexmap" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown", @@ -777,9 +764,12 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] [[package]] name = "interpolate_name" @@ -807,16 +797,10 @@ version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "libc", ] -[[package]] -name = "jpeg-decoder" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07" - [[package]] name = "jpeg-encoder" version = "0.6.1" @@ -846,57 +830,56 @@ dependencies = [ [[package]] name = "kornia-3d" -version = "0.1.9" +version = "0.1.10" dependencies = [ "bincode", "faer", "serde", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] name = "kornia-icp" -version = "0.1.9" +version = "0.1.10" dependencies = [ "faer", "kiddo", "kornia-3d", "log", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] name = "kornia-image" -version = "0.1.9" +version = "0.1.10" dependencies = [ "kornia-tensor", "num-traits", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] name = "kornia-imgproc" -version = "0.1.9" +version = "0.1.10" dependencies = [ "fast_image_resize", "kornia-image", "kornia-tensor", "num-traits", "rayon", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] name = "kornia-io" -version = "0.1.9" +version = "0.1.10" dependencies = [ - "circular-buffer", - "image", "jpeg-encoder", "kornia-image", + "kornia-tensor", "log", "png", - "thiserror 2.0.16", + "thiserror 2.0.17", "tiff", "turbojpeg", "zune-jpeg", @@ -904,7 +887,7 @@ dependencies = [ [[package]] name = "kornia-py" -version = "0.1.9" +version = "0.1.10" dependencies = [ "kornia-3d", "kornia-icp", @@ -917,10 +900,10 @@ dependencies = [ [[package]] name = "kornia-tensor" -version = "0.1.9" +version = "0.1.10" dependencies = [ "num-traits", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] @@ -929,17 +912,11 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - [[package]] name = "libc" -version = "0.2.175" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libfuzzer-sys" @@ -959,15 +936,15 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "litrs" -version = "0.4.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" +checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "loop9" @@ -1016,9 +993,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memoffset" @@ -1029,12 +1006,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -1045,6 +1016,16 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "moxcms" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fbdd3d7436f8b5e892b8b7ea114271ff0fa00bc5acae845d53b07d498616ef6" +dependencies = [ + "num-traits", + "pxfm", +] + [[package]] name = "nano-gemm" version = "0.1.3" @@ -1138,12 +1119,11 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nom" -version = "7.1.3" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" dependencies = [ "memchr", - "minimal-lexical", ] [[package]] @@ -1165,11 +1145,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.50.1" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.52.0", + "windows-sys", ] [[package]] @@ -1236,9 +1216,9 @@ dependencies = [ [[package]] name = "numpy" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cfbf3f0feededcaa4d289fe3079b03659e85c5b5a177f4ba6fb01ab4fb3e39" +checksum = "9b2dba356160b54f5371b550575b78130a54718b4c6e46b3f33a6da74a27e78b" dependencies = [ "libc", "ndarray", @@ -1258,9 +1238,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "ordered-float" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01" +checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d" dependencies = [ "num-traits", ] @@ -1273,20 +1253,19 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pest" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" +checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4" dependencies = [ "memchr", - "thiserror 2.0.16", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc" +checksum = "187da9a3030dbafabbbfb20cb323b976dc7b7ce91fcd84f2f74d6e31d378e2de" dependencies = [ "pest", "pest_generator", @@ -1294,9 +1273,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966" +checksum = "49b401d98f5757ebe97a26085998d6c0eecec4995cad6ab7fc30ffdf4b052843" dependencies = [ "pest", "pest_meta", @@ -1307,9 +1286,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5" +checksum = "72f27a2cfee9f9039c4d86faa5af122a0ac3851441a34865b8a043b46be0065a" dependencies = [ "pest", "sha2", @@ -1366,9 +1345,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] @@ -1418,6 +1397,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "pxfm" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3cbdf373972bf78df4d3b518d07003938e2c7d1fb5891e55f9cb6df57009d84" +dependencies = [ + "num-traits", +] + [[package]] name = "py_literal" version = "0.4.0" @@ -1433,11 +1421,10 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ - "cfg-if", "indoc", "libc", "memoffset", @@ -1451,19 +1438,18 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", - "target-lexicon 0.13.2", + "target-lexicon 0.13.3", ] [[package]] name = "pyo3-ffi" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", "pyo3-build-config", @@ -1471,9 +1457,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1483,9 +1469,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck", "proc-macro2", @@ -1494,15 +1480,6 @@ dependencies = [ "syn", ] -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - [[package]] name = "quick-error" version = "2.0.1" @@ -1511,9 +1488,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.40" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -1616,11 +1593,11 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.5.0" +version = "11.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146" +checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" dependencies = [ - "bitflags 2.9.3", + "bitflags 2.10.0", ] [[package]] @@ -1690,18 +1667,28 @@ checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1766,15 +1753,15 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "sorted-vec" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee66d25213bcbd4feb55704c0c8eee3f95d022c693dab42d796e1b8f23666d9a" +checksum = "19f58d7b0190c7f12df7e8be6b79767a0836059159811b869d5ab55721fe14d0" [[package]] name = "syn" -version = "2.0.106" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -1787,7 +1774,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01198a2debb237c62b6826ec7081082d951f46dbb64b0e8c7649a452230d1dfc" dependencies = [ - "bitflags 2.9.3", + "bitflags 2.10.0", "byteorder", "enum-as-inner", "libc", @@ -1816,9 +1803,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "target-lexicon" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "thiserror" @@ -1831,11 +1818,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.16", + "thiserror-impl 2.0.17", ] [[package]] @@ -1851,9 +1838,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -1871,13 +1858,16 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f" dependencies = [ + "fax", "flate2", - "jpeg-decoder", + "half", + "quick-error", "weezl", + "zune-jpeg", ] [[package]] @@ -1997,9 +1987,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ucd-trie" @@ -2009,9 +1999,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unindent" @@ -2019,6 +2009,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" +[[package]] +name = "unty" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" + [[package]] name = "v_frame" version = "0.3.9" @@ -2038,9 +2034,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "version-compare" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" +checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" [[package]] name = "version_check" @@ -2048,6 +2044,12 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "virtue" +version = "0.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" + [[package]] name = "walkdir" version = "2.5.0" @@ -2065,45 +2067,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.3+wasi-0.2.4" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2111,39 +2100,39 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] [[package]] name = "weezl" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3" +checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "winapi-util" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys", ] [[package]] @@ -2155,7 +2144,7 @@ dependencies = [ "windows-collections", "windows-core", "windows-future", - "windows-link", + "windows-link 0.1.3", "windows-numerics", ] @@ -2176,7 +2165,7 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ "windows-implement", "windows-interface", - "windows-link", + "windows-link 0.1.3", "windows-result", "windows-strings", ] @@ -2188,15 +2177,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" dependencies = [ "windows-core", - "windows-link", + "windows-link 0.1.3", "windows-threading", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -2205,9 +2194,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -2220,6 +2209,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-numerics" version = "0.2.0" @@ -2227,7 +2222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" dependencies = [ "windows-core", - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -2236,7 +2231,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -2245,58 +2240,16 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.3", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", + "windows-link 0.2.1", ] [[package]] @@ -2305,105 +2258,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" - [[package]] name = "winnow" version = "0.7.13" @@ -2415,24 +2272,24 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.45.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "zerocopy" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", @@ -2445,20 +2302,11 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] - [[package]] name = "zune-jpeg" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1f7e205ce79eb2da3cd71c5f55f3589785cb7c79f6a03d1c8d1491bda5d089" +checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" dependencies = [ "zune-core", ] diff --git a/pkgs/development/python-modules/kornia-rs/default.nix b/pkgs/development/python-modules/kornia-rs/default.nix index ae318af5a3ca..86de2432268f 100644 --- a/pkgs/development/python-modules/kornia-rs/default.nix +++ b/pkgs/development/python-modules/kornia-rs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "kornia-rs"; - version = "0.1.9"; + version = "0.1.10"; pyproject = true; src = fetchFromGitHub { owner = "kornia"; repo = "kornia-rs"; tag = "v${version}"; - hash = "sha256-0Id1Iyd/xyqSqFvg/TXnlX1DgMUWuMS9KbtDXduwU+Y="; + hash = "sha256-rC5NqyQah3D4tGLefS4cSIXA3+gQ0+4RNcXOcEYxryg="; }; nativeBuildInputs = [ From a5370c8752db2465791097660563b3b2441b56ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 17:01:06 +0100 Subject: [PATCH 305/542] python3Packages.outlines-core: 0.2.11 -> 0.2.13 https://github.com/dottxt-ai/outlines-core/releases/tag/0.2.13 --- .../python-modules/outlines-core/Cargo.lock | 875 ++++++++---------- .../python-modules/outlines-core/default.nix | 4 +- 2 files changed, 389 insertions(+), 490 deletions(-) diff --git a/pkgs/development/python-modules/outlines-core/Cargo.lock b/pkgs/development/python-modules/outlines-core/Cargo.lock index 20b287a1c984..fb6bba097780 100644 --- a/pkgs/development/python-modules/outlines-core/Cargo.lock +++ b/pkgs/development/python-modules/outlines-core/Cargo.lock @@ -2,41 +2,38 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] [[package]] -name = "autocfg" -version = "1.4.0" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-lc-rs" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7" +checksum = "5932a7d9d28b0d2ea34c6b3779d35e3dd6f6345317c34e73438c4f1f29144151" dependencies = [ "aws-lc-sys", "zeroize", @@ -44,9 +41,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.29.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079" +checksum = "1826f2e4cfc2cd19ee53c42fbf68e2f81ec21108e0b7ecf6a71cf062137360fc" dependencies = [ "bindgen", "cc", @@ -55,21 +52,6 @@ dependencies = [ "fs_extra", ] -[[package]] -name = "backtrace" -version = "0.3.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - [[package]] name = "base64" version = "0.13.1" @@ -104,44 +86,35 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.5" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.9.1", + "bitflags", "cexpr", "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", "quote", "regex", - "rustc-hash 1.1.0", + "rustc-hash", "shlex", "syn", - "which", ] [[package]] name = "bitflags" -version = "1.3.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "byteorder" @@ -157,10 +130,11 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.23" +version = "1.2.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" +checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -177,9 +151,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -222,9 +196,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -376,16 +350,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" -[[package]] -name = "errno" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "esaxx-rs" version = "0.1.10" @@ -393,10 +357,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" [[package]] -name = "flate2" -version = "1.1.1" +name = "find-msvc-tools" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + +[[package]] +name = "flate2" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "miniz_oxide", @@ -410,9 +380,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -493,41 +463,35 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "js-sys", "libc", "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "wasip2", "wasm-bindgen", ] -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" [[package]] name = "heck" @@ -550,19 +514,10 @@ dependencies = [ "rustls", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.17", "ureq", ] -[[package]] -name = "home" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "http" version = "1.3.1" @@ -605,18 +560,20 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +checksum = "1744436df46f0bde35af3eda22aeaba453aada65d8f1c171cd8a5f59030bd69f" dependencies = [ + "atomic-waker", "bytes", "futures-channel", - "futures-util", + "futures-core", "http", "http-body", "httparse", "itoa", "pin-project-lite", + "pin-utils", "smallvec", "tokio", "want", @@ -624,11 +581,10 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.5" +version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "futures-util", "http", "hyper", "hyper-util", @@ -637,22 +593,26 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 0.26.11", + "webpki-roots 1.0.4", ] [[package]] name = "hyper-util" -version = "0.1.11" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2" +checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" dependencies = [ + "base64 0.22.1", "bytes", "futures-channel", + "futures-core", "futures-util", "http", "http-body", "hyper", + "ipnet", "libc", + "percent-encoding", "pin-project-lite", "socket2", "tokio", @@ -662,9 +622,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -675,9 +635,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -688,11 +648,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -703,42 +662,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -754,9 +709,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -775,9 +730,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown", @@ -798,9 +753,12 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] [[package]] name = "ipnet" @@ -809,19 +767,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] -name = "itertools" -version = "0.11.0" +name = "iri-string" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" dependencies = [ - "either", + "memchr", + "serde", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -843,19 +802,19 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jobserver" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" dependencies = [ "once_cell", "wasm-bindgen", @@ -867,55 +826,43 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" -version = "0.2.172" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libloading" -version = "0.8.7" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-targets 0.53.0", + "windows-link", ] [[package]] name = "libredox" -version = "0.1.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ - "bitflags 2.9.1", + "bitflags", "libc", ] -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "lru-slab" @@ -925,9 +872,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "macro_rules_attribute" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +checksum = "65049d7923698040cd0b1ddcced9b0eb14dd22c5f86ae59c3740eab64a676520" dependencies = [ "macro_rules_attribute-proc_macro", "paste", @@ -935,15 +882,15 @@ dependencies = [ [[package]] name = "macro_rules_attribute-proc_macro" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" +checksum = "670fdfda89751bc4a84ac13eaa63e205cf0fd22b4c9a5fbfa085b63c1f1d3a30" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memoffset" @@ -954,12 +901,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -968,39 +909,41 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] name = "mio" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", + "wasi", + "windows-sys 0.61.2", ] [[package]] name = "monostate" -version = "0.1.14" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe1be9d0c75642e3e50fedc7ecadf1ef1cbce6eb66462153fc44245343fbee" +checksum = "3341a273f6c9d5bef1908f17b7267bbab0e95c9bf69a0d4dcf8e9e1b2c76ef67" dependencies = [ "monostate-impl", "serde", + "serde_core", ] [[package]] name = "monostate-impl" -version = "0.1.14" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c402a4092d5e204f32c9e155431046831fa712637043c58cb73bc6bc6c9663b5" +checksum = "e4db6d5580af57bf992f59068d4ea26fd518574ff48d7639b255a36f9de6e7e9" dependencies = [ "proc-macro2", "quote", @@ -1023,15 +966,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.21.3" @@ -1040,11 +974,11 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "onig" -version = "6.4.0" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", "once_cell", "onig_sys", @@ -1052,9 +986,9 @@ dependencies = [ [[package]] name = "onig_sys" -version = "69.8.1" +version = "69.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc" dependencies = [ "cc", "pkg-config", @@ -1068,7 +1002,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "outlines-core" -version = "0.2.11" +version = "0.0.0" dependencies = [ "bincode", "hf-hub", @@ -1076,11 +1010,11 @@ dependencies = [ "pyo3", "regex", "regex-automata", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde-pyobject", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.17", "tokenizers", ] @@ -1092,9 +1026,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pin-project-lite" @@ -1116,15 +1050,15 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portable-atomic" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "potential_utf" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -1140,9 +1074,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.32" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", "syn", @@ -1150,18 +1084,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.23.5" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872" +checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" dependencies = [ "cfg-if", "indoc", @@ -1177,19 +1111,20 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.23.5" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb" +checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" dependencies = [ "once_cell", + "python3-dll-a", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.23.5" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d" +checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" dependencies = [ "libc", "pyo3-build-config", @@ -1197,9 +1132,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.23.5" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da" +checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1209,9 +1144,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.23.5" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028" +checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" dependencies = [ "heck", "proc-macro2", @@ -1221,20 +1156,29 @@ dependencies = [ ] [[package]] -name = "quinn" -version = "0.11.8" +name = "python3-dll-a" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" +checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" +dependencies = [ + "cc", +] + +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ "bytes", "cfg_aliases", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.1", + "rustc-hash", "rustls", "socket2", - "thiserror 2.0.12", + "thiserror 2.0.17", "tokio", "tracing", "web-time", @@ -1242,20 +1186,20 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.12" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", - "getrandom 0.3.3", + "getrandom 0.3.4", "lru-slab", - "rand 0.9.1", + "rand 0.9.2", "ring", - "rustc-hash 2.1.1", + "rustc-hash", "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.12", + "thiserror 2.0.17", "tinyvec", "tracing", "web-time", @@ -1263,32 +1207,32 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.12" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" dependencies = [ "cfg_aliases", "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rand" @@ -1303,9 +1247,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", @@ -1346,14 +1290,14 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", ] [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -1372,9 +1316,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -1393,9 +1337,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -1405,9 +1349,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -1416,15 +1360,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.15" +version = "0.12.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" dependencies = [ "base64 0.22.1", "bytes", @@ -1436,16 +1380,12 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-util", - "ipnet", "js-sys", "log", - "mime", - "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls", - "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -1455,14 +1395,14 @@ dependencies = [ "tokio-rustls", "tokio-util", "tower", + "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.11", - "windows-registry", + "webpki-roots 1.0.4", ] [[package]] @@ -1479,42 +1419,17 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.9.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.59.0", -] - [[package]] name = "rustls" -version = "0.23.27" +version = "0.23.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ "aws-lc-rs", "log", @@ -1526,20 +1441,11 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "rustls-pki-types" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" dependencies = [ "web-time", "zeroize", @@ -1547,9 +1453,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.3" +version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ "aws-lc-rs", "ring", @@ -1559,9 +1465,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" @@ -1571,28 +1477,38 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] [[package]] name = "serde-pyobject" -version = "0.5.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bb5418e5b2eb469c0e8e6eb2c9de96aa1db5e2e04f25560de78e02bb746aa6" +checksum = "4c485853a65e1a5f2db72e818ec4c7548a39614fabdd988f5e3504071453b7d7" dependencies = [ "pyo3", "serde", ] [[package]] -name = "serde_derive" -version = "1.0.219" +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1601,15 +1517,16 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "indexmap", "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1631,28 +1548,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] -name = "slab" -version = "0.4.9" +name = "simd-adler32" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "smallvec" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.9" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -1680,9 +1600,9 @@ dependencies = [ [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "strsim" @@ -1698,9 +1618,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.101" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -1729,9 +1649,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "thiserror" @@ -1744,11 +1664,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl 2.0.17", ] [[package]] @@ -1764,9 +1684,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -1775,9 +1695,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -1785,9 +1705,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -1824,7 +1744,7 @@ dependencies = [ "serde", "serde_json", "spm_precompiled", - "thiserror 2.0.12", + "thiserror 2.0.17", "unicode-normalization-alignments", "unicode-segmentation", "unicode_categories", @@ -1832,24 +1752,23 @@ dependencies = [ [[package]] name = "tokio" -version = "1.45.0" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", "libc", "mio", "pin-project-lite", "socket2", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-rustls" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls", "tokio", @@ -1857,9 +1776,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" dependencies = [ "bytes", "futures-core", @@ -1883,6 +1802,24 @@ dependencies = [ "tower-service", ] +[[package]] +name = "tower-http" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +dependencies = [ + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "iri-string", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -1907,9 +1844,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", ] @@ -1922,9 +1859,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-normalization-alignments" @@ -1943,9 +1880,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "unicode_categories" @@ -1992,13 +1929,14 @@ dependencies = [ [[package]] name = "url" -version = "2.5.4" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -2024,50 +1962,37 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" dependencies = [ "cfg-if", "js-sys", @@ -2078,9 +2003,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2088,22 +2013,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] @@ -2123,9 +2048,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" dependencies = [ "js-sys", "wasm-bindgen", @@ -2147,30 +2072,18 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.0", + "webpki-roots 1.0.4", ] [[package]] name = "webpki-roots" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" +checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" dependencies = [ "rustls-pki-types", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" @@ -2195,38 +2108,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-link" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" - -[[package]] -name = "windows-registry" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.53.0", -] - -[[package]] -name = "windows-result" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-strings" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" -dependencies = [ - "windows-link", -] +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-sys" @@ -2255,6 +2139,24 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -2288,18 +2190,19 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.0" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -2316,9 +2219,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -2334,9 +2237,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_aarch64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -2352,9 +2255,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" @@ -2364,9 +2267,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -2382,9 +2285,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_i686_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -2400,9 +2303,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -2418,9 +2321,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -2436,32 +2339,28 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "windows_x86_64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags 2.9.1", -] +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -2469,9 +2368,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", @@ -2481,18 +2380,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.25" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.25" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", @@ -2522,15 +2421,15 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -2539,9 +2438,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -2550,9 +2449,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/outlines-core/default.nix b/pkgs/development/python-modules/outlines-core/default.nix index cca2b10ff673..73c51490faa0 100644 --- a/pkgs/development/python-modules/outlines-core/default.nix +++ b/pkgs/development/python-modules/outlines-core/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "outlines-core"; - version = "0.2.11"; + version = "0.2.13"; pyproject = true; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "dottxt-ai"; repo = "outlines-core"; tag = version; - hash = "sha256-lLMTHFytJT2MhnzT0RlRCaSBPijA81fjxUqx4IGfVo8="; + hash = "sha256-mfw/cOLZPRcL3HWmrm/SyA0zDCPWr5F19EWIUdNu9jM="; }; cargoDeps = rustPlatform.importCargoLock { From 5c04364b72896273b385529f71f9e87c6482f295 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Nov 2025 18:05:39 +0100 Subject: [PATCH 306/542] python3Packages.lancedb: 0.21.2 -> 0.25.3 https://github.com/lancedb/lancedb/releases/tag/python-v0.25.3 --- pkgs/development/python-modules/lancedb/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index 2a684f8ee4bf..1012254e2cdf 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -22,6 +22,7 @@ # tests aiohttp, + datafusion, pandas, polars, pylance, @@ -33,21 +34,21 @@ buildPythonPackage rec { pname = "lancedb"; - version = "0.21.2"; + version = "0.25.3"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lancedb"; tag = "python-v${version}"; - hash = "sha256-ZPVkMlZz6lSF4ZCIX6fGcfCvni3kXCLPLXZqZw7icpE="; + hash = "sha256-2Kl1SikqiCXTYcja2mPnQQYxcRBjW2oW+o9PDaBbEoc="; }; buildAndTestSubdir = "python"; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Q3ejJsddHLGGbw3peLRtjPqBrS6fNi0C3K2UWpcM/4k="; + hash = "sha256-1FllSQJySSwz4AYyQYAn3JGCmlp3atgDiiLRZeBedyU="; }; build-system = [ rustPlatform.maturinBuildHook ]; @@ -80,6 +81,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aiohttp + datafusion duckdb pandas polars From dd055b1952563a0700a9fb88b6d427451efe9171 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 02:30:13 +0100 Subject: [PATCH 307/542] python3Packages.dissect-etl: 3.11 -> 3.13 https://github.com/fox-it/dissect.etl/releases/tag/3.13 --- pkgs/development/python-modules/dissect-etl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index 3d04c3652f39..0d05c91667a8 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-etl"; - version = "3.11"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.etl"; tag = version; - hash = "sha256-soJH7kx/029yXyOjv6OsWjWAMMHXKx711GLPBClDAK0="; + hash = "sha256-UzbQyCUhMGHjmSzTmSrZZt+73gByMqokoPm6UDEA9F4="; }; build-system = [ From ae0ae34c0c213ec5b79adacea5c2ecbf1bcbadcf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 02:41:03 +0100 Subject: [PATCH 308/542] python3Packages.pytest-describe: 2.2.0 -> 3.0.0 https://github.com/pytest-dev/pytest-describe/releases/tag/3.0.0 --- .../python-modules/pytest-describe/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix index 6eb2b8390b2c..0f450549d47e 100644 --- a/pkgs/development/python-modules/pytest-describe/default.nix +++ b/pkgs/development/python-modules/pytest-describe/default.nix @@ -4,18 +4,18 @@ fetchFromGitHub, # build-system - setuptools, + uv-build, # dependencies pytest, # tests - pytest7CheckHook, + pytestCheckHook, }: let pname = "pytest-describe"; - version = "2.2.0"; + version = "3.0.0"; in buildPythonPackage { inherit pname version; @@ -25,15 +25,14 @@ buildPythonPackage { owner = "pytest-dev"; repo = "pytest-describe"; tag = version; - hash = "sha256-ih0XkYOtB+gwUsgo1oSti2460P3gq3tR+UsyRlzMjLE="; + hash = "sha256-rMO+Hkz3iWFML8UUq4aDl+t7epzqXmYGZrgRB9OYf6w="; }; - build-system = [ setuptools ]; + build-system = [ uv-build ]; buildInputs = [ pytest ]; - # test_fixture breaks with pytest 8.4 - nativeCheckInputs = [ pytest7CheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Describe-style plugin for the pytest framework"; From 1b8ca7ff6bc7a97a09fcb2fbd4bf10962f1dd7a2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 03:19:42 +0100 Subject: [PATCH 309/542] python3Packages.gcsfs: 2025.3.2 -> 2025.10.0 https://github.com/fsspec/gcsfs/raw/2025.10.0/docs/source/changelog.rst --- pkgs/development/python-modules/gcsfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 681fb725d273..9372c189b5d3 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2025.3.2"; + version = "2025.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "gcsfs"; tag = version; - hash = "sha256-aXBlj9ej3Ya7h4x/akl/iX6dDS/SgkkEsOQ2E9KmCDU="; + hash = "sha256-Co98M3zK839mIWhV1Sifyb9r0sy1BjX6stDIj/0ONYo="; }; build-system = [ From c688668d4b21507f572a6df6737c54d950e99483 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 03:20:45 +0100 Subject: [PATCH 310/542] python3Packages.sphinx-autoapi: 3.6.0 -> 3.6.1 https://github.com/readthedocs/sphinx-autoapi/blob/v3.6.1/CHANGELOG.rst --- pkgs/development/python-modules/sphinx-autoapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index ca3b91b871fd..689da2aab799 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.6.0"; + version = "3.6.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "readthedocs"; repo = "sphinx-autoapi"; tag = "v${version}"; - hash = "sha256-pDfGNpDyrU4q48ZHKqfN8OrxKICfIhac2qMJDB1iE0I="; + hash = "sha256-dafrvrTl4bVBBaAhTCIPVrSA1pdNlbT5Rou3T//fmKQ="; }; build-system = [ flit-core ]; From c94b6d13abd2d7792acad1ab12589c9e31840945 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:12:25 +0100 Subject: [PATCH 311/542] python314Packages.twisted: fix tests, modernize --- .../python-modules/twisted/default.nix | 19 ++++++++++++++----- .../twisted/python314-urljoin-compat.patch | 13 +++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/twisted/python314-urljoin-compat.patch diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 4b3c8b3e576f..8c90f00e398a 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -5,6 +5,7 @@ pythonAtLeast, pythonOlder, fetchPypi, + fetchpatch, python, # build-system @@ -56,9 +57,7 @@ buildPythonPackage rec { pname = "twisted"; version = "25.5.0"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -66,15 +65,25 @@ buildPythonPackage rec { hash = "sha256-HesnI1jLa+Hj6PxvnIs2946w+nwiM9Lb4R7G/uBOoxY="; }; + patches = [ + (fetchpatch { + # https://github.com/twisted/twisted/pull/12508 + url = "https://github.com/twisted/twisted/commit/ef6160aa2595adfba0c71da6db65b7a7252f23e9.patch"; + hash = "sha256-zHkEWT0lvWf86RlkzU5Wx6R5ear04cfpxB7wjgdpw5c="; + }) + # https://github.com/twisted/twisted/pull/12511 + ./python314-urljoin-compat.patch + ]; + __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ + build-system = [ hatchling hatch-fancy-pypi-readme incremental ]; - propagatedBuildInputs = [ + dependencies = [ attrs automat constantly diff --git a/pkgs/development/python-modules/twisted/python314-urljoin-compat.patch b/pkgs/development/python-modules/twisted/python314-urljoin-compat.patch new file mode 100644 index 000000000000..dbae3bf605fa --- /dev/null +++ b/pkgs/development/python-modules/twisted/python314-urljoin-compat.patch @@ -0,0 +1,13 @@ +diff --git a/src/twisted/web/client.py b/src/twisted/web/client.py +index d3cd11fb84..5f18965759 100644 +--- a/src/twisted/web/client.py ++++ b/src/twisted/web/client.py +@@ -220,7 +220,7 @@ def _urljoin(base, url): + """ + base, baseFrag = urldefrag(base) + url, urlFrag = urldefrag(urljoin(base, url)) +- return urljoin(url, b"#" + (urlFrag or baseFrag)) ++ return urljoin(url, b"#" + (urlFrag or baseFrag)).strip(b"#") + + + def _makeGetterFactory(url, factoryFactory, contextFactory=None, *args, **kwargs): From de07980c711a65d783724c2c03ff847579fb90c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:47:45 +0100 Subject: [PATCH 312/542] python3Packages.docstring-parser: 0.16 -> 0.17.0 https://github.com/rr-/docstring_parser/blob/0.17.0/CHANGELOG.md --- .../python-modules/docstring-parser/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix index 651695963ec6..1d9cbbd1a4de 100644 --- a/pkgs/development/python-modules/docstring-parser/default.nix +++ b/pkgs/development/python-modules/docstring-parser/default.nix @@ -2,26 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "docstring-parser"; - version = "0.16"; + version = "0.17.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "rr-"; repo = "docstring_parser"; tag = version; - hash = "sha256-xwV+mgCOC/MyCqGELkJVqQ3p2g2yw/Ieomc7k0HMXms="; + hash = "sha256-hR+i1HU/ZpN6I3a8k/Wv2OrXgB4ls/A5OHZRqxEZS78="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; From 4dba4f69832a9b6c0de50757ac4311c6b93626cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:50:09 +0100 Subject: [PATCH 313/542] python3Packages.eval-type-backport: 0.2.2 -> 0.3.0 https://github.com/alexmojaki/eval_type_backport/compare/v0.2.2...v0.3.0 --- .../development/python-modules/eval-type-backport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eval-type-backport/default.nix b/pkgs/development/python-modules/eval-type-backport/default.nix index 8c952c2867bc..a804813e7204 100644 --- a/pkgs/development/python-modules/eval-type-backport/default.nix +++ b/pkgs/development/python-modules/eval-type-backport/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "eval-type-backport"; - version = "0.2.2"; + version = "0.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "alexmojaki"; repo = "eval_type_backport"; tag = "v${version}"; - hash = "sha256-r+JiPBcU/6li9R/CQP0CKoWJiMgky03GKrMIsmaSJEk="; + hash = "sha256-K+FrgRyxCbrKHcrUaHEJWlLp2i0xes3HwXPN9ucioZY="; }; nativeBuildInputs = [ From 7148f6d7401e72ecf551d082cdcb1b250877ac56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:52:58 +0100 Subject: [PATCH 314/542] python3Packages.geojson: 3.1.0 -> 3.2.0 https://github.com/jazzband/geojson/blob/3.2.0/CHANGELOG.rst --- pkgs/development/python-modules/geojson/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index 86680fc01f2e..4088d11c34b1 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -2,31 +2,22 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, setuptools, unittestCheckHook, }: buildPythonPackage rec { pname = "geojson"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "geojson"; tag = version; - hash = "sha256-OL+7ntgzpA63ALQ8whhKRePsKxcp81PLuU1bHJvxN9U="; + hash = "sha256-0p8FW9alcWCSdi66wanS/F9IgO714WIRQIXvg3f9op8="; }; - patches = [ - (fetchpatch2 { - name = "dont-fail-with-python-313.patch"; - url = "https://github.com/jazzband/geojson/commit/c13afff339e6b78f442785cc95f0eb66ddab3e7b.patch?full_index=1"; - hash = "sha256-xdz96vzTA+zblJtCvXIZe5p51xJGM5eB/HAtCXgy5JA="; - }) - ]; - build-system = [ setuptools ]; pythonImportsCheck = [ "geojson" ]; From ae34c2503294ea81a6181fc07f9cba588c51fa71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Nov 2025 00:02:48 +0100 Subject: [PATCH 315/542] python3Packages.ttp: 0.9.5 -> 0.10.0 https://github.com/dmulyalin/ttp/releases/tag/0.10.0 --- pkgs/development/python-modules/ttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 45b88c075ee8..5a6958db6fbb 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "ttp"; - version = "0.9.5"; + version = "0.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dmulyalin"; repo = "ttp"; tag = version; - hash = "sha256-IWqPFspERBVkjsTYTAkOTOrugq4fD65Q140G3SCEV0w="; + hash = "sha256-W1y84zHRhB8UGUfO5jV2k9epd9kaXUPqzT71URjm4TQ="; }; nativeBuildInputs = [ poetry-core ]; From 1e18750c3803c9cdf8ff24b6b44fb18046902b6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Nov 2025 00:11:56 +0100 Subject: [PATCH 316/542] python3Packages.pandas: 2.3.1 -> 2.3.3 https://pandas.pydata.org/docs/whatsnew/index.html --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 970a880d0fe6..f416bde65bc2 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -63,7 +63,7 @@ let pandas = buildPythonPackage rec { pname = "pandas"; - version = "2.3.1"; + version = "2.3.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -72,7 +72,7 @@ let owner = "pandas-dev"; repo = "pandas"; tag = "v${version}"; - hash = "sha256-xvdiWjJ5uHfrzXB7c4cYjFjZ6ue5i7qzb4tAEPJMAV0="; + hash = "sha256-jY1uM9HmJzoFk26ilbtzJnxAsQhmXS19r73JcFeFWRQ="; }; # A NOTE regarding the Numpy version relaxing: Both Numpy versions 1.x & From 7a2f7addf7583960f2163586a44e7fdef574f980 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Nov 2025 00:20:32 +0100 Subject: [PATCH 317/542] python3Packages.rdflib: 7.2.1 -> 7.4.0 https://github.com/RDFLib/rdflib/compare/7.2.1...7.4.0 --- pkgs/development/python-modules/rdflib/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 7c0884f08dd5..2241b9531672 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonOlder, # builds @@ -28,23 +27,15 @@ buildPythonPackage rec { pname = "rdflib"; - version = "7.2.1"; + version = "7.4.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "RDFLib"; repo = "rdflib"; tag = version; - hash = "sha256-FisMiBTiL6emJS0d7UmlwGUzayA+CME5GGWgw/owfhc="; + hash = "sha256-/FEwNeNydhdW4xCKmLhh9tkXGcUAhO+D5N/b9pY6jh4="; }; - patches = [ - (fetchpatch { - url = "https://github.com/RDFLib/rdflib/commit/0ab817f86b5733c9a3b4ede7ef065b8d79e53fc5.diff"; - hash = "sha256-+yWzQ3MyH0wihgiQRMMXV/FpG8WlXaIBhpsDF4e3rbY="; - }) - ]; build-system = [ poetry-core ]; From 512b1e954f01398c72495b1a0c023fecc9c4bbab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Nov 2025 00:21:02 +0100 Subject: [PATCH 318/542] python3Packages.auditwheel: 6.4.2 -> 6.5.0 https://github.com/pypa/auditwheel/blob/6.5.0/CHANGELOG.md --- pkgs/development/python-modules/auditwheel/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix index 742bcf09c4d0..ab1342a9c07b 100644 --- a/pkgs/development/python-modules/auditwheel/default.nix +++ b/pkgs/development/python-modules/auditwheel/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, setuptools-scm, pyelftools, @@ -17,14 +16,12 @@ buildPythonPackage rec { pname = "auditwheel"; - version = "6.4.2"; + version = "6.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; - hash = "sha256-t6Ya/JGDtrXGYd5ZylhvnHIARFpAnFjN8gSdb3FjbVE="; + hash = "sha256-T7y9WFQFS7HdeHDbA3J7hxuWsYFH21cllWHAWGA5h9c="; }; build-system = [ setuptools-scm ]; From 2e8700027b9c0518a018cfcf91f732d465933316 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 16 Nov 2025 01:47:25 +0100 Subject: [PATCH 319/542] python3Packages.django-bootstrap3: 25.2 -> 25.3 https://github.com/zostera/django-bootstrap3/blob/v25.3/CHANGELOG.md --- .../python-modules/django-bootstrap3/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index cc9d493ad8f0..575cc902face 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system uv-build, @@ -17,24 +16,16 @@ buildPythonPackage rec { pname = "django-bootstrap3"; - version = "25.2"; + version = "25.3"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap3"; tag = "v${version}"; - hash = "sha256-TaB2PeBjmCNFuEZ+To2Q3C6zlFCaaTB70LxQWWb5AEo="; + hash = "sha256-OCr25Sc5fbL5ivrM2LpDAcTj8bPX4Q23Yj1j6jRG03U="; }; - patches = [ - (fetchpatch2 { - name = "uv-build.patch"; - url = "https://github.com/zostera/django-bootstrap3/commit/5e1a86549e9607b8e2a9772a3a839fc81b9ae6c0.patch?full_index=1"; - hash = "sha256-VcRC7ehyVTl0KuovD8tNCbZnKXKCOGpux1XXUOoDaTw="; - }) - ]; - build-system = [ uv-build ]; dependencies = [ django ]; From e7d84921c14b9f2b8f83cadcb094c640e8196951 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 16 Nov 2025 03:23:07 +0100 Subject: [PATCH 320/542] python3Packages.django-bootstrap4: 25.2 -> 25.3 https://github.com/zostera/django-bootstrap4/blob/v25.3/CHANGELOG.md --- .../python-modules/django-bootstrap4/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 151aaea4894d..47d1929e57e2 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system uv-build, @@ -20,24 +19,16 @@ buildPythonPackage rec { pname = "django-bootstrap4"; - version = "25.2"; + version = "25.3"; pyproject = true; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; tag = "v${version}"; - hash = "sha256-+G9UHW4eUGl00A/kDj+iTP7ehjj/dwUENKffvGxE6/4="; + hash = "sha256-aayR9yXsC1Kt4PtlhhdnaPA5cqYuL4CV0UY1fvA/ntk="; }; - patches = [ - (fetchpatch2 { - name = "uv-build.patch"; - url = "https://github.com/zostera/django-bootstrap4/commit/09b14bc9b70e7da92200c4bc014e2d3c597f0ea6.patch?full_index=1"; - hash = "sha256-ZW9y8n0ZCOP37EoP32e7ue6h93KgGw1pW8Q1Q8IuNk8="; - }) - ]; - build-system = [ uv-build ]; dependencies = [ beautifulsoup4 ]; From e990d0582289a47594d539651f26b82a702fd034 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Nov 2025 23:11:09 +0100 Subject: [PATCH 321/542] platformio: pin marshamllow at 3.26.1 --- pkgs/by-name/pl/platformio-core/package.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pl/platformio-core/package.nix b/pkgs/by-name/pl/platformio-core/package.nix index 9edb8ce9c8a3..18d6d98a222a 100644 --- a/pkgs/by-name/pl/platformio-core/package.nix +++ b/pkgs/by-name/pl/platformio-core/package.nix @@ -1,6 +1,6 @@ { lib, - python3Packages, + python3, fetchFromGitHub, fetchpatch, installShellFiles, @@ -11,6 +11,23 @@ udevCheckHook, }: +let + python = python3.override { + self = python; + packageOverrides = self: super: { + marshmallow = super.marshmallow.overridePythonAttrs (oldAttrs: rec { + version = "3.26.1"; + src = fetchFromGitHub { + owner = "marshmallow-code"; + repo = "marshmallow"; + tag = version; + hash = "sha256-l5pEhv8D6jRlU24SlsGQEkXda/b7KUdP9mAqrZCbl38="; + }; + }); + }; + }; + python3Packages = python.pkgs; +in with python3Packages; buildPythonApplication rec { pname = "platformio"; From fa85379f7fd09e05492648a9a943651799934e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 15 Nov 2025 21:41:48 -0800 Subject: [PATCH 322/542] python3Packages.pytest-asyncio: 1.2.0 -> 1.3.0 Diff: https://github.com/pytest-dev/pytest-asyncio/compare/v1.2.0...v1.3.0 Changelog: https://github.com/pytest-dev/pytest-asyncio/blob/v1.3.0/docs/reference/changelog.rst --- .../python-modules/pytest-asyncio/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 6d1d22738532..a8c33d016561 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "1.2.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "1.3.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-asyncio"; tag = "v${version}"; - hash = "sha256-27FCV7zgFGe/Q0fkYyh5Z05foVGhbKBRPTH4UK/tW5A="; + hash = "sha256-MWKMJkvxdvuOyxE8rNlf15j7C+MwJibnNsbfS0biKwo="; }; outputs = [ @@ -31,12 +31,13 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - dependencies = [ - backports-asyncio-runner - ] - ++ lib.optionals (pythonOlder "3.13") [ - typing-extensions - ]; + dependencies = + lib.optionals (pythonOlder "3.11") [ + backports-asyncio-runner + ] + ++ lib.optionals (pythonOlder "3.13") [ + typing-extensions + ]; postInstall = '' mkdir $testout From 4c2b889da988bc7583e78220aee6bd11723592af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Nov 2025 15:21:42 -0800 Subject: [PATCH 323/542] python3Packages.keyring: 25.6.0 -> 25.7.0 Diff: https://github.com/jaraco/keyring/compare/v25.6.0...v25.7.0 Changelog: https://github.com/jaraco/keyring/blob/v25.7.0/NEWS.rst --- pkgs/development/python-modules/keyring/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 0583cbb5160f..b39e1be83fb4 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -19,17 +19,21 @@ buildPythonPackage rec { pname = "keyring"; - version = "25.6.0"; + version = "25.7.0"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jaraco"; repo = "keyring"; tag = "v${version}"; - hash = "sha256-qu9HAlZMLlIVs8c9ClzWUljezhrt88gu1kouklMNxMY="; + hash = "sha256-v9s28vwx/5DJRa3dQyS/mdZppfvFcfBtafjBRi2c1oQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"coherent.licensed",' "" + ''; + build-system = [ setuptools-scm ]; nativeBuildInputs = [ From 0090be6d2a7126914279504bdc568e6376c659e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Nov 2025 08:53:15 -0800 Subject: [PATCH 324/542] python3Packages.pytest-benchmark: 5.2.0 -> 5.2.3 Diff: https://github.com/ionelmc/pytest-benchmark/compare/v5.2.0...v5.2.3 Changelog: https://github.com/ionelmc/pytest-benchmark/blob/v5.2.3/CHANGELOG.rst --- .../pytest-benchmark/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 24e50f91acb3..525d94e021de 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytest-benchmark"; - version = "5.2.0"; + version = "5.2.3"; pyproject = true; src = fetchFromGitHub { owner = "ionelmc"; repo = "pytest-benchmark"; tag = "v${version}"; - hash = "sha256-BM17nrJfoOHkl7hOeY/VdoH5oEQP6EJWeNXa5x8/5UM="; + hash = "sha256-qjgP9H3WUYFm1xamOqhGk5YJQv94QfyJvrRoltHJHHc="; }; build-system = [ setuptools ]; @@ -64,19 +64,14 @@ buildPythonPackage rec { export PATH="$out/bin:$PATH" ''; - disabledTests = - lib.optionals (pythonOlder "3.12") [ - # AttributeError: 'PluginImportFixer' object has no attribute 'find_spec' - "test_compare_1" - "test_compare_2" - "test_regression_checks" - "test_regression_checks_inf" - "test_rendering" - ] - ++ lib.optionals (pythonAtLeast "3.13") [ - # argparse usage changes mismatches test artifact - "test_help" - ]; + disabledTests = lib.optionals (pythonOlder "3.12") [ + # AttributeError: 'PluginImportFixer' object has no attribute 'find_spec' + "test_compare_1" + "test_compare_2" + "test_regression_checks" + "test_regression_checks_inf" + "test_rendering" + ]; meta = { changelog = "https://github.com/ionelmc/pytest-benchmark/blob/${src.tag}/CHANGELOG.rst"; From a5770f67dd07d871f4bf8e6f2f879b51052c2cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Nov 2025 08:54:56 -0800 Subject: [PATCH 325/542] python3Packages.trove-classifiers: 2025.9.11.17 -> 2025.11.14.15 Changelog: https://github.com/pypa/trove-classifiers/releases/tag/2025.11.14.15 --- pkgs/development/python-modules/trove-classifiers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 2b5ec73544c3..a13f3db23913 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -10,13 +10,13 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2025.9.11.17"; + version = "2025.11.14.15"; pyproject = true; src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-kxyphBpenJQIvCrme1DSis+FvvViGbVoYIdt0fLQJN0="; + hash = "sha256-a2D0nUC72JW8YdjcQU/C8ihtcOty7SNUjbjPlPYoBMo="; }; postPatch = '' From 0eeb6fb6ac31157d2165fc48b76581bb727c75d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Nov 2025 09:12:54 -0800 Subject: [PATCH 326/542] python3Packages.freezegun: 1.5.4 -> 1.5.5 Changelog: https://github.com/spulec/freezegun/blob/1.5.5/CHANGELOG --- pkgs/development/python-modules/freezegun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 991a4d67c5b1..c84ad2c2cf4f 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "freezegun"; - version = "1.5.4"; + version = "1.5.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eYuTcv3U2QfzPotqWLxk5oLZ/6jUlM5g94AZfugfrtE="; + hash = "sha256-rHdCpsxsJaLDXpKS39VUuJe1F9LewmiRoujevyBcuUo="; }; build-system = [ setuptools ]; From d7ecdea0856c8041dcca54b67680b7137eaf26ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Nov 2025 10:22:31 -0800 Subject: [PATCH 327/542] python3Packages.cython: 3.1.6 -> 3.2.1 Diff: https://github.com/cython/cython/compare/3.1.6...3.2.1 Changelog: https://github.com/cython/cython/blob/3.2.1/CHANGES.rst --- pkgs/development/python-modules/cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index 796df1cad647..2edadcff6f92 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cython"; - version = "3.1.6"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "cython"; repo = "cython"; tag = version; - hash = "sha256-OB9DsGabbn5pE+8Ru29D3Jp9Wu+gwlHYYy79x+M+HPI="; + hash = "sha256-9NS9M+waaMMBnGzRZKidXXJjhmGBaeL9JHXiFpdvPhE="; }; build-system = [ From b5105a34b902d746098668585848c501e348fa9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Nov 2025 10:25:28 -0800 Subject: [PATCH 328/542] python3Packages.rapidfuzz: unpin cython --- pkgs/development/python-modules/rapidfuzz/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 1d7ecaf813a2..ade8f0740fa1 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -37,6 +37,11 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython >=3.1.6, <3.2.0" "Cython >=3.1.6" + ''; + build-system = [ cmake cython From a1bacd7bd098820e3909af139196e41ccbcda93b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Nov 2025 23:45:37 +0100 Subject: [PATCH 329/542] python3Packages.propcache: 0.3.2 -> 0.4.1 https://github.com/aio-libs/propcache/blob/v0.4.1/CHANGES.rst --- pkgs/development/python-modules/propcache/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix index b07c062c96fb..6402596f8333 100644 --- a/pkgs/development/python-modules/propcache/default.nix +++ b/pkgs/development/python-modules/propcache/default.nix @@ -10,11 +10,12 @@ pytestCheckHook, pythonOlder, setuptools, + tomli, }: buildPythonPackage rec { pname = "propcache"; - version = "0.3.2"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,18 +24,21 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "propcache"; tag = "v${version}"; - hash = "sha256-G8SLIZaJUu3uwyFicrQF+PjKp3vsUh/pNUsmDpnnAAg="; + hash = "sha256-7HQUOggbFC7kWcXqatLeCTNJqo0fW9FRCy8UkYL6wvM="; }; postPatch = '' substituteInPlace packaging/pep517_backend/_backend.py \ - --replace "Cython ~= 3.0.12" Cython + --replace "Cython ~=" "Cython >=" ''; build-system = [ cython expandvars setuptools + ] + ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ From c0e3343738dc0e57fea7745a5edecaf3a2c19f1d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Nov 2025 00:14:44 +0100 Subject: [PATCH 330/542] python3Packages.scipy: relax cython consraint --- pkgs/development/python-modules/scipy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 16ae631686e4..7fa10634a0cd 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -106,6 +106,7 @@ buildPythonPackage { # that override globally the `numpy` attribute to point to `numpy_1`. postPatch = '' substituteInPlace pyproject.toml \ + --replace-fail "Cython>=3.0.8,<3.2.0" "Cython>=3.0.8" \ --replace-fail "numpy>=2.0.0,<2.6" numpy ''; From 8e7725088c7aa6af4c9431aa7c659802e54cecaf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Nov 2025 19:01:16 +0100 Subject: [PATCH 331/542] python3Packages.psycopgs: fix cython 3.2 compat --- pkgs/development/python-modules/psycopg/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index b6558b5ff693..461434d65b5b 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, fetchurl, + fetchpatch, replaceVars, # build @@ -48,6 +49,11 @@ let libpq = "${libpq}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) + (fetchpatch { + # cython 3.2 compat + url = "https://github.com/psycopg/psycopg/commit/70cc1d1b14ab99be2a066032dc353e7c7aa77b20.patch"; + hash = "sha256-raSo3y3UEwDQDRXzbZ8dacS/DsE5g1hoYt/IgM+848A="; + }) ]; baseMeta = { From 3b0508b9fbc6241600232965dc3c6918b605e23f Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 16 Nov 2025 10:19:43 -0500 Subject: [PATCH 332/542] python314Packages.duckdb: fix build pandas is required on Python 3.14, see https://hydra.lossy.network/build/4208550/nixlog/2. Tested on x86_64-linux and aarch64-linux by building python314Packages.{duckdb,duckdb-engine,sqlglot}. --- pkgs/development/python-modules/duckdb/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index cc87702bb703..6b5a5a9aaf3e 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, cmake, ninja, duckdb, @@ -16,6 +15,7 @@ psutil, pyarrow, pybind11, + pytz, scikit-build-core, setuptools-scm, pytest-reraise, @@ -73,16 +73,11 @@ buildPythonPackage rec { ]; optional-dependencies = { - # Note: ipython and adbc_driver_manager currently excluded despite inclusion in upstream - # https://github.com/duckdb/duckdb-python/blob/v1.4.0/pyproject.toml#L44-L52 all = [ + # FIXME package adbc_driver_manager ipython fsspec numpy - ] - ++ lib.optionals (pythonOlder "3.14") [ - # https://github.com/duckdb/duckdb-python/blob/0ee500cfa35fc07bf81ed02e8ab6984ea1f665fd/pyproject.toml#L49-L51 - # adbc_driver_manager noted for migration to duckdb C source pandas pyarrow ]; @@ -105,6 +100,7 @@ buildPythonPackage rec { psutil pytest-reraise pytestCheckHook + pytz ] ++ optional-dependencies.all; From 27ed1b20da6f45a9d8cdeb2eab283156513357fd Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Wed, 19 Nov 2025 18:09:15 -0500 Subject: [PATCH 333/542] python314Packages.libcst: fix build Broken on v3.14 because it expects normal pyyaml and not pyyaml-ft. Fixes: ``` libcst> Checking runtime dependencies for libcst-1.8.6-cp314-cp314-linux_x86_64.whl libcst> - pyyaml not installed ``` See also: https://github.com/Instagram/LibCST/blob/v1.8.6/pyproject.toml --- pkgs/development/python-modules/libcst/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index ecb9fa3e0a28..de50526c0ae0 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -3,14 +3,12 @@ stdenv, buildPythonPackage, fetchFromGitHub, - callPackage, cargo, hypothesmith, + isPy313, libcst, libiconv, pytestCheckHook, - python, - pythonOlder, pyyaml, pyyaml-ft, rustPlatform, @@ -58,7 +56,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ - (if pythonOlder "3.13" then pyyaml else pyyaml-ft) + (if isPy313 then pyyaml-ft else pyyaml) ]; nativeCheckInputs = [ From 82bddc0b5369a543a7f584ed8ff168d0ef8c497c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 21 Nov 2025 10:32:29 -0800 Subject: [PATCH 334/542] python314Packages.mercurial: fix build by enabling PyO3 forward compatibility --- pkgs/by-name/me/mercurial/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix index c6137a31a783..fc624c5e238e 100644 --- a/pkgs/by-name/me/mercurial/package.nix +++ b/pkgs/by-name/me/mercurial/package.nix @@ -63,6 +63,10 @@ let null; cargoRoot = if rustSupport then "rust" else null; + # enable building with Python 3.14 + # FIXME remove once PyO3 is updated in Cargo.lock + env.PYO3_USE_ABI3_FORWARD_COMPATIBILITY = 1; + propagatedBuildInputs = lib.optional re2Support google-re2 ++ lib.optional gitSupport pygit2 From fb4619dd0a5d2bc936eb23bb05623f2caeaa1e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 21 Nov 2025 13:27:48 -0800 Subject: [PATCH 335/542] python3Packages.scikit-learn: unpin cython --- pkgs/development/python-modules/scikit-learn/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 17c8c6612ab4..b4425990e528 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -38,6 +38,9 @@ buildPythonPackage rec { }; postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython>=3.0.10,<3.2.0" "Cython>=3.0.10" + substituteInPlace meson.build --replace-fail \ "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \ "'${version}'," From c5cf2a8c7e405132dd762f2c93b3197fcd3d76fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 21 Nov 2025 22:28:25 -0800 Subject: [PATCH 336/542] python3Packages.aws-sam-translator: 1.99.0 -> 1.103.0 Diff: https://github.com/aws/serverless-application-model/compare/v1.99.0...v1.103.0 Changelog: https://github.com/aws/serverless-application-model/releases/tag/v1.103.0 --- .../python-modules/aws-sam-translator/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index c9ba2878ef13..abed0c3c8e09 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,7 +10,6 @@ pytest-rerunfailures, pytest-xdist, pytestCheckHook, - pythonOlder, pyyaml, setuptools, typing-extensions, @@ -18,16 +17,14 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.99.0"; + version = "1.103.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "aws"; repo = "serverless-application-model"; tag = "v${version}"; - hash = "sha256-Y82qN2bmzE5Xqz2wSw9lWItsPbsRevLL7FlLN0FGKs0="; + hash = "sha256-FW7tmXsD4VfR/c6IJUCvsYPYLIisaEqAhD0sp9ufA/s="; }; postPatch = '' From 2ad806cd34f83030c00b9934acfcc6b4297eb763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 21 Nov 2025 22:31:46 -0800 Subject: [PATCH 337/542] python314Packages.aws-sam-translator: disable It uses pydantic.v1 which is incompatible with Python 3.14: https://pydantic.dev/articles/pydantic-v2-12-release#support-for-python-314 --- .../development/python-modules/aws-sam-translator/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index abed0c3c8e09..ae412c42579d 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,6 +10,7 @@ pytest-rerunfailures, pytest-xdist, pytestCheckHook, + pythonAtLeast, pyyaml, setuptools, typing-extensions, @@ -20,6 +21,9 @@ buildPythonPackage rec { version = "1.103.0"; pyproject = true; + # https://github.com/aws/serverless-application-model/issues/3831 + disabled = pythonAtLeast "3.14"; + src = fetchFromGitHub { owner = "aws"; repo = "serverless-application-model"; From 50030139ad9b304c8d1d236c8168f2d5d29e9284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 21 Nov 2025 23:02:09 -0800 Subject: [PATCH 338/542] python3Packages.toolz: don't use setuptools-git-versioning --- pkgs/development/python-modules/toolz/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 0534128f87a2..e32807735894 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, setuptools, - setuptools-git-versioning, pytestCheckHook, }: @@ -17,9 +16,14 @@ buildPythonPackage rec { hash = "sha256-J6XHcNBowRDZ7ZMj8k8VQ+g7LzAKaHt4kcGm1Wtpe1s="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools-git-versioning >=2.0",' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + build-system = [ setuptools - setuptools-git-versioning ]; nativeCheckInputs = [ pytestCheckHook ]; From ba6a01e8a31a3e11f5882d2e05ccf0631589d0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 21 Nov 2025 23:29:00 -0800 Subject: [PATCH 339/542] python3Packages.jupyter-server: 2.16.0 -> 2.17.0 Changelog: https://github.com/jupyter-server/jupyter_server/blob/v2.17.0/CHANGELOG.md --- pkgs/development/python-modules/jupyter-server/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index ae7d77d47eda..41f803ad4ab9 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -1,6 +1,5 @@ { lib, - pythonOlder, stdenv, buildPythonPackage, fetchPypi, @@ -35,14 +34,13 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.16.0"; + version = "2.17.0"; pyproject = true; - disabled = pythonOlder "3.9"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-ZdS0T98ty73+CqGs5KhC1Kr3RqK3sWgTTVqu01Yht/Y="; + hash = "sha256-w46omFZpZMiItHcq4e1Y7KhFkuiCUdLPxNFx+B9+mdU="; }; build-system = [ From 2a660c40d7e39c84cf699c5141c62f27d731913e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 21 Nov 2025 23:55:32 -0800 Subject: [PATCH 340/542] Revert "python3Packages.cython: 3.1.6 -> 3.2.1" This reverts commit 222ad07483c55485e90824f464d4cf4781d79578 because it broke some packages that depend on pandas like dask and xarray: https://github.com/pandas-dev/pandas/issues/63078 --- pkgs/development/python-modules/cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index 2edadcff6f92..796df1cad647 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cython"; - version = "3.2.1"; + version = "3.1.6"; pyproject = true; src = fetchFromGitHub { owner = "cython"; repo = "cython"; tag = version; - hash = "sha256-9NS9M+waaMMBnGzRZKidXXJjhmGBaeL9JHXiFpdvPhE="; + hash = "sha256-OB9DsGabbn5pE+8Ru29D3Jp9Wu+gwlHYYy79x+M+HPI="; }; build-system = [ From 49a9129591cd7614c22254daf65d5b6285f03c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 22 Nov 2025 09:08:27 -0800 Subject: [PATCH 341/542] python314Packages.dask: fix tests Without this patch, a lot of them fail with error messages like _pickle.PicklingError: Can't pickle local object .myfunc at 0x7fff7517b8a0 and one test fails with dask.multiprocessing.TypeError: cannot pickle 'itertools.chain' object --- pkgs/development/python-modules/dask/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index af46945b5197..8de30f38a67c 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build-system setuptools, @@ -49,6 +50,12 @@ buildPythonPackage rec { hash = "sha256-cU4w4dqJQ3ew+fRyD7Lc4URNfW738kKqls6k6j65pIo="; }; + # https://github.com/dask/dask/issues/12043 + postPatch = lib.optionalString (pythonAtLeast "3.14") '' + substituteInPlace dask/dataframe/dask_expr/tests/_util.py \ + --replace-fail "except AttributeError:" "except (AttributeError, pickle.PicklingError):" + ''; + build-system = [ setuptools setuptools-scm @@ -112,6 +119,11 @@ buildPythonPackage rec { "network" ]; + # https://github.com/dask/dask/issues/12042 + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + "test_multiple_repartition_partition_size" + ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ From 7ded099e367c791509edb1a1d750a7a676f53e46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 23 Nov 2025 15:53:48 +0100 Subject: [PATCH 342/542] python3Packages.psycopg: 3.2.12 -> 3.2.13 https://github.com/psycopg/psycopg/blob/3.2.13/docs/news.rst#current-release --- pkgs/development/python-modules/psycopg/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 461434d65b5b..473b7d778240 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, fetchurl, - fetchpatch, replaceVars, # build @@ -35,13 +34,13 @@ let pname = "psycopg"; - version = "3.2.12"; + version = "3.2.13"; src = fetchFromGitHub { owner = "psycopg"; repo = "psycopg"; tag = version; - hash = "sha256-g1mms12EqRiln5dK/BmBa9dd9duSPRgRIiZkVmSRaYI="; + hash = "sha256-sd3LAuBgZtWMx/hVNzET65vEXIFQvgevmCkoRjrsh5c="; }; patches = [ @@ -49,11 +48,6 @@ let libpq = "${libpq}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) - (fetchpatch { - # cython 3.2 compat - url = "https://github.com/psycopg/psycopg/commit/70cc1d1b14ab99be2a066032dc353e7c7aa77b20.patch"; - hash = "sha256-raSo3y3UEwDQDRXzbZ8dacS/DsE5g1hoYt/IgM+848A="; - }) ]; baseMeta = { From 0dc1218227ec12d50087d45b755c6df213c25a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 23 Nov 2025 07:50:08 -0800 Subject: [PATCH 343/542] python3Packages.backports-zstd: 1.0.0 -> 1.1.0 Diff: https://github.com/rogdham/backports.zstd/compare/v1.0.0...v1.1.0 Changelog: https://github.com/rogdham/backports.zstd/blob/v1.1.0/CHANGELOG.md --- pkgs/development/python-modules/backports-zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports-zstd/default.nix b/pkgs/development/python-modules/backports-zstd/default.nix index 412b35bcb992..ec965af56c47 100644 --- a/pkgs/development/python-modules/backports-zstd/default.nix +++ b/pkgs/development/python-modules/backports-zstd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "backports-zstd"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { @@ -20,7 +20,7 @@ buildPythonPackage rec { postFetch = '' rm -r "$out/src/c/zstd" ''; - hash = "sha256-5t5ET8b65v4ArV9zrmu+kDXLG3QQRpMMZPSG+RRaCLk="; + hash = "sha256-qgPtLl8oPvM9XDlW72NNX1JqCxzcnLlHyUNNxU9e2PY="; }; postPatch = '' From 89f8d9e05ba4f6598452bbeeda00e627aac3f274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 23 Nov 2025 07:54:34 -0800 Subject: [PATCH 344/542] python314Packages.aiohttp: don't depend on backports-zstd Python 3.14 has compression.zstd in its stdlib. --- pkgs/development/python-modules/aiohttp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 35d176e3f70b..506f61a31aa7 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -103,8 +103,10 @@ buildPythonPackage rec { optional-dependencies.speedups = [ aiodns - backports-zstd (if isPyPy then brotlicffi else brotli) + ] + ++ lib.optionals (pythonOlder "3.14") [ + backports-zstd ]; nativeCheckInputs = [ From bdbc0653b3223ff276d5163b0ddaa85d3e9e9793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 Nov 2025 12:20:16 -0800 Subject: [PATCH 345/542] python3Packages.db-dtypes: 1.4.3 -> 1.4.4 Diff: https://github.com/googleapis/python-db-dtypes-pandas/compare/v1.4.3...v1.4.4 Changelog: https://github.com/googleapis/python-db-dtypes-pandas/blob/v1.4.4/CHANGELOG.md --- pkgs/development/python-modules/db-dtypes/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 23713484c397..aefee13358f0 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -7,22 +7,19 @@ pandas, pyarrow, pytest8_3CheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "db-dtypes"; - version = "1.4.3"; + version = "1.4.4"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "googleapis"; repo = "python-db-dtypes-pandas"; tag = "v${version}"; - hash = "sha256-AyO/GwtExMWi4mB3OMtYPFvAVS/ylcBXGiGXgaScyCA="; + hash = "sha256-Aq/2yDyvUpLsGr+mmBDQpC9X1pWLpDtYD6qql2sgGNw="; }; build-system = [ setuptools ]; From 2ffb69aefdc1a9905aa44b58373c8f00312dd3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 Nov 2025 12:36:21 -0800 Subject: [PATCH 346/542] python3Packages.db-dtypes: fix tests on Python 3.14 --- pkgs/development/python-modules/db-dtypes/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index aefee13358f0..82a13e24cfc3 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -7,6 +7,7 @@ pandas, pyarrow, pytest8_3CheckHook, + pythonAtLeast, setuptools, }: @@ -22,6 +23,13 @@ buildPythonPackage rec { hash = "sha256-Aq/2yDyvUpLsGr+mmBDQpC9X1pWLpDtYD6qql2sgGNw="; }; + # https://github.com/googleapis/python-db-dtypes-pandas/pull/379 + postPatch = lib.optionalString (pythonAtLeast "3.14") '' + substituteInPlace tests/unit/test_date.py \ + --replace-fail '"year 10000 is out of range"' '"year must be in 1..9999, not 10000"' \ + --replace-fail '"day is out of range for month"' '"day 99 must be in range 1..28 for month 2 in year 2021"' + ''; + build-system = [ setuptools ]; dependencies = [ From 99daf67b72b8685a79ba6b572ba8ecb0a4631703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Nov 2025 12:12:47 -0800 Subject: [PATCH 347/542] python3Packages.astropy-iers-data: 0.2025.8.4.0.42.59 -> 0.2025.11.24.0.39.11 Diff: https://github.com/astropy/astropy-iers-data/compare/v0.2025.8.4.0.42.59...v0.2025.11.24.0.39.11 Changelog: https://github.com/astropy/astropy-iers-data/releases/tag/v0.2025.11.24.0.39.11 --- .../development/python-modules/astropy-iers-data/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index e7fd9b9ec84f..b74df2757f47 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "astropy-iers-data"; - version = "0.2025.8.4.0.42.59"; + version = "0.2025.11.24.0.39.11"; pyproject = true; src = fetchFromGitHub { owner = "astropy"; repo = "astropy-iers-data"; tag = "v${version}"; - hash = "sha256-Izqm626PZzjnMNUzPW2x15ER7fn5f9+m2X434vXV/yo="; + hash = "sha256-B8568fGvS76igIlEWIbsTczQYqL0nPISM8rfUrF/DS4="; }; build-system = [ @@ -29,6 +29,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/astropy/astropy-iers-data/releases/tag/${src.tag}"; description = "IERS data maintained by @astrofrog and astropy.utils.iers maintainers"; homepage = "https://github.com/astropy/astropy-iers-data"; license = licenses.bsd3; From 9d2eadaa3dbf95265e260d25ae5e62e04df05bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Nov 2025 12:09:07 -0800 Subject: [PATCH 348/542] python3Packages.astropy: 7.1.0 -> 7.1.1 Diff: https://github.com/astropy/astropy/compare/v7.1.0...v7.1.1 Changelog: https://docs.astropy.org/en/v7.1.1/changelog.html --- pkgs/development/python-modules/astropy/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 0489821f7a82..d07f43684f89 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,6 +1,6 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, pythonOlder, @@ -55,14 +55,16 @@ buildPythonPackage rec { pname = "astropy"; - version = "7.1.0"; + version = "7.1.1"; pyproject = true; disabled = pythonOlder "3.11"; - src = fetchPypi { - inherit pname version; - hash = "sha256-yPJUMiKVsbjPJDA9bxVb9+/bbBKCiCuWbOMEDv+MU8U="; + src = fetchFromGitHub { + owner = "astropy"; + repo = "astropy"; + tag = "v${version}"; + hash = "sha256-cvwwTa6eJYncB2V6UCuBrQ5WRRvjgZF5/z4d7Z/uHc8="; }; env = lib.optionalAttrs stdenv.cc.isClang { @@ -159,6 +161,7 @@ buildPythonPackage rec { ''; meta = { + changelog = "https://docs.astropy.org/en/${src.tag}/changelog.html"; description = "Astronomy/Astrophysics library for Python"; homepage = "https://www.astropy.org"; license = lib.licenses.bsd3; From 87e4b18637b33e889e2ce0c6399ea1a1e9cc894c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Nov 2025 12:29:33 -0800 Subject: [PATCH 349/542] python314Packages.openapi-core: fix test_dynamic_model see https://github.com/python-openapi/openapi-core/issues/1009 --- pkgs/development/python-modules/openapi-core/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 639d273bb3df..1a1ea200ce56 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -40,6 +40,13 @@ buildPythonPackage rec { hash = "sha256-Q7Z6bq8TztNm2QLL7g23rOGnXVfiTDjquHAhcSWYlC4="; }; + postPatch = '' + # https://github.com/python-openapi/openapi-core/issues/1009 + substituteInPlace tests/unit/extensions/test_factories.py \ + --replace-fail 'assert test_model_class.__dataclass_fields__["name"].type == str(Any)' \ + 'assert str(test_model_class.__dataclass_fields__["name"].type) == str(Any)' + ''; + build-system = [ poetry-core ]; pythonRelaxDeps = [ From a7275f393ec389e900d7b39093929fe70dedac6b Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Tue, 24 Jun 2025 11:49:24 +0200 Subject: [PATCH 350/542] bundlerApp: compress man pages --- pkgs/development/ruby-modules/bundler-app/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 0a0b5818f375..e23c6d0a3234 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -100,5 +100,6 @@ runCommand basicEnv.name cmdArgs '' lib.optionalString (basicEnv.gemType == "git" || basicEnv.gemType == "url") "bundler/" }gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; done + compressManPages "''${!outputMan}" ''} '' From a26175bd831a8450807863cdf5741b05b30eb3a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Nov 2025 13:34:17 +0000 Subject: [PATCH 351/542] unbound-full: 1.24.1 -> 1.24.2 --- pkgs/by-name/un/unbound/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 62657e2f4c36..caff6ac84455 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -56,13 +56,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "unbound"; tag = "release-${finalAttrs.version}"; - hash = "sha256-meWgu1UGhR9d8wVb8guqbnGE3UHs6uJHR20iDFnIThQ="; + hash = "sha256-kyTcDmNGKJuOMZ7cxIWh6o7aasRUoAB4M0tIG81BQsE="; }; outputs = [ From 12f1dd64673942d29fcf5a5217964d1281f0f9e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Nov 2025 13:35:02 +0000 Subject: [PATCH 352/542] unbound-with-systemd: 1.24.1 -> 1.24.2 --- pkgs/by-name/un/unbound/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 62657e2f4c36..caff6ac84455 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -56,13 +56,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "unbound"; tag = "release-${finalAttrs.version}"; - hash = "sha256-meWgu1UGhR9d8wVb8guqbnGE3UHs6uJHR20iDFnIThQ="; + hash = "sha256-kyTcDmNGKJuOMZ7cxIWh6o7aasRUoAB4M0tIG81BQsE="; }; outputs = [ From e28c0ec6a81a368c36810a206e158c4c978b9877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Nov 2025 10:27:07 -0800 Subject: [PATCH 353/542] python3Packages.pydantic: reduce test dependencies --- pkgs/development/python-modules/pydantic/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index dc3b60a51152..4cd9604027af 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -19,10 +19,8 @@ dirty-equals, jsonschema, pytestCheckHook, - pytest-codspeed, pytest-mock, pytest-run-parallel, - writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -61,11 +59,9 @@ buildPythonPackage rec { cloudpickle dirty-equals jsonschema - pytest-codspeed pytest-mock pytest-run-parallel pytestCheckHook - writableTmpDirAsHomeHook ] ++ lib.flatten (lib.attrValues optional-dependencies); From 2a361f3607e220e50da691d961df52f69158f555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Nov 2025 10:39:03 -0800 Subject: [PATCH 354/542] python3Packages.cloudpickle: modernize --- .../python-modules/cloudpickle/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 52dab834ee8d..048aca02e856 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,13 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system flit-core, # tests - psutil, pytestCheckHook, }: @@ -17,8 +15,6 @@ buildPythonPackage rec { version = "3.1.2"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "cloudpipe"; repo = "cloudpickle"; @@ -26,10 +22,9 @@ buildPythonPackage rec { hash = "sha256-BsCOEpNCNqq8PS+SdbzF1wq0LXEmtcHJs0pdt2qFw/w="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ - psutil pytestCheckHook ]; @@ -37,14 +32,15 @@ buildPythonPackage rec { disabledTestPaths = [ # ModuleNotFoundError: No module named 'psutil' + # (because _make_cwd_env() overwrites $PYTHONPATH) "tests/cloudpickle_test.py" ]; - meta = with lib; { + meta = { changelog = "https://github.com/cloudpipe/cloudpickle/blob/${src.tag}/CHANGES.md"; description = "Extended pickling support for Python objects"; homepage = "https://github.com/cloudpipe/cloudpickle"; - license = with licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From bc63c2f3e0113314d7bfed9fa8ace6ae207b3cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Nov 2025 10:11:49 -0800 Subject: [PATCH 355/542] python3Packages.cfn-lint: 1.38.3 -> 1.41.0 Diff: https://github.com/aws-cloudformation/cfn-lint/compare/v1.38.3...v1.41.0 Changelog: https://github.com/aws-cloudformation/cfn-lint/blob/v1.41.0/CHANGELOG.md --- .../python-modules/cfn-lint/default.nix | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 49345a232132..5ec1e53ffeda 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, jschema-to-python, jsonpatch, - jsonschema, junit-xml, mock, networkx, @@ -18,11 +17,12 @@ sarif-om, setuptools, sympy, + typing-extensions, }: buildPythonPackage rec { pname = "cfn-lint"; - version = "1.38.3"; + version = "1.41.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,23 +31,19 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-lint"; tag = "v${version}"; - hash = "sha256-n3NHmbo3qRhP7oqUOokw8oGnNXo4rhRhuAgL66hvfog="; + hash = "sha256-AudCeFMbCQucANLLAknCKC7gzi0vvFh9c9k7ll0a1MM="; }; build-system = [ setuptools ]; dependencies = [ aws-sam-translator - jschema-to-python jsonpatch - jsonschema - junit-xml - networkx networkx pyyaml regex - sarif-om sympy + typing-extensions ]; optional-dependencies = { @@ -57,12 +53,7 @@ buildPythonPackage rec { jschema-to-python sarif-om ]; - full = [ - jschema-to-python - junit-xml - pydot - sarif-om - ]; + full = lib.concatLists (lib.attrValues (lib.removeAttrs optional-dependencies [ "full" ])); }; nativeCheckInputs = [ @@ -70,19 +61,12 @@ buildPythonPackage rec { mock pytestCheckHook ] - ++ lib.flatten (builtins.attrValues optional-dependencies); + ++ optional-dependencies.full; preCheck = '' export PATH=$out/bin:$PATH ''; - disabledTestPaths = [ - # tests fail starting on 2025-10-01 - # related: https://github.com/aws-cloudformation/cfn-lint/issues/4125 - "test/integration/test_quickstart_templates.py" - "test/integration/test_quickstart_templates_non_strict.py" - ]; - disabledTests = [ # Requires git directory "test_update_docs" From 10ade4265d0cbc6162c942d43d7d55bca38dd72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Nov 2025 11:19:05 -0800 Subject: [PATCH 356/542] python3Packages.cachetools: 6.1.0 -> 6.2.2 Diff: https://github.com/tkem/cachetools/compare/v6.1.0...v6.2.2 Changelog: https://github.com/tkem/cachetools/blob/v6.2.2/CHANGELOG.rst --- pkgs/development/python-modules/cachetools/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 39923013689a..3b70fce4ad53 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -2,23 +2,20 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "cachetools"; - version = "6.1.0"; + version = "6.2.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "tkem"; repo = "cachetools"; tag = "v${version}"; - hash = "sha256-o3Ice6w7Ovot+nsmTpsl/toosZuVbi9RvRGs07W4H0Y="; + hash = "sha256-seoyqkrRQpRiMd5GTEvenjirn173Hq40Zuk1u7TvMPI="; }; build-system = [ setuptools ]; From f095f0dbbf0a0fdf95868f288fb8f06befb4ec62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Nov 2025 11:20:08 -0800 Subject: [PATCH 357/542] python3Packages.virtualenv: 20.33.1 -> 20.35.4 Changelog: https://github.com/pypa/virtualenv/blob/20.35.4/docs/changelog.rst --- .../python-modules/virtualenv/default.nix | 42 ++++++------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 5d26d7d54820..24f2095011bf 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -3,75 +3,57 @@ buildPythonPackage, pythonOlder, isPyPy, - cython, distlib, - fetchPypi, + fetchFromGitHub, filelock, flaky, hatch-vcs, hatchling, - importlib-metadata, platformdirs, - pytest-freezegun, pytest-mock, - pytest-timeout, pytestCheckHook, time-machine, }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.33.1"; - format = "pyproject"; + version = "20.35.4"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-G0RHjZ4mGz+4uqXnSgyjvA4F8hqjYWe/nL+FDlQnZbg="; + src = fetchFromGitHub { + owner = "pypa"; + repo = "virtualenv"; + tag = version; + hash = "sha256-0PWIYU1/zXiOBUV/45rJsJwVlcqHeac68nRM2tvEPHo="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ distlib filelock platformdirs - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ - cython flaky - pytest-freezegun pytest-mock - pytest-timeout pytestCheckHook ] ++ lib.optionals (!isPyPy) [ time-machine ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - disabledTestPaths = [ # Ignore tests which require network access "tests/unit/create/test_creator.py" - "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" + "tests/unit/create/via_global_ref/test_build_c_ext.py" ]; disabledTests = [ # Network access - "test_create_no_seed" "test_seed_link_via_app_data" - # Permission Error - "test_bad_exe_py_info_no_raise" - # https://github.com/pypa/virtualenv/issues/2933 - # https://github.com/pypa/virtualenv/issues/2939 - "test_py_info_cache_invalidation_on_py_info_change" ] ++ lib.optionals (pythonOlder "3.11") [ "test_help" ] ++ lib.optionals isPyPy [ From 1a37e13c2d031bd8ff97509d76d0d97ec58623bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Nov 2025 10:47:56 -0800 Subject: [PATCH 358/542] python3Packages.pyproject-api: 1.9.1 -> 1.10.0 Diff: https://github.com/tox-dev/pyproject-api/compare/1.9.1...1.10.0 Changelog: https://github.com/tox-dev/pyproject-api/releases/tag/1.10.0 --- .../python-modules/pyproject-api/default.nix | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 21232a08ca6e..ca0f18c286d9 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -20,23 +20,18 @@ # tests pytest-mock, pytestCheckHook, - setuptools, - virtualenv, - wheel, }: buildPythonPackage rec { pname = "pyproject-api"; - version = "1.9.1"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + version = "1.10.0"; + pyproject = true; src = fetchFromGitHub { owner = "tox-dev"; repo = "pyproject-api"; tag = version; - hash = "sha256-Bf/FG5BNKbV3lfebEHFJ3cy80L1mWTYLXJfqPUzeNXc="; + hash = "sha256-fWlGGVjB43NPfBRFfOWqZUDQuqOdrFP7jsqq9xOfvaw="; }; outputs = [ @@ -44,31 +39,23 @@ buildPythonPackage rec { "doc" ]; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs + ]; + nativeBuildInputs = [ # docs sphinxHook furo sphinx-autodoc-typehints ]; - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ pytest-mock pytestCheckHook - setuptools - virtualenv - wheel - ]; - - disabledTests = [ - # requires eol python2 interpreter - "test_can_build_on_python_2" - # different formatting for version specifier - "test_setuptools_prepare_metadata_for_build_wheel" ]; pythonImportsCheck = [ "pyproject_api" ]; From 69ebe4465a5a9045a8e42da916567ba3b237fd41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Nov 2025 10:44:10 -0800 Subject: [PATCH 359/542] python3Packages.tox: 4.28.4 -> 4.32.0 Diff: https://github.com/tox-dev/tox/compare/4.28.4...4.32.0 Changelog: https://github.com/tox-dev/tox/releases/tag/4.32.0 --- .../python-modules/tox/default.nix | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 93be8bfdb688..bb5b7fb092aa 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -5,10 +5,7 @@ pythonOlder, packaging, pluggy, - py, - six, virtualenv, - toml, tomli, filelock, hatchling, @@ -20,31 +17,27 @@ cachetools, testers, tox, + typing-extensions, }: buildPythonPackage rec { pname = "tox"; - version = "4.28.4"; - format = "pyproject"; + version = "4.32.0"; + pyproject = true; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; tag = version; - hash = "sha256-EKJsFf4LvfDi3OL6iNhKEBl5zlpdLET9RkfHEP7E9xU="; + hash = "sha256-n2tKjT0t8bm6iatukKKcGw0PC+5EJrQEABMIAumRaqE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "packaging>=22" "packaging" - ''; - - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ cachetools chardet colorama @@ -52,13 +45,13 @@ buildPythonPackage rec { packaging platformdirs pluggy - py pyproject-api - six - toml virtualenv ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ++ lib.optionals (pythonOlder "3.11") [ + tomli + typing-extensions + ]; doCheck = false; # infinite recursion via devpi-client From bdbbb9720c5860f5ee3fb665f9cb3a65ff3bad12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Nov 2025 11:00:57 -0800 Subject: [PATCH 360/542] python3Packages.distutils: update commit This should be the commit used in setuptools 80.9.0. --- pkgs/development/python-modules/distutils/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distutils/default.nix b/pkgs/development/python-modules/distutils/default.nix index d39c5be3d97d..727b109d64bc 100644 --- a/pkgs/development/python-modules/distutils/default.nix +++ b/pkgs/development/python-modules/distutils/default.nix @@ -12,6 +12,7 @@ jaraco-envs, jaraco-path, jaraco-text, + libz, more-itertools, packaging, path, @@ -28,8 +29,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "pypa"; repo = "distutils"; - rev = "72837514c2b67081401db556be9aaaa43debe44f"; # correlate commit from setuptools version - hash = "sha256-Kx4Iudy9oZ0oQT96Meyq/m0k0BuexPLVxwvpNJehCW0="; + rev = "5ad8291ff2ad3e43583bc72a4c09299ca6134f09"; # correlate commit from setuptools version + hash = "sha256-3Mqpe/Goj3lQ6GEbX3DHWjdoh7XsFIg9WkOCK138OAo="; }; build-system = [ setuptools-scm ]; @@ -59,6 +60,11 @@ buildPythonPackage { pytestCheckHook ]; + checkInputs = [ + # https://github.com/pypa/distutils/blob/5ad8291ff2ad3e43583bc72a4c09299ca6134f09/distutils/tests/test_build_ext.py#L107 + libz + ]; + # jaraco-path depends ob pyobjc doCheck = !stdenv.hostPlatform.isDarwin; From 978d298b4b94024b15bf2ab79c65495b03076346 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 25 Nov 2025 05:30:36 +0800 Subject: [PATCH 361/542] rustPlatform.buildRustPackage: Pass env.RUSTFLAGS only when specified or needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prevent shadowing RUSTFLAGS-like variables with lower priorities, such as mint-mod-mamanager's CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUSTFLAGS Co-authored-by: Gergő Gutyina --- .../rust/build-rust-package/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 7ad39a58935c..06f96b75ce05 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -89,17 +89,20 @@ lib.extendMkDerivation { "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it" true; { - env = { - PKG_CONFIG_ALLOW_CROSS = if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0; - RUST_LOG = logLevel; - RUSTFLAGS = - lib.optionalString ( - stdenv.hostPlatform.isDarwin && buildType == "debug" - ) "-C split-debuginfo=packed " - # Workaround the existing RUSTFLAGS specified as a list. - + interpolateString (args.RUSTFLAGS or ""); - } - // args.env or { }; + env = + let + isDarwinDebug = stdenv.hostPlatform.isDarwin && buildType == "debug"; + in + { + PKG_CONFIG_ALLOW_CROSS = if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0; + RUST_LOG = logLevel; + # Prevent shadowing *_RUSTFLAGS environment variables + ${if args ? RUSTFLAGS || isDarwinDebug then "RUSTFLAGS" else null} = + lib.optionalString isDarwinDebug "-C split-debuginfo=packed " + # Workaround the existing RUSTFLAGS specified as a list. + + interpolateString (args.RUSTFLAGS or ""); + } + // args.env or { }; cargoDeps = if cargoVendorDir != null then From 641ce168dae237feacf87ed5b83fcf7495dbfa1f Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Thu, 27 Nov 2025 17:09:17 +0100 Subject: [PATCH 362/542] utf8proc: allow static build Build continues to default to a shared lib. Also switch to lib.cmakeBool instead of raw strings for easier handling of boolean logic. --- pkgs/by-name/ut/utf8proc/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ut/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix index 887bab5ee0be..a817385cc3d7 100644 --- a/pkgs/by-name/ut/utf8proc/package.nix +++ b/pkgs/by-name/ut/utf8proc/package.nix @@ -7,6 +7,8 @@ tmux, fcft, arrow-cpp, + # build config + enableStatic ? stdenv.hostPlatform.isStatic, }: stdenv.mkDerivation rec { @@ -23,8 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DUTF8PROC_ENABLE_TESTING=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!enableStatic)) + (lib.cmakeBool "UTF8PROC_ENABLE_TESTING" doCheck) ]; doCheck = true; From bdd6d1dc50b2b216e4d5bde587ebbf1a6399f754 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Thu, 27 Nov 2025 17:14:18 +0100 Subject: [PATCH 363/542] utf8proc: rec -> finalAttrs --- pkgs/by-name/ut/utf8proc/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ut/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix index a817385cc3d7..92657f0a02e0 100644 --- a/pkgs/by-name/ut/utf8proc/package.nix +++ b/pkgs/by-name/ut/utf8proc/package.nix @@ -11,14 +11,14 @@ enableStatic ? stdenv.hostPlatform.isStatic, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "utf8proc"; version = "2.11.2"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = "utf8proc"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/+/IrsLQ9ykuVOaItd2ZbX60pPlP2omvS1qJz51AnWA="; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!enableStatic)) - (lib.cmakeBool "UTF8PROC_ENABLE_TESTING" doCheck) + (lib.cmakeBool "UTF8PROC_ENABLE_TESTING" finalAttrs.finalPackage.doCheck) ]; doCheck = true; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers.sternenseemann ]; }; -} +}) From bbd09b2b5d68a90a3a58ea771affacbef837124a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Nov 2025 17:55:35 +0000 Subject: [PATCH 364/542] ngtcp2: 1.17.0 -> 1.18.0 --- pkgs/development/libraries/ngtcp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index cef563d99f7a..d5adaf38f797 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ngtcp2"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${finalAttrs.version}/ngtcp2-${finalAttrs.version}.tar.bz2"; - hash = "sha256-j8hYGdFp5il4pODbNlVILOdJUafqsMdmc3tXoxQY2mE="; + hash = "sha256-E7r7bFCdv2pw2WBaLIkuE/WuuTZnOZWHeKhXvHDOH6c="; }; outputs = [ From b68796590eeab1bc0af4441dc8ce849c206d23d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Nov 2025 18:41:01 +0000 Subject: [PATCH 365/542] ucx: 1.19.0 -> 1.19.1 --- pkgs/by-name/uc/ucx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uc/ucx/package.nix b/pkgs/by-name/uc/ucx/package.nix index ac43c32435bd..6d99bdd2c949 100644 --- a/pkgs/by-name/uc/ucx/package.nix +++ b/pkgs/by-name/uc/ucx/package.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; pname = "ucx"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; tag = "v${finalAttrs.version}"; - hash = "sha256-n3xJmbvUXZzfhotOBJRyH2OEL4NFZIKyB808HwEQSYo="; + hash = "sha256-goANgYuMO1yColKOrqoBOj+yh68OSW7O8Ppng/pd4b0="; }; outputs = [ From 3fd92d0ae99dbbeaf568070a246b219efea76d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 27 Nov 2025 11:22:39 -0800 Subject: [PATCH 366/542] python3Packages.openai: 2.7.2 -> 2.8.1 Diff: https://github.com/openai/openai-python/compare/v2.7.2...v2.8.1 Changelog: https://github.com/openai/openai-python/blob/v2.8.1/CHANGELOG.md --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 7c021dfe81d5..0345c8350e08 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "openai"; - version = "2.7.2"; + version = "2.8.1"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-g7YbKzRZQOM4e16Mgo7u3QoQQI6VTNrV4DUip9fYsLA="; + hash = "sha256-MlzhvvTyIwN+WmoxINM/oVpvKQJshYaSdvXyyfuIiQA="; }; postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"''; From 8e19f90085c6e6bf516aeba41f253ff50a0b900c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 27 Nov 2025 12:23:01 -0800 Subject: [PATCH 367/542] gi-docgen: remove toml from pythonPath --- pkgs/by-name/gi/gi-docgen/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix index 9e04c3425914..d51dabf7edda 100644 --- a/pkgs/by-name/gi/gi-docgen/package.nix +++ b/pkgs/by-name/gi/gi-docgen/package.nix @@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec { markupsafe packaging pygments - toml # remove once python311 is the default typogrify ]; From d30c24e7316a34231c9c3e99967941236f2e65fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Nov 2025 22:40:43 +0000 Subject: [PATCH 368/542] cups: 2.4.14 -> 2.4.15 --- pkgs/by-name/cu/cups/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cu/cups/package.nix b/pkgs/by-name/cu/cups/package.nix index 9b1b56cca2b9..4568d7827d33 100644 --- a/pkgs/by-name/cu/cups/package.nix +++ b/pkgs/by-name/cu/cups/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.14"; + version = "2.4.15"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - hash = "sha256-ZgKIAg3W95yveZgRxMGjIHpIaJiZrCCTlZ1wo73Ldpk="; + hash = "sha256-7/C71I/xq8u45G4o6Frvr/o5Gh2cTY3JKrOCKhMAjX8="; }; outputs = [ From c7cfd88a1ea06e87c7b0a0fc911c0326722bd5a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Nov 2025 01:23:27 +0000 Subject: [PATCH 369/542] waf: 2.1.7 -> 2.1.9 --- pkgs/by-name/wa/waf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index ad1b14998c63..5d8f113d041f 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.1.7"; + version = "2.1.9"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "waf-${finalAttrs.version}"; - hash = "sha256-qJDnox7+MUtAK8NaaDgEdRVU4YVA8f5Ky9Suv/qLI3g="; + hash = "sha256-myPGbJW/RkOtEas+qZ/vTL66bekwDBPhC6AmfXECkcw="; }; nativeBuildInputs = [ From d98065f2dd9d419ed5f563ced53f389ee166460b Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sat, 19 Jul 2025 10:24:58 +0200 Subject: [PATCH 370/542] arrow-cpp: 20.0.0 -> 22.0.0, python3Packages.pyarrow: 20.0.0 -> 22.0.0 --- pkgs/by-name/ar/arrow-cpp/package.nix | 28 +++---- .../python-modules/pyarrow/default.nix | 78 +++++++++++-------- 2 files changed, 59 insertions(+), 47 deletions(-) diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 4ef558b4bf1e..2a5e0d03d7a4 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -37,7 +37,7 @@ openssl, perl, pkg-config, - protobuf_31, + protobuf, python3, rapidjson, re2, @@ -66,19 +66,19 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "d2a13712303498963395318a4eb42872e66aead7"; - hash = "sha256-c8FL37kG0uo7o0Zp71WjCl7FD5BnVgqUCCXXX9gI0lg="; + rev = "9a02925d1ba80bd493b6d4da6e8a777588d57ac4"; + hash = "sha256-dEFCkeQpQrU61uCwJp/XB2umbQHjXtzado36BGChoc0="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "18d17540097fca7c40be3d42c167e6bfad90763c"; - hash = "sha256-gKEQc2RKpVp39RmuZbIeIXAwiAXDHGnLXF6VQuJtnRA="; + rev = "a3d96a65e11e2bbca7d22a894e8313ede90a33a3"; + hash = "sha256-Xd6o3RT6Q0tPutV77J0P1x3F6U3RHdCBOKGUKtkQCKk="; }; - version = "20.0.0"; + version = "22.0.0"; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apache"; repo = "arrow"; rev = "apache-arrow-${version}"; - hash = "sha256-JFPdKraCU+xRkBTAHyY4QGnBVlOjQ1P5+gq9uxyqJtk="; + hash = "sha256-i4Smt43oi4sddUt3qH7ePjensBSfPW+w/ExLVcVNKic="; }; sourceRoot = "${finalAttrs.src.name}/cpp"; @@ -107,21 +107,21 @@ stdenv.mkDerivation (finalAttrs: { ARROW_MIMALLOC_URL = fetchFromGitHub { owner = "microsoft"; repo = "mimalloc"; - rev = "v2.0.6"; - hash = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc="; + tag = "v3.1.5"; + hash = "sha256-fk6nfyBFS1G0sJwUJVgTC1+aKd0We/JjsIYTO+IOfyg="; }; ARROW_XSIMD_URL = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - rev = "13.0.0"; + tag = "13.0.0"; hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE="; }; ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "v0.44.0"; + tag = "v0.44.0"; hash = "sha256-V739IFTGPtbGPlxcOi8sAaYSDhNUEpITvN9IqdPReug="; }; @@ -138,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: { boost brotli bzip2 + curl flatbuffers gflags glog @@ -145,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { libbacktrace lz4 nlohmann_json # alternative JSON parser to rapidjson - protobuf_31 # substrait requires protobuf + protobuf # substrait requires protobuf rapidjson re2 snappy @@ -157,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableFlight [ grpc openssl - protobuf_31 + protobuf sqlite ] ++ lib.optionals enableS3 [ @@ -166,7 +167,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableGcs [ crc32c - curl google-cloud-cpp grpc nlohmann_json diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 136dd474a527..45b315b33a1b 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -97,55 +97,67 @@ buildPythonPackage rec { find "$PWD/pyarrow/src/arrow" -type f -name '*.h' -exec cp {} "$pyarrow_include/arrow/python" \; ''; - pytestFlagsArray = [ - # A couple of tests are missing fixture imports, luckily pytest offers a - # clean solution. - "--fixtures pyarrow/tests/conftest.py" - # Deselect a single test because pyarrow prints a 2-line error message where - # only a single line is expected. The additional line of output comes from - # the glog library which is an optional dependency of arrow-cpp that is - # enabled in nixpkgs. - # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 - "--deselect=pyarrow/tests/test_memory.py::test_env_var" - # these tests require access to s3 via the internet - "--deselect=pyarrow/tests/test_fs.py::test_resolve_s3_region" - "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws" - "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws_region_selection" - "--deselect=pyarrow/tests/test_fs.py::test_s3_options" + disabledTestPaths = [ + # These tests require access to s3 via the internet. + "pyarrow/tests/test_fs.py::test_resolve_s3_region" + "pyarrow/tests/test_fs.py::test_s3_finalize" + "pyarrow/tests/test_fs.py::test_s3_finalize_region_resolver" + "pyarrow/tests/test_fs.py::test_s3_real_aws" + "pyarrow/tests/test_fs.py::test_s3_real_aws_region_selection" + "pyarrow/tests/test_fs.py::test_s3_options" # Flaky test - "--deselect=pyarrow/tests/test_flight.py::test_roundtrip_errors" - "--deselect=pyarrow/tests/test_pandas.py::test_threaded_pandas_import" - # Flaky test, works locally but not on Hydra - "--deselect=pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation" - # expects arrow-cpp headers to be bundled - "--deselect=pyarrow/tests/test_cpp_internals.py::test_pyarrow_include" + "pyarrow/tests/test_flight.py::test_roundtrip_errors" + "pyarrow/tests/test_pandas.py::test_threaded_pandas_import" + # Flaky test, works locally but not on Hydra. + "pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation" + # expects arrow-cpp headers to be bundled. + "pyarrow/tests/test_cpp_internals.py::test_pyarrow_include" + # Searches for TZDATA in /usr. + "pyarrow/tests/test_orc.py::test_example_using_json" + # AssertionError: assert 'Europe/Monaco' == 'Europe/Paris' + "pyarrow/tests/test_types.py::test_dateutil_tzinfo_to_string" + # These fail with xxx_fixture not found. + # xxx = unary_func, unary_agg_func, varargs_agg_func + "pyarrow/tests/test_substrait.py::test_udf_via_substrait" + "pyarrow/tests/test_substrait.py::test_scalar_aggregate_udf_basic" + "pyarrow/tests/test_substrait.py::test_hash_aggregate_udf_basic" + "pyarrow/tests/test_udf.py::test_hash_agg_basic" + "pyarrow/tests/test_udf.py::test_hash_agg_empty" + "pyarrow/tests/test_udf.py::test_input_lifetime" + "pyarrow/tests/test_udf.py::test_scalar_agg_basic" + "pyarrow/tests/test_udf.py::test_scalar_agg_empty" + "pyarrow/tests/test_udf.py::test_scalar_agg_varargs" + "pyarrow/tests/test_udf.py::test_scalar_input" + "pyarrow/tests/test_udf.py::test_scalar_udf_context" + "pyarrow/tests/test_udf.py::test_udf_array_unary" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Requires loopback networking - "--deselect=pyarrow/tests/test_ipc.py::test_socket_" - "--deselect=pyarrow/tests/test_flight.py::test_never_sends_data" - "--deselect=pyarrow/tests/test_flight.py::test_large_descriptor" - "--deselect=pyarrow/tests/test_flight.py::test_large_metadata_client" - "--deselect=pyarrow/tests/test_flight.py::test_none_action_side_effect" - # fails to compile - "--deselect=pyarrow/tests/test_cython.py::test_cython_api" + # Requires loopback networking. + "pyarrow/tests/test_ipc.py::test_socket_" + "pyarrow/tests/test_flight.py::test_never_sends_data" + "pyarrow/tests/test_flight.py::test_large_descriptor" + "pyarrow/tests/test_flight.py::test_large_metadata_client" + "pyarrow/tests/test_flight.py::test_none_action_side_effect" + # Fails to compile. + "pyarrow/tests/test_cython.py::test_cython_api" ] ++ lib.optionals (pythonAtLeast "3.11") [ # Repr output is printing number instead of enum name so these tests fail - "--deselect=pyarrow/tests/test_fs.py::test_get_file_info" + "pyarrow/tests/test_fs.py::test_get_file_info" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - # this test requires local networking - "--deselect=pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs" + # This test requires local networking. + "pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs" ]; disabledTests = [ "GcsFileSystem" ]; preCheck = '' + export PARQUET_TEST_DATA="${arrow-cpp.PARQUET_TEST_DATA}" shopt -s extglob rm -r pyarrow/!(conftest.py|tests) mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py - substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest + substituteInPlace pyarrow/tests/conftest.py --replace-fail ..conftest .parent_conftest '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files From 2f57d5c636b4d470f1f8e18a6b13db763292a1d8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 16 Nov 2025 12:16:58 -0500 Subject: [PATCH 371/542] python3Packages.streamlit: allow to build against pyarrow 22+ --- pkgs/development/python-modules/streamlit/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index fc155688f46a..853503a47413 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -7,6 +7,7 @@ cachetools, click, fetchPypi, + fetchpatch2, gitpython, numpy, packaging, @@ -38,6 +39,16 @@ buildPythonPackage rec { hash = "sha256-HnQqnAtpj0Zsb1v1jTM77aWh++jeZgdDl2eRtcFEbvY="; }; + patches = [ + # Allow pyarrow 22 + (fetchpatch2 { + url = "https://github.com/streamlit/streamlit/commit/b9e1b875a948a0aa6e972edc6e86a4f89706e08c.diff?full_index=1"; + stripLen = 1; + excludes = [ "tests/streamlit/data_test_cases.py" ]; + hash = "sha256-qZau1XlP8Kf2hPtyFphJN4UEjbp0ZZYngFdRwXTVt3g="; + }) + ]; + build-system = [ setuptools ]; From e10e2fc22d431ae80d031d457ec0aa2c37201d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 27 Nov 2025 22:42:22 -0800 Subject: [PATCH 372/542] python3Packages.incremental: 24.7.2 -> 24.11.0 Diff: https://github.com/twisted/incremental/compare/incremental-24.7.2...incremental-24.11.0 Changelog: https://github.com/twisted/incremental/blob/incremental-24.11.0/NEWS.rst --- .../python-modules/incremental/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index dd15dca3079d..eb28003c170a 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -1,10 +1,10 @@ { buildPythonPackage, - click, fetchFromGitHub, + hatchling, lib, + packaging, pythonOlder, - setuptools, tomli, twisted, }: @@ -12,25 +12,19 @@ let incremental = buildPythonPackage rec { pname = "incremental"; - version = "24.7.2"; + version = "24.11.0"; pyproject = true; src = fetchFromGitHub { owner = "twisted"; repo = "incremental"; tag = "incremental-${version}"; - hash = "sha256-5MlIKUaBUwLTet23Rjd2Opf5e54LcHuZDowcGon0lOE="; + hash = "sha256-GkTCQYGrgCUzizSgKhWeqJ25pfaYA7eUJIHt0q/iO0E="; }; - # From upstream's pyproject.toml: - # "Keep this aligned with the project dependencies." - build-system = dependencies; + build-system = [ hatchling ]; - dependencies = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - - optional-dependencies = { - scripts = [ click ]; - }; + dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; # escape infinite recursion with twisted doCheck = false; @@ -50,10 +44,11 @@ let pythonImportsCheck = [ "incremental" ]; meta = { - changelog = "https://github.com/twisted/incremental/blob/${src.rev}/NEWS.rst"; + changelog = "https://github.com/twisted/incremental/blob/${src.tag}/NEWS.rst"; homepage = "https://github.com/twisted/incremental"; description = "Small library that versions your Python projects"; license = lib.licenses.mit; + mainProgram = "incremental"; maintainers = with lib.maintainers; [ dotlambda ]; }; }; From 79dbf9f778745054b6bd68b8bfd078288da4dfa4 Mon Sep 17 00:00:00 2001 From: jakobkukla Date: Fri, 28 Nov 2025 13:46:23 +0000 Subject: [PATCH 373/542] spdlog: 1.15.3 -> 1.16.0 --- pkgs/by-name/sp/spdlog/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index d7a205d02b5c..02c62bc429c4 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -16,24 +16,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "spdlog"; - version = "1.15.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; tag = "v${finalAttrs.version}"; - hash = "sha256-0rOR9G2Y4Z4OBZtUHxID0s1aXN9ejodHrurlVCA0pIo="; + hash = "sha256-VB82cNfpJlamUjrQFYElcy0CXAbkPqZkD5zhuLeHLzs="; }; - patches = [ - # https://github.com/gabime/spdlog/pull/3451 - (fetchpatch { - name = "catch2-3.9.0-compat.patch"; - url = "https://github.com/gabime/spdlog/commit/3edc8036dbf3c7cdf0e460a913ae294c87ae90dc.patch"; - hash = "sha256-0XtNaAvDGpSTtQZjxmLbHOoY4OMZDJfLDzBh7gNQh2c="; - }) - ]; - nativeBuildInputs = [ cmake ]; # Required to build tests, even if they aren't executed buildInputs = [ catch2_3 ]; From 9ba29a2fd8c821df1a0df8603b3255f670e64baf Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 28 Nov 2025 12:48:12 +0100 Subject: [PATCH 374/542] libdvdread: 6.1.3 -> 7.0.1 --- .../libraries/libdvdread/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 5daa6063932f..4b2bd41af972 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,21 +2,32 @@ lib, stdenv, fetchurl, + meson, + ninja, + pkg-config, libdvdcss, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdvdread"; - version = "6.1.3"; + version = "7.0.1"; src = fetchurl { - url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-zjVFSZeiCMvlDpEjLw5z+xrDRxllgToTuHMKjxihU2k="; + url = "http://get.videolan.org/libdvdread/${finalAttrs.version}/libdvdread-${finalAttrs.version}.tar.xz"; + hash = "sha256-Lj4EowXBXDljqgOuG5qDwdI5iAAD/PPd6YbTlDNV1Ac="; }; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + buildInputs = [ libdvdcss ]; - NIX_LDFLAGS = "-ldvdcss"; + mesonFlags = [ + (lib.mesonEnable "libdvdcss" true) + ]; postInstall = '' ln -s dvdread $out/include/libdvdread @@ -29,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.wmertens ]; platforms = lib.platforms.unix; }; -} +}) From 18d6699359b01bee312aa17baa326cfd21df4043 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 28 Nov 2025 22:58:14 +0100 Subject: [PATCH 375/542] git-annex: update sha256 for 10.20251114 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 26390afb5f4c..4acb2da3c061 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -600,7 +600,7 @@ with haskellLib; name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-hDbwkpu7qpJZmLNe/rF4eOewLrozo/qpCjFEczZv9S4="; + sha256 = "sha256-+OLFMrqpf1Ooy7CQ9S+N/H5R5+aHQtbO1pYwDF4ln8A="; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash From 62a3860c3400eec2f9d236fbd6590e04102b15b2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 28 Nov 2025 22:58:31 +0100 Subject: [PATCH 376/542] hledger-check-fancyassertions: update sha256 for 1.50.3 --- pkgs/by-name/hl/hledger-check-fancyassertions/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix index 70ee0c052552..b5dea4a0ba93 100644 --- a/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix +++ b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { name = "hledger-check-fancyassertion-${version}.hs"; url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs"; - hash = "sha256-p1JvPHSB5hkfZsTq1sSL0mxCRkhZu1zkpXTELVNFE64="; + hash = "sha256-Zokrrcy9CfVV2tNI1DDsjqC+PcTdlMdit4O4Y1gP1O4="; }; dontUnpack = true; From e17130a3fef33c5d9869887ffcea3c26714514a4 Mon Sep 17 00:00:00 2001 From: Philip Kannegaard Hayes Date: Thu, 27 Nov 2025 22:43:12 -0800 Subject: [PATCH 377/542] util-linux: fix error message sourcing bash completions `util-linux.bin` is accidentally copying over a Makefile into its `share/bash-completion/completions/` output directory, which leads to these annoying error messages when opening a new shell: ``` -bash: /run/current-system/sw/share/bash-completion/completions/Makemodule.am: line 198: syntax error near unexpected token `else' -bash: /run/current-system/sw/share/bash-completion/completions/Makemodule.am: line 198: `else' ``` We'll fix the issue by removing the `Makemodule.am` file before it gets copied over. --- pkgs/by-name/ut/util-linux/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 6b5a028ca029..cd354611f9ac 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -178,6 +178,7 @@ stdenv.mkDerivation (finalAttrs: { ln -svf "$bin/bin/hexdump" "$bin/bin/hd" ln -svf "$man/share/man/man1/hexdump.1" "$man/share/man/man1/hd.1" + rm -f bash-completion/Makemodule.am installShellCompletion --bash bash-completion/* '' + lib.optionalString stdenv.hostPlatform.isLinux '' From b8d7d975b34299870d9087a8146bc8bdac6c9b05 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 28 Nov 2025 14:11:13 -0800 Subject: [PATCH 378/542] openssh: fix PKCS#11 key enumeration and pin entry Arch has cherry-picked these commits to fix a bug in OpenSSH's PKCS#11 support; we should do them ourselves too. https://gitlab.archlinux.org/archlinux/packaging/packages/openssh/-/issues/23 Replace our hand-rolled patch for the PKCS#11 tests with the corresponding commits landing upstream. Fixes: #466049 Signed-off-by: Morgan Jones --- pkgs/tools/networking/openssh/common.nix | 28 +++++++++- .../networking/openssh/fix_pkcs11_tests.patch | 51 ------------------- 2 files changed, 27 insertions(+), 52 deletions(-) delete mode 100644 pkgs/tools/networking/openssh/fix_pkcs11_tests.patch diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 26999bd53ed5..3be6e5704320 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -67,9 +67,35 @@ stdenv.mkDerivation (finalAttrs: { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch + # See discussion in https://github.com/NixOS/nixpkgs/issues/466049 and + # https://gitlab.archlinux.org/archlinux/packaging/packages/openssh/-/issues/23 + (fetchpatch { + name = "pkcs11-fetchkey-error-to-debug.patch"; + url = "https://github.com/openssh/openssh-portable/commit/607f337637f2077b34a9f6f96fc24237255fe175.patch"; + hunks = [ "2-" ]; + hash = "sha256-rdvKL6/rwrdhGKlcmdy6fxVgJgaaRsmngX0KkShXAhQ="; + }) + (fetchpatch { + name = "pkcs11-fix-pinentry.patch"; + url = "https://github.com/openssh/openssh-portable/commit/434ba7684054c0637ce8f2486aaacafe65d9b8aa.patch"; + # only applies to Makefile.in (which doesn't have a date header) so no hunks= needed + hash = "sha256-3JQ3IJurngXclORrfC2Bx7xvmGA6w2nIh+eZ0zd0bLY="; + }) + # See discussion in https://github.com/NixOS/nixpkgs/issues/453782 and # https://github.com/openssh/openssh-portable/pull/602 - ./fix_pkcs11_tests.patch + (fetchpatch { + name = "pkcs11-tests-allow-module-path.patch"; + url = "https://github.com/openssh/openssh-portable/commit/5e7c3f33b2693b668ecfbac84b85f2c0c84410c2.patch"; + hunks = [ "2-" ]; + hash = "sha256-mGpRGXurg8K9Wp8qoojG5MQ+3sZW2XKy2z0RDXLHaEc="; + }) + (fetchpatch { + name = "ssh-agent-tests-increase-timeout.patch"; + url = "https://github.com/openssh/openssh-portable/commit/1fdc3c61194819c16063dc430eeb84b81bf42dcf.patch"; + hunks = [ "2-" ]; + hash = "sha256-b9YCOav32kY5VEvIG3W1fyD87HaQxof6Zwq9Oo+/Lac="; + }) ] ++ extraPatches; diff --git a/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch b/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch deleted file mode 100644 index c4459c8ee0e1..000000000000 --- a/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 642218d8dd1ec79fa0c8db491fd46faa3ab026f7 Mon Sep 17 00:00:00 2001 -From: Morgan Jones -Date: Tue, 21 Oct 2025 01:15:55 -0700 -Subject: [PATCH 1/2] test-exec: use -P for allowed PKCS#11 library when - starting agent - -If we just loaded a PKCS#11 library, we should allow it so the -regression test can run. - -Fixes: https://github.com/NixOS/nixpkgs/issues/453782 ---- - regress/test-exec.sh | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/regress/test-exec.sh b/regress/test-exec.sh -index 5b0c91f3faa..30b3da8709d 100644 ---- a/regress/test-exec.sh -+++ b/regress/test-exec.sh -@@ -1023,6 +1023,9 @@ p11_ssh_add() { - - start_ssh_agent() { - EXTRA_AGENT_ARGS="$1" -+ if [ "$PKCS11_OK" = "yes" ]; then -+ EXTRA_AGENT_ARGS="${EXTRA_AGENT_ARGS} -P${TEST_SSH_PKCS11}" -+ fi - SSH_AUTH_SOCK="$OBJ/agent.sock" - export SSH_AUTH_SOCK - rm -f $SSH_AUTH_SOCK $OBJ/agent.log - -From 5ae735db7d81b38ee059d63a4011291cb4456aef Mon Sep 17 00:00:00 2001 -From: Morgan Jones -Date: Tue, 21 Oct 2025 01:50:23 -0700 -Subject: [PATCH 2/2] test-exec: give more time for ssh-agent to start - ---- - regress/test-exec.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/regress/test-exec.sh b/regress/test-exec.sh -index 30b3da8709d..56a7653b386 100644 ---- a/regress/test-exec.sh -+++ b/regress/test-exec.sh -@@ -1034,7 +1034,7 @@ start_ssh_agent() { - > $OBJ/agent.log 2>&1 & - AGENT_PID=$! - trap "kill $AGENT_PID" EXIT -- for x in 0 1 2 3 4 ; do -+ for x in $(seq 15); do - # Give it a chance to start - ${SSHADD} -l > /dev/null 2>&1 - r=$? From 64116b0be79013a28f4594f3c2d376b9099bbb3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Nov 2025 02:11:03 +0000 Subject: [PATCH 379/542] scons: 4.10.0 -> 4.10.1 --- pkgs/by-name/sc/scons/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scons/package.nix b/pkgs/by-name/sc/scons/package.nix index c1393046acdd..436c30b1f8df 100644 --- a/pkgs/by-name/sc/scons/package.nix +++ b/pkgs/by-name/sc/scons/package.nix @@ -6,13 +6,13 @@ }: python3Packages.buildPythonApplication rec { pname = "scons"; - version = "4.10.0"; + version = "4.10.1"; src = fetchFromGitHub { owner = "Scons"; repo = "scons"; tag = version; - hash = "sha256-ZmJETrznHH3zsNBO5o8JCvf+6l7NICOAfIqASYzYBaM="; + hash = "sha256-Lq6sDd6Bs9lMfTptlxdeNhOc1acP7xuLdDhIi65uqFo="; }; pyproject = true; From 2a3a74621a976f218de5ba4bc1ad28afcc913ffc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Nov 2025 06:31:32 +0000 Subject: [PATCH 380/542] sqlite, sqlite-analyzer: 3.51.0 -> 3.51.1 Changes: https://sqlite.org/releaselog/3_51_1.html --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- pkgs/development/libraries/sqlite/tools.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index d2602c8486f4..27ab4a1e572f 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -27,17 +27,17 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.51.0"; + version = "3.51.1"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-QuJt/dlqouaxsb5ciLCIf5lZCT9lDWk8sC65w20UbKU="; + hash = "sha256-TyRFzXBHlyTTKtAV7H/Tf7tvYTABO9S/vIDDK+tCt+A="; }; docsrc = fetchurl { url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip"; - hash = "sha256-4+NAcVRyc84ClYZGDTPiU27Eb3+qiv4Kbpl1OTMVGXY="; + hash = "sha256-cygHoBzJ/K8ftBxw5Bam7dUVlXeI89Wud/7J2BtuIns="; }; outputs = [ diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 8f7fd71d0ffe..36ae8363204e 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -19,14 +19,14 @@ let }: stdenv.mkDerivation rec { inherit pname; - version = "3.51.0"; + version = "3.51.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-UzBxm4uAv1Y5kf96NzBSlD9TV6rnbNHzNn6rhF06dbc="; + hash = "sha256-D452WsjqfDbPjqm//dXBA1ZPSopjXyFfn3g7M4oT2XE="; }; nativeBuildInputs = [ unzip ]; From c9195443de0b2107b1738224e6cb48821995bbc3 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 29 Nov 2025 13:24:13 +0100 Subject: [PATCH 381/542] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1820566](https://hydra.nixos.org/eval/1820566) of nixpkgs commit [62a3860](https://github.com/NixOS/nixpkgs/commits/62a3860c3400eec2f9d236fbd6590e04102b15b2) as of 2025-11-29 12:05 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 293 +++++++++ .../transitive-broken.yaml | 16 +- .../haskell-modules/hackage-packages.nix | 601 +++++++++++++++++- 3 files changed, 908 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a7a8d2a37cab..47bcb243c8f8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -120,6 +120,7 @@ broken-packages: - air-extra # failure in job https://hydra.nixos.org/build/233250519 at 2023-09-02 - air-th # failure in job https://hydra.nixos.org/build/233228206 at 2023-09-02 - airbrake # failure in job https://hydra.nixos.org/build/233199319 at 2023-09-02 + - airgql # failure in job https://hydra.nixos.org/build/315094487 at 2025-11-29 - airship # failure in job https://hydra.nixos.org/build/233239011 at 2023-09-02 - airtable-api # failure in job https://hydra.nixos.org/build/233228482 at 2023-09-02 - ajhc # failure in job https://hydra.nixos.org/build/233197894 at 2023-09-02 @@ -162,6 +163,7 @@ broken-packages: - amazonka-mtl # failure in job https://hydra.nixos.org/build/295091544 at 2025-04-22 - amazonka-s3-encryption # failure in job https://hydra.nixos.org/build/295091601 at 2025-04-22 - AMI # failure in job https://hydra.nixos.org/build/233232505 at 2023-09-02 + - ampersand # failure in job https://hydra.nixos.org/build/315094859 at 2025-11-29 - amqp-conduit # failure in job https://hydra.nixos.org/build/233228080 at 2023-09-02 - amqp-streamly # failure in job https://hydra.nixos.org/build/295091669 at 2025-04-22 - amqp-worker # failure in job https://hydra.nixos.org/build/236675859 at 2023-10-04 @@ -254,6 +256,7 @@ broken-packages: - ArrowVHDL # failure in job https://hydra.nixos.org/build/233206149 at 2023-09-02 - artery # failure in job https://hydra.nixos.org/build/233206830 at 2023-09-02 - artifact # failure in job https://hydra.nixos.org/build/233233300 at 2023-09-02 + - arxiv-client # failure in job https://hydra.nixos.org/build/315094785 at 2025-11-29 - asap # failure in job https://hydra.nixos.org/build/233214968 at 2023-09-02 - ascii-caseless # failure in job https://hydra.nixos.org/build/307516784 at 2025-09-19 - ascii-flatten # failure in job https://hydra.nixos.org/build/233229168 at 2023-09-02 @@ -319,6 +322,9 @@ broken-packages: - authenticate-ldap # failure in job https://hydra.nixos.org/build/233216602 at 2023-09-02 - authinfo-hs # failure in job https://hydra.nixos.org/build/233224767 at 2023-09-02 - auto # failure in job https://hydra.nixos.org/build/233211088 at 2023-09-02 + - auto-export # failure in job https://hydra.nixos.org/build/315094848 at 2025-11-29 + - auto-extract # failure in job https://hydra.nixos.org/build/315094847 at 2025-11-29 + - auto-import # failure in job https://hydra.nixos.org/build/315094870 at 2025-11-29 - auto-split # failure in job https://hydra.nixos.org/build/295091795 at 2025-04-22 - autoapply # failure in job https://hydra.nixos.org/build/295091805 at 2025-04-22 - autom # failure in job https://hydra.nixos.org/build/234461198 at 2023-09-13 @@ -340,6 +346,7 @@ broken-packages: - aws-easy # failure building library in job https://hydra.nixos.org/build/237244335 at 2023-10-21 - aws-ec2 # failure in job https://hydra.nixos.org/build/233201556 at 2023-09-02 - aws-ec2-knownhosts # failure in job https://hydra.nixos.org/build/233237078 at 2023-09-02 + - aws-eventbridge-cron # failure in job https://hydra.nixos.org/build/315094885 at 2025-11-29 - aws-general # failure in job https://hydra.nixos.org/build/233211106 at 2023-09-02 - aws-lambda-runtime # failure in job https://hydra.nixos.org/build/233195123 at 2023-09-02 - aws-larpi # failure in job https://hydra.nixos.org/build/233246059 at 2023-09-02 @@ -533,6 +540,7 @@ broken-packages: - blosum # failure in job https://hydra.nixos.org/build/233198029 at 2023-09-02 - blubber-server # failure in job https://hydra.nixos.org/build/233199530 at 2023-09-02 - bludigon # failure in job https://hydra.nixos.org/build/233248190 at 2023-09-02 + - bluefin-contrib # failure in job https://hydra.nixos.org/build/315095091 at 2025-11-29 - bluefin-random # failure in job https://hydra.nixos.org/build/307517069 at 2025-09-19 - Blueprint # failure in job https://hydra.nixos.org/build/233252987 at 2023-09-02 - bluetileutils # failure in job https://hydra.nixos.org/build/233197334 at 2023-09-02 @@ -775,6 +783,7 @@ broken-packages: - cg # failure in job https://hydra.nixos.org/build/233212272 at 2023-09-02 - cgen # failure in job https://hydra.nixos.org/build/233198570 at 2023-09-02 - cgi-utils # failure in job https://hydra.nixos.org/build/233251773 at 2023-09-02 + - cgrep # failure in job https://hydra.nixos.org/build/315095274 at 2025-11-29 - cgroup-rts-threads # failure in job https://hydra.nixos.org/build/233207888 at 2023-09-02 - chakra # failure in job https://hydra.nixos.org/build/282936173 at 2024-12-24 - chalkboard # failure in job https://hydra.nixos.org/build/234453414 at 2023-09-13 @@ -1065,6 +1074,7 @@ broken-packages: - copilot-bluespec # failure in job https://hydra.nixos.org/build/253685418 at 2024-03-31 - copilot-frp-sketch # copilot >=3.7 && <3.8, - copilot-verifier # failure in job https://hydra.nixos.org/build/297024747 at 2025-05-14 + - copilot-visualizer # failure in job https://hydra.nixos.org/build/315095584 at 2025-11-29 - copr # failure in job https://hydra.nixos.org/build/233252310 at 2023-09-02 - coquina # failure in job https://hydra.nixos.org/build/307610386 at 2025-09-19 - core # failure in job https://hydra.nixos.org/build/233253971 at 2023-09-02 @@ -1119,7 +1129,9 @@ broken-packages: - crockford # failure in job https://hydra.nixos.org/build/233210759 at 2023-09-02 - crocodile # failure in job https://hydra.nixos.org/build/233222277 at 2023-09-02 - cronus # failure in job https://hydra.nixos.org/build/233225303 at 2023-09-02 + - croque-mort # failure in job https://hydra.nixos.org/build/315095572 at 2025-11-29 - crucible-debug # failure in job https://hydra.nixos.org/build/307610411 at 2025-09-19 + - crucible-llvm # failure in job https://hydra.nixos.org/build/315095700 at 2025-11-29 - cruncher-types # failure in job https://hydra.nixos.org/build/233229024 at 2023-09-02 - crunghc # failure in job https://hydra.nixos.org/build/233193295 at 2023-09-02 - crypt-sha512 # failure in job https://hydra.nixos.org/build/307517616 at 2025-09-19 @@ -1255,6 +1267,7 @@ broken-packages: - database-migrate # failure in job https://hydra.nixos.org/build/233201597 at 2023-09-02 - database-study # failure in job https://hydra.nixos.org/build/233222466 at 2023-09-02 - datadog # failure in job https://hydra.nixos.org/build/233191124 at 2023-09-02 + - dataframe # failure in job https://hydra.nixos.org/build/315095739 at 2025-11-29 - DataIndex # failure in job https://hydra.nixos.org/build/233254506 at 2023-09-02 - datalog # failure in job https://hydra.nixos.org/build/233242707 at 2023-09-02 - datapacker # failure in job https://hydra.nixos.org/build/233206524 at 2023-09-02 @@ -1461,6 +1474,7 @@ broken-packages: - DOH # failure in job https://hydra.nixos.org/build/233231913 at 2023-09-02 - doi # failure in job https://hydra.nixos.org/build/295092999 at 2025-04-22 - dom-events # failure in job https://hydra.nixos.org/build/233231199 at 2023-09-02 + - dom-parser # failure in job https://hydra.nixos.org/build/315095926 at 2025-11-29 - dom-selector # failure in job https://hydra.nixos.org/build/233212663 at 2023-09-02 - domaindriven-core # failure in job https://hydra.nixos.org/build/233234739 at 2023-09-02 - dominion # failure in job https://hydra.nixos.org/build/252714022 at 2024-03-16 @@ -1475,6 +1489,7 @@ broken-packages: - downloader # failure in job https://hydra.nixos.org/build/233195131 at 2023-09-02 - dozenal # failure in job https://hydra.nixos.org/build/233255439 at 2023-09-02 - dozens # failure in job https://hydra.nixos.org/build/233200638 at 2023-09-02 + - dpapi # failure in job https://hydra.nixos.org/build/315095939 at 2025-11-29 - dph-base # failure in job https://hydra.nixos.org/build/233211189 at 2023-09-02 - dpkg # failure in job https://hydra.nixos.org/build/233663149 at 2023-09-02 - DPM # failure in job https://hydra.nixos.org/build/233191307 at 2023-09-02 @@ -1509,6 +1524,7 @@ broken-packages: - dump-core # failure in job https://hydra.nixos.org/build/233244428 at 2023-09-02 - dunai-core # failure in job https://hydra.nixos.org/build/233255804 at 2023-09-02 - Dung # failure in job https://hydra.nixos.org/build/233206343 at 2023-09-02 + - duoids # failure in job https://hydra.nixos.org/build/315095962 at 2025-11-29 - dupIO # failure in job https://hydra.nixos.org/build/236688265 at 2023-10-04 - duplo # failure in job https://hydra.nixos.org/build/233237341 at 2023-09-02 - dura # failure in job https://hydra.nixos.org/build/233210320 at 2023-09-02 @@ -2110,6 +2126,7 @@ broken-packages: - geojson # failure in job https://hydra.nixos.org/build/295093530 at 2025-04-22 - geojson-types # failure in job https://hydra.nixos.org/build/233224929 at 2023-09-02 - geom2d # failure in job https://hydra.nixos.org/build/233254609 at 2023-09-02 + - geomancy # failure in job https://hydra.nixos.org/build/315096508 at 2025-11-29 - GeomPredicates-SSE # failure in job https://hydra.nixos.org/build/233249584 at 2023-09-02 - geos # failure in job https://hydra.nixos.org/build/233203852 at 2023-09-02 - Get # failure in job https://hydra.nixos.org/build/233216093 at 2023-09-02 @@ -2521,6 +2538,7 @@ broken-packages: - haskell-compression # failure in job https://hydra.nixos.org/build/233212749 at 2023-09-02 - haskell-conll # failure in job https://hydra.nixos.org/build/233203484 at 2023-09-02 - haskell-course-preludes # failure in job https://hydra.nixos.org/build/233196306 at 2023-09-02 + - haskell-debugger-view # failure in job https://hydra.nixos.org/build/315096984 at 2025-11-29 - haskell-disque # failure in job https://hydra.nixos.org/build/233226200 at 2023-09-02 - haskell-docs-cli # failure in job https://hydra.nixos.org/build/252718877 at 2024-03-16 - haskell-ffprobe # failure in job https://hydra.nixos.org/build/267973417 at 2024-07-31 @@ -2674,6 +2692,7 @@ broken-packages: - heckle # failure in job https://hydra.nixos.org/build/233228954 at 2023-09-02 - heddit # failure in job https://hydra.nixos.org/build/233229058 at 2023-09-02 - hedgehog-checkers # failure in job https://hydra.nixos.org/build/233229405 at 2023-09-02 + - hedgehog-extras # failure in job https://hydra.nixos.org/build/315097057 at 2025-11-29 - hedgehog-gen # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237243271 at 2023-10-21 - hedgehog-generic # failure in job https://hydra.nixos.org/build/233204695 at 2023-09-02 - hedgehog-golden # failure in job https://hydra.nixos.org/build/233219619 at 2023-09-02 @@ -3065,6 +3084,7 @@ broken-packages: - hsluv-haskell # failure in job https://hydra.nixos.org/build/233239548 at 2023-09-02 - hsmagick # failure in job https://hydra.nixos.org/build/233235964 at 2023-09-02 - hsmodetweaks # failure in job https://hydra.nixos.org/build/233663004 at 2023-09-02 + - hsmrc # failure in job https://hydra.nixos.org/build/315097363 at 2025-11-29 - Hsmtlib # failure in job https://hydra.nixos.org/build/233213073 at 2023-09-02 - hsmtpclient # failure in job https://hydra.nixos.org/build/233224596 at 2023-09-02 - hsnock # failure in job https://hydra.nixos.org/build/233194525 at 2023-09-02 @@ -3094,6 +3114,7 @@ broken-packages: - hspretty # failure in job https://hydra.nixos.org/build/233253394 at 2023-09-02 - hsql # failure in job https://hydra.nixos.org/build/233217626 at 2023-09-02 - hsseccomp # failure in job https://hydra.nixos.org/build/233194411 at 2023-09-02 + - hssh # failure in job https://hydra.nixos.org/build/315097366 at 2025-11-29 - hsshellscript # failure in job https://hydra.nixos.org/build/233197858 at 2023-09-02 - hsSqlite3 # failure in job https://hydra.nixos.org/build/233238549 at 2023-09-02 - hssqlppp # failure in job https://hydra.nixos.org/build/233216888 at 2023-09-02 @@ -4050,6 +4071,7 @@ broken-packages: - mixpanel-client # failure in job https://hydra.nixos.org/build/233220132 at 2023-09-02 - mkcabal # failure in job https://hydra.nixos.org/build/233202466 at 2023-09-02 - ml-w # failure in job https://hydra.nixos.org/build/233251342 at 2023-09-02 + - mlkem # failure in job https://hydra.nixos.org/build/315098220 at 2025-11-29 - mltool # failure in job https://hydra.nixos.org/build/233203849 at 2023-09-02 - mm2 # failure in job https://hydra.nixos.org/build/233260048 at 2023-09-02 - mmsyn2 # failure in job https://hydra.nixos.org/build/233201519 at 2023-09-02 @@ -4078,6 +4100,7 @@ broken-packages: - monad-atom-simple # failure in job https://hydra.nixos.org/build/233259038 at 2023-09-02 - monad-branch # failure in job https://hydra.nixos.org/build/233251253 at 2023-09-02 - monad-choice # failure in job https://hydra.nixos.org/build/233255987 at 2023-09-02 + - monad-effect-logging # failure in job https://hydra.nixos.org/build/315098256 at 2025-11-29 - monad-fork # failure in job https://hydra.nixos.org/build/233206855 at 2023-09-02 - monad-gen # failure in job https://hydra.nixos.org/build/252730194 at 2024-03-16 - monad-introspect # failure in job https://hydra.nixos.org/build/233248261 at 2023-09-02 @@ -4344,6 +4367,7 @@ broken-packages: - nicovideo-translator # failure in job https://hydra.nixos.org/build/233225618 at 2023-09-02 - nist-beacon # failure in job https://hydra.nixos.org/build/233206376 at 2023-09-02 - nitro # failure in job https://hydra.nixos.org/build/233229909 at 2023-09-02 + - nix-cache-server # failure in job https://hydra.nixos.org/build/315098561 at 2025-11-29 - nix-delegate # failure in job https://hydra.nixos.org/build/233232891 at 2023-09-02 - nix-eval # failure in job https://hydra.nixos.org/build/233256388 at 2023-09-02 - nix-freeze-tree # failure in job https://hydra.nixos.org/build/233234834 at 2023-09-02 @@ -5115,6 +5139,7 @@ broken-packages: - qc-oi-testgenerator # failure in job https://hydra.nixos.org/build/233197822 at 2023-09-02 - qd # failure in job https://hydra.nixos.org/build/233213936 at 2023-09-02 - qed # failure in job https://hydra.nixos.org/build/233249635 at 2023-09-02 + - qhs # failure in job https://hydra.nixos.org/build/315099159 at 2025-11-29 - qhull-simple # failure in job https://hydra.nixos.org/build/233248108 at 2023-09-02 - qif # failure in job https://hydra.nixos.org/build/233227609 at 2023-09-02 - QIO # failure in job https://hydra.nixos.org/build/233233009 at 2023-09-02 @@ -5935,6 +5960,7 @@ broken-packages: - sqlcipher # failure in job https://hydra.nixos.org/build/233259217 at 2023-09-02 - sqlcli # failure in job https://hydra.nixos.org/build/252719841 at 2024-03-16 - sqlite # failure in job https://hydra.nixos.org/build/233215839 at 2023-09-02 + - sqlite-easy # failure in job https://hydra.nixos.org/build/315099889 at 2025-11-29 - sqlite-simple-errors # failure in job https://hydra.nixos.org/build/233232977 at 2023-09-02 - sqlvalue-list # failure in job https://hydra.nixos.org/build/233197313 at 2023-09-02 - sqsd-local # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237237046 at 2023-10-21 @@ -6026,6 +6052,268 @@ broken-packages: - Strafunski-StrategyLib # failure in job https://hydra.nixos.org/build/233245449 at 2023-09-02 - StrappedTemplates # failure in job https://hydra.nixos.org/build/233193696 at 2023-09-02 - StrategyLib # failure in job https://hydra.nixos.org/build/233214584 at 2023-09-02 + - stratosphere-accessanalyzer # failure in job https://hydra.nixos.org/build/315099979 at 2025-11-29 + - stratosphere-acmpca # failure in job https://hydra.nixos.org/build/315099999 at 2025-11-29 + - stratosphere-aiops # failure in job https://hydra.nixos.org/build/315099983 at 2025-11-29 + - stratosphere-amazonmq # failure in job https://hydra.nixos.org/build/315099980 at 2025-11-29 + - stratosphere-amplify # failure in job https://hydra.nixos.org/build/315099995 at 2025-11-29 + - stratosphere-amplifyuibuilder # failure in job https://hydra.nixos.org/build/315100002 at 2025-11-29 + - stratosphere-apigateway # failure in job https://hydra.nixos.org/build/315100001 at 2025-11-29 + - stratosphere-apigatewayv2 # failure in job https://hydra.nixos.org/build/315100059 at 2025-11-29 + - stratosphere-appconfig # failure in job https://hydra.nixos.org/build/315099984 at 2025-11-29 + - stratosphere-appflow # failure in job https://hydra.nixos.org/build/315100009 at 2025-11-29 + - stratosphere-appintegrations # failure in job https://hydra.nixos.org/build/315099987 at 2025-11-29 + - stratosphere-applicationautoscaling # failure in job https://hydra.nixos.org/build/315099989 at 2025-11-29 + - stratosphere-applicationinsights # failure in job https://hydra.nixos.org/build/315100000 at 2025-11-29 + - stratosphere-applicationsignals # failure in job https://hydra.nixos.org/build/315099991 at 2025-11-29 + - stratosphere-appmesh # failure in job https://hydra.nixos.org/build/315100015 at 2025-11-29 + - stratosphere-apprunner # failure in job https://hydra.nixos.org/build/315099992 at 2025-11-29 + - stratosphere-appstream # failure in job https://hydra.nixos.org/build/315099993 at 2025-11-29 + - stratosphere-appsync # failure in job https://hydra.nixos.org/build/315099998 at 2025-11-29 + - stratosphere-apptest # failure in job https://hydra.nixos.org/build/315100005 at 2025-11-29 + - stratosphere-aps # failure in job https://hydra.nixos.org/build/315099996 at 2025-11-29 + - stratosphere-arcregionswitch # failure in job https://hydra.nixos.org/build/315100028 at 2025-11-29 + - stratosphere-arczonalshift # failure in job https://hydra.nixos.org/build/315100010 at 2025-11-29 + - stratosphere-ask # failure in job https://hydra.nixos.org/build/315100007 at 2025-11-29 + - stratosphere-athena # failure in job https://hydra.nixos.org/build/315100014 at 2025-11-29 + - stratosphere-auditmanager # failure in job https://hydra.nixos.org/build/315100034 at 2025-11-29 + - stratosphere-autoscaling # failure in job https://hydra.nixos.org/build/315100023 at 2025-11-29 + - stratosphere-autoscalingplans # failure in job https://hydra.nixos.org/build/315100012 at 2025-11-29 + - stratosphere-b2bi # failure in job https://hydra.nixos.org/build/315100004 at 2025-11-29 + - stratosphere-backup # failure in job https://hydra.nixos.org/build/315100043 at 2025-11-29 + - stratosphere-backupgateway # failure in job https://hydra.nixos.org/build/315100006 at 2025-11-29 + - stratosphere-batch # failure in job https://hydra.nixos.org/build/315100041 at 2025-11-29 + - stratosphere-bcmdataexports # failure in job https://hydra.nixos.org/build/315100020 at 2025-11-29 + - stratosphere-bedrock # failure in job https://hydra.nixos.org/build/315100008 at 2025-11-29 + - stratosphere-bedrockagentcore # failure in job https://hydra.nixos.org/build/315100016 at 2025-11-29 + - stratosphere-billing # failure in job https://hydra.nixos.org/build/315100011 at 2025-11-29 + - stratosphere-billingconductor # failure in job https://hydra.nixos.org/build/315100021 at 2025-11-29 + - stratosphere-budgets # failure in job https://hydra.nixos.org/build/315100013 at 2025-11-29 + - stratosphere-cassandra # failure in job https://hydra.nixos.org/build/315100060 at 2025-11-29 + - stratosphere-ce # failure in job https://hydra.nixos.org/build/315100029 at 2025-11-29 + - stratosphere-certificatemanager # failure in job https://hydra.nixos.org/build/315100024 at 2025-11-29 + - stratosphere-chatbot # failure in job https://hydra.nixos.org/build/315100017 at 2025-11-29 + - stratosphere-cleanrooms # failure in job https://hydra.nixos.org/build/315100018 at 2025-11-29 + - stratosphere-cleanroomsml # failure in job https://hydra.nixos.org/build/315100019 at 2025-11-29 + - stratosphere-cloud9 # failure in job https://hydra.nixos.org/build/315100038 at 2025-11-29 + - stratosphere-cloudformation # failure in job https://hydra.nixos.org/build/315100071 at 2025-11-29 + - stratosphere-cloudfront # failure in job https://hydra.nixos.org/build/315100049 at 2025-11-29 + - stratosphere-cloudtrail # failure in job https://hydra.nixos.org/build/315100033 at 2025-11-29 + - stratosphere-cloudwatch # failure in job https://hydra.nixos.org/build/315100064 at 2025-11-29 + - stratosphere-codeartifact # failure in job https://hydra.nixos.org/build/315100025 at 2025-11-29 + - stratosphere-codebuild # failure in job https://hydra.nixos.org/build/315100026 at 2025-11-29 + - stratosphere-codecommit # failure in job https://hydra.nixos.org/build/315100027 at 2025-11-29 + - stratosphere-codeconnections # failure in job https://hydra.nixos.org/build/315100117 at 2025-11-29 + - stratosphere-codedeploy # failure in job https://hydra.nixos.org/build/315100039 at 2025-11-29 + - stratosphere-codeguruprofiler # failure in job https://hydra.nixos.org/build/315100030 at 2025-11-29 + - stratosphere-codegurureviewer # failure in job https://hydra.nixos.org/build/315100031 at 2025-11-29 + - stratosphere-codepipeline # failure in job https://hydra.nixos.org/build/315100052 at 2025-11-29 + - stratosphere-codestar # failure in job https://hydra.nixos.org/build/315100032 at 2025-11-29 + - stratosphere-codestarconnections # failure in job https://hydra.nixos.org/build/315100065 at 2025-11-29 + - stratosphere-codestarnotifications # failure in job https://hydra.nixos.org/build/315100035 at 2025-11-29 + - stratosphere-cognito # failure in job https://hydra.nixos.org/build/315100044 at 2025-11-29 + - stratosphere-comprehend # failure in job https://hydra.nixos.org/build/315100036 at 2025-11-29 + - stratosphere-config # failure in job https://hydra.nixos.org/build/315100037 at 2025-11-29 + - stratosphere-connect # failure in job https://hydra.nixos.org/build/315100050 at 2025-11-29 + - stratosphere-connectcampaigns # failure in job https://hydra.nixos.org/build/315100051 at 2025-11-29 + - stratosphere-connectcampaignsv2 # failure in job https://hydra.nixos.org/build/315100066 at 2025-11-29 + - stratosphere-controltower # failure in job https://hydra.nixos.org/build/315100042 at 2025-11-29 + - stratosphere-cur # failure in job https://hydra.nixos.org/build/315100048 at 2025-11-29 + - stratosphere-customerprofiles # failure in job https://hydra.nixos.org/build/315100091 at 2025-11-29 + - stratosphere-databrew # failure in job https://hydra.nixos.org/build/315100106 at 2025-11-29 + - stratosphere-datapipeline # failure in job https://hydra.nixos.org/build/315100045 at 2025-11-29 + - stratosphere-datasync # failure in job https://hydra.nixos.org/build/315100046 at 2025-11-29 + - stratosphere-datazone # failure in job https://hydra.nixos.org/build/315100047 at 2025-11-29 + - stratosphere-dax # failure in job https://hydra.nixos.org/build/315100053 at 2025-11-29 + - stratosphere-deadline # failure in job https://hydra.nixos.org/build/315100055 at 2025-11-29 + - stratosphere-detective # failure in job https://hydra.nixos.org/build/315100062 at 2025-11-29 + - stratosphere-devopsguru # failure in job https://hydra.nixos.org/build/315100114 at 2025-11-29 + - stratosphere-directoryservice # failure in job https://hydra.nixos.org/build/315100063 at 2025-11-29 + - stratosphere-dlm # failure in job https://hydra.nixos.org/build/315100054 at 2025-11-29 + - stratosphere-dms # failure in job https://hydra.nixos.org/build/315100076 at 2025-11-29 + - stratosphere-docdb # failure in job https://hydra.nixos.org/build/315100056 at 2025-11-29 + - stratosphere-docdbelastic # failure in job https://hydra.nixos.org/build/315100057 at 2025-11-29 + - stratosphere-dsql # failure in job https://hydra.nixos.org/build/315100068 at 2025-11-29 + - stratosphere-dynamodb # failure in job https://hydra.nixos.org/build/315100058 at 2025-11-29 + - stratosphere-ec2 # failure in job https://hydra.nixos.org/build/315100074 at 2025-11-29 + - stratosphere-ecr # failure in job https://hydra.nixos.org/build/315100070 at 2025-11-29 + - stratosphere-ecs # failure in job https://hydra.nixos.org/build/315100061 at 2025-11-29 + - stratosphere-efs # failure in job https://hydra.nixos.org/build/315100077 at 2025-11-29 + - stratosphere-eks # failure in job https://hydra.nixos.org/build/315100097 at 2025-11-29 + - stratosphere-elasticache # failure in job https://hydra.nixos.org/build/315100069 at 2025-11-29 + - stratosphere-elasticbeanstalk # failure in job https://hydra.nixos.org/build/315100073 at 2025-11-29 + - stratosphere-elasticloadbalancing # failure in job https://hydra.nixos.org/build/315100067 at 2025-11-29 + - stratosphere-elasticloadbalancingv2 # failure in job https://hydra.nixos.org/build/315100086 at 2025-11-29 + - stratosphere-elasticsearch # failure in job https://hydra.nixos.org/build/315100079 at 2025-11-29 + - stratosphere-emr # failure in job https://hydra.nixos.org/build/315100088 at 2025-11-29 + - stratosphere-emrcontainers # failure in job https://hydra.nixos.org/build/315100084 at 2025-11-29 + - stratosphere-emrserverless # failure in job https://hydra.nixos.org/build/315100072 at 2025-11-29 + - stratosphere-entityresolution # failure in job https://hydra.nixos.org/build/315100104 at 2025-11-29 + - stratosphere-events # failure in job https://hydra.nixos.org/build/315100105 at 2025-11-29 + - stratosphere-eventschemas # failure in job https://hydra.nixos.org/build/315100075 at 2025-11-29 + - stratosphere-evidently # failure in job https://hydra.nixos.org/build/315100125 at 2025-11-29 + - stratosphere-evs # failure in job https://hydra.nixos.org/build/315100137 at 2025-11-29 + - stratosphere-finspace # failure in job https://hydra.nixos.org/build/315100078 at 2025-11-29 + - stratosphere-fis # failure in job https://hydra.nixos.org/build/315100095 at 2025-11-29 + - stratosphere-fms # failure in job https://hydra.nixos.org/build/315100082 at 2025-11-29 + - stratosphere-forecast # failure in job https://hydra.nixos.org/build/315100080 at 2025-11-29 + - stratosphere-frauddetector # failure in job https://hydra.nixos.org/build/315100081 at 2025-11-29 + - stratosphere-fsx # failure in job https://hydra.nixos.org/build/315100083 at 2025-11-29 + - stratosphere-gamelift # failure in job https://hydra.nixos.org/build/315100116 at 2025-11-29 + - stratosphere-globalaccelerator # failure in job https://hydra.nixos.org/build/315100085 at 2025-11-29 + - stratosphere-glue # failure in job https://hydra.nixos.org/build/315100109 at 2025-11-29 + - stratosphere-grafana # failure in job https://hydra.nixos.org/build/315100087 at 2025-11-29 + - stratosphere-greengrass # failure in job https://hydra.nixos.org/build/315100098 at 2025-11-29 + - stratosphere-greengrassv2 # failure in job https://hydra.nixos.org/build/315100089 at 2025-11-29 + - stratosphere-groundstation # failure in job https://hydra.nixos.org/build/315100090 at 2025-11-29 + - stratosphere-guardduty # failure in job https://hydra.nixos.org/build/315100093 at 2025-11-29 + - stratosphere-healthimaging # failure in job https://hydra.nixos.org/build/315100092 at 2025-11-29 + - stratosphere-healthlake # failure in job https://hydra.nixos.org/build/315100103 at 2025-11-29 + - stratosphere-iam # failure in job https://hydra.nixos.org/build/315100119 at 2025-11-29 + - stratosphere-identitystore # failure in job https://hydra.nixos.org/build/315100094 at 2025-11-29 + - stratosphere-imagebuilder # failure in job https://hydra.nixos.org/build/315100102 at 2025-11-29 + - stratosphere-inspector # failure in job https://hydra.nixos.org/build/315100096 at 2025-11-29 + - stratosphere-inspectorv2 # failure in job https://hydra.nixos.org/build/315100136 at 2025-11-29 + - stratosphere-internetmonitor # failure in job https://hydra.nixos.org/build/315100099 at 2025-11-29 + - stratosphere-invoicing # failure in job https://hydra.nixos.org/build/315100100 at 2025-11-29 + - stratosphere-iot # failure in job https://hydra.nixos.org/build/315100101 at 2025-11-29 + - stratosphere-iotanalytics # failure in job https://hydra.nixos.org/build/315100118 at 2025-11-29 + - stratosphere-iotcoredeviceadvisor # failure in job https://hydra.nixos.org/build/315100139 at 2025-11-29 + - stratosphere-iotevents # failure in job https://hydra.nixos.org/build/315100171 at 2025-11-29 + - stratosphere-iotfleethub # failure in job https://hydra.nixos.org/build/315100110 at 2025-11-29 + - stratosphere-iotfleetwise # failure in job https://hydra.nixos.org/build/315100146 at 2025-11-29 + - stratosphere-iotsitewise # failure in job https://hydra.nixos.org/build/315100107 at 2025-11-29 + - stratosphere-iotthingsgraph # failure in job https://hydra.nixos.org/build/315100108 at 2025-11-29 + - stratosphere-iottwinmaker # failure in job https://hydra.nixos.org/build/315100218 at 2025-11-29 + - stratosphere-iotwireless # failure in job https://hydra.nixos.org/build/315100121 at 2025-11-29 + - stratosphere-ivs # failure in job https://hydra.nixos.org/build/315100111 at 2025-11-29 + - stratosphere-ivschat # failure in job https://hydra.nixos.org/build/315100112 at 2025-11-29 + - stratosphere-kafkaconnect # failure in job https://hydra.nixos.org/build/315100113 at 2025-11-29 + - stratosphere-kendra # failure in job https://hydra.nixos.org/build/315100122 at 2025-11-29 + - stratosphere-kendraranking # failure in job https://hydra.nixos.org/build/315100123 at 2025-11-29 + - stratosphere-kinesis # failure in job https://hydra.nixos.org/build/315100115 at 2025-11-29 + - stratosphere-kinesisanalytics # failure in job https://hydra.nixos.org/build/315100141 at 2025-11-29 + - stratosphere-kinesisanalyticsv2 # failure in job https://hydra.nixos.org/build/315100134 at 2025-11-29 + - stratosphere-kinesisfirehose # failure in job https://hydra.nixos.org/build/315100156 at 2025-11-29 + - stratosphere-kinesisvideo # failure in job https://hydra.nixos.org/build/315100120 at 2025-11-29 + - stratosphere-kms # failure in job https://hydra.nixos.org/build/315100126 at 2025-11-29 + - stratosphere-lakeformation # failure in job https://hydra.nixos.org/build/315100128 at 2025-11-29 + - stratosphere-lambda # failure in job https://hydra.nixos.org/build/315100127 at 2025-11-29 + - stratosphere-launchwizard # failure in job https://hydra.nixos.org/build/315100145 at 2025-11-29 + - stratosphere-lex # failure in job https://hydra.nixos.org/build/315100172 at 2025-11-29 + - stratosphere-licensemanager # failure in job https://hydra.nixos.org/build/315100152 at 2025-11-29 + - stratosphere-lightsail # failure in job https://hydra.nixos.org/build/315100138 at 2025-11-29 + - stratosphere-location # failure in job https://hydra.nixos.org/build/315100153 at 2025-11-29 + - stratosphere-logs # failure in job https://hydra.nixos.org/build/315100129 at 2025-11-29 + - stratosphere-lookoutequipment # failure in job https://hydra.nixos.org/build/315100130 at 2025-11-29 + - stratosphere-lookoutmetrics # failure in job https://hydra.nixos.org/build/315100131 at 2025-11-29 + - stratosphere-lookoutvision # failure in job https://hydra.nixos.org/build/315100132 at 2025-11-29 + - stratosphere-m2 # failure in job https://hydra.nixos.org/build/315100133 at 2025-11-29 + - stratosphere-macie # failure in job https://hydra.nixos.org/build/315100151 at 2025-11-29 + - stratosphere-managedblockchain # failure in job https://hydra.nixos.org/build/315100140 at 2025-11-29 + - stratosphere-mediaconnect # failure in job https://hydra.nixos.org/build/315100135 at 2025-11-29 + - stratosphere-mediaconvert # failure in job https://hydra.nixos.org/build/315100148 at 2025-11-29 + - stratosphere-medialive # failure in job https://hydra.nixos.org/build/315100157 at 2025-11-29 + - stratosphere-mediapackage # failure in job https://hydra.nixos.org/build/315100166 at 2025-11-29 + - stratosphere-mediapackagev2 # failure in job https://hydra.nixos.org/build/315100150 at 2025-11-29 + - stratosphere-mediastore # failure in job https://hydra.nixos.org/build/315100173 at 2025-11-29 + - stratosphere-mediatailor # failure in job https://hydra.nixos.org/build/315100142 at 2025-11-29 + - stratosphere-memorydb # failure in job https://hydra.nixos.org/build/315100143 at 2025-11-29 + - stratosphere-mpa # failure in job https://hydra.nixos.org/build/315100144 at 2025-11-29 + - stratosphere-msk # failure in job https://hydra.nixos.org/build/315100154 at 2025-11-29 + - stratosphere-mwaa # failure in job https://hydra.nixos.org/build/315100162 at 2025-11-29 + - stratosphere-neptune # failure in job https://hydra.nixos.org/build/315100170 at 2025-11-29 + - stratosphere-neptunegraph # failure in job https://hydra.nixos.org/build/315100147 at 2025-11-29 + - stratosphere-networkfirewall # failure in job https://hydra.nixos.org/build/315100190 at 2025-11-29 + - stratosphere-networkmanager # failure in job https://hydra.nixos.org/build/315100149 at 2025-11-29 + - stratosphere-notifications # failure in job https://hydra.nixos.org/build/315100184 at 2025-11-29 + - stratosphere-notificationscontacts # failure in job https://hydra.nixos.org/build/315100158 at 2025-11-29 + - stratosphere-oam # failure in job https://hydra.nixos.org/build/315100161 at 2025-11-29 + - stratosphere-observabilityadmin # failure in job https://hydra.nixos.org/build/315100160 at 2025-11-29 + - stratosphere-odb # failure in job https://hydra.nixos.org/build/315100165 at 2025-11-29 + - stratosphere-omics # failure in job https://hydra.nixos.org/build/315100155 at 2025-11-29 + - stratosphere-opensearchserverless # failure in job https://hydra.nixos.org/build/315100181 at 2025-11-29 + - stratosphere-opensearchservice # failure in job https://hydra.nixos.org/build/315100159 at 2025-11-29 + - stratosphere-opsworks # failure in job https://hydra.nixos.org/build/315100194 at 2025-11-29 + - stratosphere-organizations # failure in job https://hydra.nixos.org/build/315100163 at 2025-11-29 + - stratosphere-osis # failure in job https://hydra.nixos.org/build/315100164 at 2025-11-29 + - stratosphere-panorama # failure in job https://hydra.nixos.org/build/315100177 at 2025-11-29 + - stratosphere-paymentcryptography # failure in job https://hydra.nixos.org/build/315100167 at 2025-11-29 + - stratosphere-pcaconnectorad # failure in job https://hydra.nixos.org/build/315100205 at 2025-11-29 + - stratosphere-pcaconnectorscep # failure in job https://hydra.nixos.org/build/315100209 at 2025-11-29 + - stratosphere-pcs # failure in job https://hydra.nixos.org/build/315100175 at 2025-11-29 + - stratosphere-personalize # failure in job https://hydra.nixos.org/build/315100220 at 2025-11-29 + - stratosphere-pinpoint # failure in job https://hydra.nixos.org/build/315100168 at 2025-11-29 + - stratosphere-pinpointemail # failure in job https://hydra.nixos.org/build/315100169 at 2025-11-29 + - stratosphere-pipes # failure in job https://hydra.nixos.org/build/315100176 at 2025-11-29 + - stratosphere-proton # failure in job https://hydra.nixos.org/build/315100183 at 2025-11-29 + - stratosphere-qbusiness # failure in job https://hydra.nixos.org/build/315100179 at 2025-11-29 + - stratosphere-qldb # failure in job https://hydra.nixos.org/build/315100180 at 2025-11-29 + - stratosphere-quicksight # failure in job https://hydra.nixos.org/build/315100174 at 2025-11-29 + - stratosphere-ram # failure in job https://hydra.nixos.org/build/315100206 at 2025-11-29 + - stratosphere-rbin # failure in job https://hydra.nixos.org/build/315100219 at 2025-11-29 + - stratosphere-rds # failure in job https://hydra.nixos.org/build/315100245 at 2025-11-29 + - stratosphere-redshift # failure in job https://hydra.nixos.org/build/315100198 at 2025-11-29 + - stratosphere-redshiftserverless # failure in job https://hydra.nixos.org/build/315100178 at 2025-11-29 + - stratosphere-refactorspaces # failure in job https://hydra.nixos.org/build/315100191 at 2025-11-29 + - stratosphere-rekognition # failure in job https://hydra.nixos.org/build/315100197 at 2025-11-29 + - stratosphere-resiliencehub # failure in job https://hydra.nixos.org/build/315100182 at 2025-11-29 + - stratosphere-resourceexplorer2 # failure in job https://hydra.nixos.org/build/315100186 at 2025-11-29 + - stratosphere-resourcegroups # failure in job https://hydra.nixos.org/build/315100193 at 2025-11-29 + - stratosphere-robomaker # failure in job https://hydra.nixos.org/build/315100199 at 2025-11-29 + - stratosphere-rolesanywhere # failure in job https://hydra.nixos.org/build/315100185 at 2025-11-29 + - stratosphere-route53 # failure in job https://hydra.nixos.org/build/315100200 at 2025-11-29 + - stratosphere-route53profiles # failure in job https://hydra.nixos.org/build/315100187 at 2025-11-29 + - stratosphere-route53recoverycontrol # failure in job https://hydra.nixos.org/build/315100188 at 2025-11-29 + - stratosphere-route53recoveryreadiness # failure in job https://hydra.nixos.org/build/315100189 at 2025-11-29 + - stratosphere-route53resolver # failure in job https://hydra.nixos.org/build/315100215 at 2025-11-29 + - stratosphere-rtbfabric # failure in job https://hydra.nixos.org/build/315100192 at 2025-11-29 + - stratosphere-rum # failure in job https://hydra.nixos.org/build/315100241 at 2025-11-29 + - stratosphere-s3 # failure in job https://hydra.nixos.org/build/315100204 at 2025-11-29 + - stratosphere-s3express # failure in job https://hydra.nixos.org/build/315100195 at 2025-11-29 + - stratosphere-s3objectlambda # failure in job https://hydra.nixos.org/build/315100228 at 2025-11-29 + - stratosphere-s3outposts # failure in job https://hydra.nixos.org/build/315100196 at 2025-11-29 + - stratosphere-s3tables # failure in job https://hydra.nixos.org/build/315100214 at 2025-11-29 + - stratosphere-sagemaker # failure in job https://hydra.nixos.org/build/315100232 at 2025-11-29 + - stratosphere-scheduler # failure in job https://hydra.nixos.org/build/315100211 at 2025-11-29 + - stratosphere-sdb # failure in job https://hydra.nixos.org/build/315100201 at 2025-11-29 + - stratosphere-secretsmanager # failure in job https://hydra.nixos.org/build/315100202 at 2025-11-29 + - stratosphere-securityhub # failure in job https://hydra.nixos.org/build/315100212 at 2025-11-29 + - stratosphere-securitylake # failure in job https://hydra.nixos.org/build/315100203 at 2025-11-29 + - stratosphere-servicecatalog # failure in job https://hydra.nixos.org/build/315100261 at 2025-11-29 + - stratosphere-servicecatalogappregistry # failure in job https://hydra.nixos.org/build/315100225 at 2025-11-29 + - stratosphere-servicediscovery # failure in job https://hydra.nixos.org/build/315100207 at 2025-11-29 + - stratosphere-ses # failure in job https://hydra.nixos.org/build/315100221 at 2025-11-29 + - stratosphere-shield # failure in job https://hydra.nixos.org/build/315100208 at 2025-11-29 + - stratosphere-signer # failure in job https://hydra.nixos.org/build/315100271 at 2025-11-29 + - stratosphere-simspaceweaver # failure in job https://hydra.nixos.org/build/315100210 at 2025-11-29 + - stratosphere-smsvoice # failure in job https://hydra.nixos.org/build/315100255 at 2025-11-29 + - stratosphere-sns # failure in job https://hydra.nixos.org/build/315100213 at 2025-11-29 + - stratosphere-sqs # failure in job https://hydra.nixos.org/build/315100226 at 2025-11-29 + - stratosphere-ssm # failure in job https://hydra.nixos.org/build/315100227 at 2025-11-29 + - stratosphere-ssmcontacts # failure in job https://hydra.nixos.org/build/315100216 at 2025-11-29 + - stratosphere-ssmguiconnect # failure in job https://hydra.nixos.org/build/315100217 at 2025-11-29 + - stratosphere-ssmincidents # failure in job https://hydra.nixos.org/build/315100223 at 2025-11-29 + - stratosphere-ssmquicksetup # failure in job https://hydra.nixos.org/build/315100247 at 2025-11-29 + - stratosphere-sso # failure in job https://hydra.nixos.org/build/315100274 at 2025-11-29 + - stratosphere-stepfunctions # failure in job https://hydra.nixos.org/build/315100260 at 2025-11-29 + - stratosphere-supportapp # failure in job https://hydra.nixos.org/build/315100222 at 2025-11-29 + - stratosphere-synthetics # failure in job https://hydra.nixos.org/build/315100252 at 2025-11-29 + - stratosphere-systemsmanagersap # failure in job https://hydra.nixos.org/build/315100224 at 2025-11-29 + - stratosphere-timestream # failure in job https://hydra.nixos.org/build/315100230 at 2025-11-29 + - stratosphere-transfer # failure in job https://hydra.nixos.org/build/315100249 at 2025-11-29 + - stratosphere-verifiedpermissions # failure in job https://hydra.nixos.org/build/315100250 at 2025-11-29 + - stratosphere-voiceid # failure in job https://hydra.nixos.org/build/315100257 at 2025-11-29 + - stratosphere-vpclattice # failure in job https://hydra.nixos.org/build/315100229 at 2025-11-29 + - stratosphere-waf # failure in job https://hydra.nixos.org/build/315100242 at 2025-11-29 + - stratosphere-wafregional # failure in job https://hydra.nixos.org/build/315100233 at 2025-11-29 + - stratosphere-wafv2 # failure in job https://hydra.nixos.org/build/315100231 at 2025-11-29 + - stratosphere-wisdom # failure in job https://hydra.nixos.org/build/315100268 at 2025-11-29 + - stratosphere-workspaces # failure in job https://hydra.nixos.org/build/315100234 at 2025-11-29 + - stratosphere-workspacesinstances # failure in job https://hydra.nixos.org/build/315100235 at 2025-11-29 + - stratosphere-workspacesthinclient # failure in job https://hydra.nixos.org/build/315100236 at 2025-11-29 + - stratosphere-workspacesweb # failure in job https://hydra.nixos.org/build/315100237 at 2025-11-29 + - stratosphere-xray # failure in job https://hydra.nixos.org/build/315100239 at 2025-11-29 - stratux-types # failure in job https://hydra.nixos.org/build/233232808 at 2023-09-02 - stream # failure in job https://hydra.nixos.org/build/233226470 at 2023-09-02 - stream-fusion # failure in job https://hydra.nixos.org/build/233225947 at 2023-09-02 @@ -6360,6 +6648,7 @@ broken-packages: - thock # failure in job https://hydra.nixos.org/build/233256198 at 2023-09-02 - thorn # failure in job https://hydra.nixos.org/build/233242024 at 2023-09-02 - threadmanager # failure in job https://hydra.nixos.org/build/233230492 at 2023-09-02 + - threads-supervisor # failure in job https://hydra.nixos.org/build/315100613 at 2025-11-29 - threepenny-editors # failure in job https://hydra.nixos.org/build/233248820 at 2023-09-02 - threepenny-gui-contextmenu # failure in job https://hydra.nixos.org/build/233242035 at 2023-09-02 - threepenny-gui-flexbox # failure in job https://hydra.nixos.org/build/233213545 at 2023-09-02 @@ -6646,6 +6935,7 @@ broken-packages: - uniqueness-periods-vector # failure in job https://hydra.nixos.org/build/233243213 at 2023-09-02 - uniqueness-periods-vector-common # failure in job https://hydra.nixos.org/build/233210018 at 2023-09-02 - units-attoparsec # failure in job https://hydra.nixos.org/build/233196308 at 2023-09-02 + - units-list # failure in job https://hydra.nixos.org/build/315100927 at 2025-11-29 - unittyped # failure in job https://hydra.nixos.org/build/233215159 at 2023-09-02 - unitym # failure in job https://hydra.nixos.org/build/233246346 at 2023-09-02 - universal-binary # failure in job https://hydra.nixos.org/build/233240583 at 2023-09-02 @@ -6847,6 +7137,7 @@ broken-packages: - wai-session-redis # failure in job https://hydra.nixos.org/build/233218737 at 2023-09-02 - wai-static-cache # failure in job https://hydra.nixos.org/build/233228597 at 2023-09-02 - wai-throttler # failure in job https://hydra.nixos.org/build/233231002 at 2023-09-02 + - wai-token-bucket-ratelimiter # failure in job https://hydra.nixos.org/build/315101114 at 2025-11-29 - waitfree # failure in job https://hydra.nixos.org/build/233222583 at 2023-09-02 - waitra # failure in job https://hydra.nixos.org/build/233222291 at 2023-09-02 - wakame # failure in job https://hydra.nixos.org/build/233254673 at 2023-09-02 @@ -6861,6 +7152,7 @@ broken-packages: - watchit # failure in job https://hydra.nixos.org/build/233199573 at 2023-09-02 - wavefront # failure in job https://hydra.nixos.org/build/233248071 at 2023-09-02 - wavefront-obj # failure in job https://hydra.nixos.org/build/233200951 at 2023-09-02 + - waypoint # failure in job https://hydra.nixos.org/build/315101124 at 2025-11-29 - weak-bag # failure in job https://hydra.nixos.org/build/233198097 at 2023-09-02 - WeakSets # failure in job https://hydra.nixos.org/build/307516240 at 2025-09-19 - Weather # failure in job https://hydra.nixos.org/build/233197934 at 2023-09-02 @@ -7030,6 +7322,7 @@ broken-packages: - xmonad-vanessa # failure in job https://hydra.nixos.org/build/233214303 at 2023-09-02 - xmonad-wallpaper # failure in job https://hydra.nixos.org/build/233217165 at 2023-09-02 - xmonad-windownames # failure in job https://hydra.nixos.org/build/233258043 at 2023-09-02 + - xnobar # failure in job https://hydra.nixos.org/build/315101319 at 2025-11-29 - xorshift-plus # failure in job https://hydra.nixos.org/build/233255176 at 2023-09-02 - Xorshift128Plus # failure in job https://hydra.nixos.org/build/233225679 at 2023-09-02 - xsact # failure in job https://hydra.nixos.org/build/233221821 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index c717a0c1e27e..9968c5c39699 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -4,7 +4,6 @@ # depend on a dependency marked as broken. dont-distribute-packages: - - 4Blocks - a50 - abcBridge - AbortT-monadstf @@ -57,6 +56,7 @@ dont-distribute-packages: - algebra-checkers - algebra-driven-design - algebra-sql + - algebraic-graph-duoids - algolia - AlgoRhythm - algorithmic-composition-additional @@ -128,6 +128,7 @@ dont-distribute-packages: - array-forth - arraylist - arx + - arxiv-client-cli - ascii - ascii-cows - ascii-numbers @@ -185,6 +186,7 @@ dont-distribute-packages: - aws-sign4 - aws-sns - axiom + - axiomatic-classes - azimuth-hs - aztecs-sdl-image - aztecs-sdl-text @@ -549,6 +551,7 @@ dont-distribute-packages: - concrete-haskell - concrete-haskell-autogen - concurrency-benchmarks + - ConcurrentUtils - Condor - condor - conductive-hsc3 @@ -581,6 +584,7 @@ dont-distribute-packages: - containers-accelerate - content-store - control + - control-invariants - control-monad-attempt - control-monad-exception - control-monad-exception-monadsfd @@ -676,6 +680,8 @@ dont-distribute-packages: - datadog-tracing - datafix - dataflow + - dataframe-hasktorch + - dataframe-persistent - datasets - date-conversions - dbjava @@ -808,6 +814,8 @@ dont-distribute-packages: - DSTM - dtd - duckdb-simple + - duoidal-transformers + - duoids-hedgehog - Dust - Dust-crypto - Dust-tools @@ -908,6 +916,7 @@ dont-distribute-packages: - exference - exist - exist-instances + - existential - expand - expat-enumerator - expiring-containers @@ -1110,6 +1119,7 @@ dont-distribute-packages: - GenussFold - geodetic - geolite-csv + - geomancy-layout - getemx - ghc-debugger - ghc-dump-util @@ -1785,6 +1795,7 @@ dont-distribute-packages: - ifscs - ige-mac-integration - igrf + - ihaskell-dataframe - ihaskell-rlangqq - ihaskell-symtegration - ihttp @@ -3434,6 +3445,8 @@ dont-distribute-packages: - target - task - task-distribution + - tasklite + - tasklite-core - tasty-bdd - tasty-groundhog-converters - tasty-integrate @@ -3905,3 +3918,4 @@ dont-distribute-packages: - zoovisitor - zuramaru - zwirn + - _4Blocks diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ed77cc57c374..ae896ccaa6a9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -129,7 +129,6 @@ self: { ]; description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "4Blocks"; } ) { }; @@ -7833,6 +7832,7 @@ self: { ]; description = "Concurrent utilities"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -57771,7 +57771,9 @@ self: { ]; description = "Automatically generate a GraphQL API for an SQLite database"; license = lib.licensesSpdx."AGPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; mainProgram = "airgql"; + broken = true; } ) { }; @@ -59190,6 +59192,7 @@ self: { ]; description = "Duoid instances for the algebraic-graphs package"; license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -75286,7 +75289,9 @@ self: { ]; description = "Toolsuite for automated design of business processes"; license = "GPL"; + hydraPlatforms = lib.platforms.none; mainProgram = "ampersand"; + broken = true; } ) { }; @@ -84479,6 +84484,8 @@ self: { ]; description = "Tiny client for the arXiv Atom API with a simple query DSL"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -84518,6 +84525,7 @@ self: { ]; description = "Command line tool to search and download papers from arXiv.org"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; mainProgram = "arxiv-client-cli"; } ) { }; @@ -90354,6 +90362,8 @@ self: { ]; description = "Automatically add things to module export list"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -90397,6 +90407,8 @@ self: { ]; description = "Extract code segment to top level function"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -90444,6 +90456,8 @@ self: { ]; description = "Automatically add import statements"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -93090,6 +93104,8 @@ self: { ]; description = "AWS EventBridge cron, rate, and one-time parser with scheduler"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -94973,6 +94989,7 @@ self: { ]; description = "Specify axioms for type classes and quickCheck all available instances"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -112708,6 +112725,8 @@ self: { ]; description = "The Bluefin effect system, user contributions"; license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -135956,7 +135975,9 @@ self: { ]; description = "Command line tool"; license = lib.licensesSpdx."GPL-2.0-or-later"; + hydraPlatforms = lib.platforms.none; mainProgram = "cgrep"; + broken = true; } ) { }; @@ -162028,6 +162049,7 @@ self: { ]; description = "Invariants and contract monitoring"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -164051,6 +164073,8 @@ self: { ]; description = "Visualizer for Copilot"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -169332,7 +169356,9 @@ self: { ]; description = "Dead simple broken links checker on local HTML folders"; license = lib.licensesSpdx."ISC"; + hydraPlatforms = lib.platforms.none; mainProgram = "croque-mort"; + broken = true; } ) { }; @@ -169571,6 +169597,8 @@ self: { ]; description = "Support for translating and executing LLVM code in Crucible"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -182367,6 +182395,8 @@ self: { ]; description = "A fast, safe, and intuitive DataFrame library"; license = lib.licensesSpdx."GPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -182391,6 +182421,7 @@ self: { testHaskellDepends = [ base ]; description = "Converts between dataframes and hasktorch tensors"; license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -182445,6 +182476,7 @@ self: { ]; description = "Persistent database integration for the dataframe library"; license = lib.licensesSpdx."GPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -202531,6 +202563,8 @@ self: { ]; description = "Simple monadic DOM parser"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -204174,6 +204208,8 @@ self: { ]; description = "Windows DPAPI bindings"; license = lib.licensesSpdx."MPL-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -206603,6 +206639,7 @@ self: { ]; description = "Extending the tranformers package with duoids"; license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -206636,6 +206673,8 @@ self: { ]; description = "Unifying parallel and sequential operations"; license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial) AND BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -206674,6 +206713,7 @@ self: { ]; description = "Unifying parallel and sequential operations"; license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -225282,6 +225322,7 @@ self: { ]; description = "Existential types with lens-like accessors"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -258170,6 +258211,8 @@ self: { description = "Vectors and matrix manipulation"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -258204,6 +258247,7 @@ self: { description = "Geometry and matrix manipulation"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -303918,6 +303962,8 @@ self: { ]; description = "Custom debug visualization instances for @haskell-debugger@"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -319977,6 +320023,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Supplemental library for hedgehog"; license = lib.licensesSpdx."Apache-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -354897,6 +354945,8 @@ self: { ]; description = "Library for Marc21 bibliographic records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -358326,6 +358376,8 @@ self: { ]; description = "SSH protocol implementation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -375297,6 +375349,7 @@ self: { text ]; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; mainProgram = "ihaskell-dataframe-exe"; } ) { }; @@ -453434,6 +453487,8 @@ self: { ]; description = "Module-Lattice-based Key-Encapsulation Mechanism"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -456833,6 +456888,8 @@ self: { ]; description = "A flexible logging system utilizing the `monad-effect` effect system"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -481678,6 +481735,8 @@ self: { ]; description = "Nix binary cache server using nix-serve-ng"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -552851,7 +552910,9 @@ self: { doHaddock = false; description = "Command line tool qhs, SQL queries on CSV and TSV files"; license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; mainProgram = "qhs"; + broken = true; } ) { }; @@ -633638,6 +633699,8 @@ self: { ]; description = "A primitive yet easy to use sqlite library"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642294,6 +642357,8 @@ self: { ]; description = "Stratosphere integration for AWS AccessAnalyzer"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642315,6 +642380,8 @@ self: { ]; description = "Stratosphere integration for AWS ACMPCA"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642336,6 +642403,8 @@ self: { ]; description = "Stratosphere integration for AWS AIOps"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642357,6 +642426,8 @@ self: { ]; description = "Stratosphere integration for AWS AmazonMQ"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642378,6 +642449,8 @@ self: { ]; description = "Stratosphere integration for AWS Amplify"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642399,6 +642472,8 @@ self: { ]; description = "Stratosphere integration for AWS AmplifyUIBuilder"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642420,6 +642495,8 @@ self: { ]; description = "Stratosphere integration for AWS ApiGateway"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642441,6 +642518,8 @@ self: { ]; description = "Stratosphere integration for AWS ApiGatewayV2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642462,6 +642541,8 @@ self: { ]; description = "Stratosphere integration for AWS AppConfig"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642483,6 +642564,8 @@ self: { ]; description = "Stratosphere integration for AWS AppFlow"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642504,6 +642587,8 @@ self: { ]; description = "Stratosphere integration for AWS AppIntegrations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642525,6 +642610,8 @@ self: { ]; description = "Stratosphere integration for AWS ApplicationAutoScaling"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642546,6 +642633,8 @@ self: { ]; description = "Stratosphere integration for AWS ApplicationInsights"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642567,6 +642656,8 @@ self: { ]; description = "Stratosphere integration for AWS ApplicationSignals"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642588,6 +642679,8 @@ self: { ]; description = "Stratosphere integration for AWS AppMesh"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642609,6 +642702,8 @@ self: { ]; description = "Stratosphere integration for AWS AppRunner"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642630,6 +642725,8 @@ self: { ]; description = "Stratosphere integration for AWS AppStream"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642651,6 +642748,8 @@ self: { ]; description = "Stratosphere integration for AWS AppSync"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642672,6 +642771,8 @@ self: { ]; description = "Stratosphere integration for AWS AppTest"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642693,6 +642794,8 @@ self: { ]; description = "Stratosphere integration for AWS APS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642714,6 +642817,8 @@ self: { ]; description = "Stratosphere integration for AWS ARCRegionSwitch"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642735,6 +642840,8 @@ self: { ]; description = "Stratosphere integration for AWS ARCZonalShift"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642756,6 +642863,8 @@ self: { ]; description = "Stratosphere integration for AWS ASK"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642777,6 +642886,8 @@ self: { ]; description = "Stratosphere integration for AWS Athena"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642798,6 +642909,8 @@ self: { ]; description = "Stratosphere integration for AWS AuditManager"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642819,6 +642932,8 @@ self: { ]; description = "Stratosphere integration for AWS AutoScaling"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642840,6 +642955,8 @@ self: { ]; description = "Stratosphere integration for AWS AutoScalingPlans"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642861,6 +642978,8 @@ self: { ]; description = "Stratosphere integration for AWS B2BI"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642882,6 +643001,8 @@ self: { ]; description = "Stratosphere integration for AWS Backup"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642903,6 +643024,8 @@ self: { ]; description = "Stratosphere integration for AWS BackupGateway"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642924,6 +643047,8 @@ self: { ]; description = "Stratosphere integration for AWS Batch"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642945,6 +643070,8 @@ self: { ]; description = "Stratosphere integration for AWS BCMDataExports"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642966,6 +643093,8 @@ self: { ]; description = "Stratosphere integration for AWS Bedrock"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -642987,6 +643116,8 @@ self: { ]; description = "Stratosphere integration for AWS BedrockAgentCore"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643008,6 +643139,8 @@ self: { ]; description = "Stratosphere integration for AWS Billing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643029,6 +643162,8 @@ self: { ]; description = "Stratosphere integration for AWS BillingConductor"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643050,6 +643185,8 @@ self: { ]; description = "Stratosphere integration for AWS Budgets"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643071,6 +643208,8 @@ self: { ]; description = "Stratosphere integration for AWS Cassandra"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643092,6 +643231,8 @@ self: { ]; description = "Stratosphere integration for AWS CE"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643113,6 +643254,8 @@ self: { ]; description = "Stratosphere integration for AWS CertificateManager"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643134,6 +643277,8 @@ self: { ]; description = "Stratosphere integration for AWS Chatbot"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643155,6 +643300,8 @@ self: { ]; description = "Stratosphere integration for AWS CleanRooms"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643176,6 +643323,8 @@ self: { ]; description = "Stratosphere integration for AWS CleanRoomsML"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643197,6 +643346,8 @@ self: { ]; description = "Stratosphere integration for AWS Cloud9"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643218,6 +643369,8 @@ self: { ]; description = "Stratosphere integration for AWS CloudFormation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643239,6 +643392,8 @@ self: { ]; description = "Stratosphere integration for AWS CloudFront"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643260,6 +643415,8 @@ self: { ]; description = "Stratosphere integration for AWS CloudTrail"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643281,6 +643438,8 @@ self: { ]; description = "Stratosphere integration for AWS CloudWatch"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643302,6 +643461,8 @@ self: { ]; description = "Stratosphere integration for AWS CodeArtifact"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643323,6 +643484,8 @@ self: { ]; description = "Stratosphere integration for AWS CodeBuild"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643344,6 +643507,8 @@ self: { ]; description = "Stratosphere integration for AWS CodeCommit"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643365,6 +643530,8 @@ self: { ]; description = "Stratosphere integration for AWS CodeConnections"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643386,6 +643553,8 @@ self: { ]; description = "Stratosphere integration for AWS CodeDeploy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643407,6 +643576,8 @@ self: { ]; description = "Stratosphere integration for AWS CodeGuruProfiler"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643428,6 +643599,8 @@ self: { ]; description = "Stratosphere integration for AWS CodeGuruReviewer"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643449,6 +643622,8 @@ self: { ]; description = "Stratosphere integration for AWS CodePipeline"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643470,6 +643645,8 @@ self: { ]; description = "Stratosphere integration for AWS CodeStar"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643491,6 +643668,8 @@ self: { ]; description = "Stratosphere integration for AWS CodeStarConnections"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643512,6 +643691,8 @@ self: { ]; description = "Stratosphere integration for AWS CodeStarNotifications"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643533,6 +643714,8 @@ self: { ]; description = "Stratosphere integration for AWS Cognito"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643554,6 +643737,8 @@ self: { ]; description = "Stratosphere integration for AWS Comprehend"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643575,6 +643760,8 @@ self: { ]; description = "Stratosphere integration for AWS Config"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643596,6 +643783,8 @@ self: { ]; description = "Stratosphere integration for AWS Connect"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643617,6 +643806,8 @@ self: { ]; description = "Stratosphere integration for AWS ConnectCampaigns"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643638,6 +643829,8 @@ self: { ]; description = "Stratosphere integration for AWS ConnectCampaignsV2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643659,6 +643852,8 @@ self: { ]; description = "Stratosphere integration for AWS ControlTower"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643680,6 +643875,8 @@ self: { ]; description = "Stratosphere integration for AWS CUR"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643701,6 +643898,8 @@ self: { ]; description = "Stratosphere integration for AWS CustomerProfiles"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643722,6 +643921,8 @@ self: { ]; description = "Stratosphere integration for AWS DataBrew"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643743,6 +643944,8 @@ self: { ]; description = "Stratosphere integration for AWS DataPipeline"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643764,6 +643967,8 @@ self: { ]; description = "Stratosphere integration for AWS DataSync"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643785,6 +643990,8 @@ self: { ]; description = "Stratosphere integration for AWS DataZone"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643806,6 +644013,8 @@ self: { ]; description = "Stratosphere integration for AWS DAX"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643827,6 +644036,8 @@ self: { ]; description = "Stratosphere integration for AWS Deadline"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643848,6 +644059,8 @@ self: { ]; description = "Stratosphere integration for AWS Detective"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643869,6 +644082,8 @@ self: { ]; description = "Stratosphere integration for AWS DevOpsGuru"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643890,6 +644105,8 @@ self: { ]; description = "Stratosphere integration for AWS DirectoryService"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643911,6 +644128,8 @@ self: { ]; description = "Stratosphere integration for AWS DLM"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643932,6 +644151,8 @@ self: { ]; description = "Stratosphere integration for AWS DMS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643953,6 +644174,8 @@ self: { ]; description = "Stratosphere integration for AWS DocDB"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643974,6 +644197,8 @@ self: { ]; description = "Stratosphere integration for AWS DocDBElastic"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -643995,6 +644220,8 @@ self: { ]; description = "Stratosphere integration for AWS DSQL"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644016,6 +644243,8 @@ self: { ]; description = "Stratosphere integration for AWS DynamoDB"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644037,6 +644266,8 @@ self: { ]; description = "Stratosphere integration for AWS EC2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644058,6 +644289,8 @@ self: { ]; description = "Stratosphere integration for AWS ECR"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644079,6 +644312,8 @@ self: { ]; description = "Stratosphere integration for AWS ECS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644100,6 +644335,8 @@ self: { ]; description = "Stratosphere integration for AWS EFS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644121,6 +644358,8 @@ self: { ]; description = "Stratosphere integration for AWS EKS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644142,6 +644381,8 @@ self: { ]; description = "Stratosphere integration for AWS ElastiCache"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644163,6 +644404,8 @@ self: { ]; description = "Stratosphere integration for AWS ElasticBeanstalk"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644184,6 +644427,8 @@ self: { ]; description = "Stratosphere integration for AWS ElasticLoadBalancing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644205,6 +644450,8 @@ self: { ]; description = "Stratosphere integration for AWS ElasticLoadBalancingV2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644226,6 +644473,8 @@ self: { ]; description = "Stratosphere integration for AWS Elasticsearch"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644247,6 +644496,8 @@ self: { ]; description = "Stratosphere integration for AWS EMR"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644268,6 +644519,8 @@ self: { ]; description = "Stratosphere integration for AWS EMRContainers"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644289,6 +644542,8 @@ self: { ]; description = "Stratosphere integration for AWS EMRServerless"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644310,6 +644565,8 @@ self: { ]; description = "Stratosphere integration for AWS EntityResolution"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644331,6 +644588,8 @@ self: { ]; description = "Stratosphere integration for AWS Events"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644352,6 +644611,8 @@ self: { ]; description = "Stratosphere integration for AWS EventSchemas"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644373,6 +644634,8 @@ self: { ]; description = "Stratosphere integration for AWS Evidently"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644394,6 +644657,8 @@ self: { ]; description = "Stratosphere integration for AWS EVS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644415,6 +644680,8 @@ self: { ]; description = "Stratosphere integration for AWS FinSpace"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644436,6 +644703,8 @@ self: { ]; description = "Stratosphere integration for AWS FIS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644457,6 +644726,8 @@ self: { ]; description = "Stratosphere integration for AWS FMS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644478,6 +644749,8 @@ self: { ]; description = "Stratosphere integration for AWS Forecast"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644499,6 +644772,8 @@ self: { ]; description = "Stratosphere integration for AWS FraudDetector"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644520,6 +644795,8 @@ self: { ]; description = "Stratosphere integration for AWS FSx"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644541,6 +644818,8 @@ self: { ]; description = "Stratosphere integration for AWS GameLift"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644562,6 +644841,8 @@ self: { ]; description = "Stratosphere integration for AWS GlobalAccelerator"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644583,6 +644864,8 @@ self: { ]; description = "Stratosphere integration for AWS Glue"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644604,6 +644887,8 @@ self: { ]; description = "Stratosphere integration for AWS Grafana"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644625,6 +644910,8 @@ self: { ]; description = "Stratosphere integration for AWS Greengrass"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644646,6 +644933,8 @@ self: { ]; description = "Stratosphere integration for AWS GreengrassV2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644667,6 +644956,8 @@ self: { ]; description = "Stratosphere integration for AWS GroundStation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644688,6 +644979,8 @@ self: { ]; description = "Stratosphere integration for AWS GuardDuty"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644709,6 +645002,8 @@ self: { ]; description = "Stratosphere integration for AWS HealthImaging"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644730,6 +645025,8 @@ self: { ]; description = "Stratosphere integration for AWS HealthLake"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644751,6 +645048,8 @@ self: { ]; description = "Stratosphere integration for AWS IAM"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644772,6 +645071,8 @@ self: { ]; description = "Stratosphere integration for AWS IdentityStore"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644793,6 +645094,8 @@ self: { ]; description = "Stratosphere integration for AWS ImageBuilder"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644814,6 +645117,8 @@ self: { ]; description = "Stratosphere integration for AWS Inspector"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644835,6 +645140,8 @@ self: { ]; description = "Stratosphere integration for AWS InspectorV2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644856,6 +645163,8 @@ self: { ]; description = "Stratosphere integration for AWS InternetMonitor"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644877,6 +645186,8 @@ self: { ]; description = "Stratosphere integration for AWS Invoicing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644898,6 +645209,8 @@ self: { ]; description = "Stratosphere integration for AWS IoT"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644919,6 +645232,8 @@ self: { ]; description = "Stratosphere integration for AWS IoTAnalytics"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644940,6 +645255,8 @@ self: { ]; description = "Stratosphere integration for AWS IoTCoreDeviceAdvisor"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644961,6 +645278,8 @@ self: { ]; description = "Stratosphere integration for AWS IoTEvents"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -644982,6 +645301,8 @@ self: { ]; description = "Stratosphere integration for AWS IoTFleetHub"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645003,6 +645324,8 @@ self: { ]; description = "Stratosphere integration for AWS IoTFleetWise"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645024,6 +645347,8 @@ self: { ]; description = "Stratosphere integration for AWS IoTSiteWise"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645045,6 +645370,8 @@ self: { ]; description = "Stratosphere integration for AWS IoTThingsGraph"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645066,6 +645393,8 @@ self: { ]; description = "Stratosphere integration for AWS IoTTwinMaker"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645087,6 +645416,8 @@ self: { ]; description = "Stratosphere integration for AWS IoTWireless"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645108,6 +645439,8 @@ self: { ]; description = "Stratosphere integration for AWS IVS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645129,6 +645462,8 @@ self: { ]; description = "Stratosphere integration for AWS IVSChat"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645150,6 +645485,8 @@ self: { ]; description = "Stratosphere integration for AWS KafkaConnect"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645171,6 +645508,8 @@ self: { ]; description = "Stratosphere integration for AWS Kendra"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645192,6 +645531,8 @@ self: { ]; description = "Stratosphere integration for AWS KendraRanking"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645213,6 +645554,8 @@ self: { ]; description = "Stratosphere integration for AWS Kinesis"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645234,6 +645577,8 @@ self: { ]; description = "Stratosphere integration for AWS KinesisAnalytics"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645255,6 +645600,8 @@ self: { ]; description = "Stratosphere integration for AWS KinesisAnalyticsV2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645276,6 +645623,8 @@ self: { ]; description = "Stratosphere integration for AWS KinesisFirehose"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645297,6 +645646,8 @@ self: { ]; description = "Stratosphere integration for AWS KinesisVideo"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645318,6 +645669,8 @@ self: { ]; description = "Stratosphere integration for AWS KMS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645339,6 +645692,8 @@ self: { ]; description = "Stratosphere integration for AWS LakeFormation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645360,6 +645715,8 @@ self: { ]; description = "Stratosphere integration for AWS Lambda"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645381,6 +645738,8 @@ self: { ]; description = "Stratosphere integration for AWS LaunchWizard"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645402,6 +645761,8 @@ self: { ]; description = "Stratosphere integration for AWS Lex"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645423,6 +645784,8 @@ self: { ]; description = "Stratosphere integration for AWS LicenseManager"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645444,6 +645807,8 @@ self: { ]; description = "Stratosphere integration for AWS Lightsail"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645465,6 +645830,8 @@ self: { ]; description = "Stratosphere integration for AWS Location"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645486,6 +645853,8 @@ self: { ]; description = "Stratosphere integration for AWS Logs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645507,6 +645876,8 @@ self: { ]; description = "Stratosphere integration for AWS LookoutEquipment"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645528,6 +645899,8 @@ self: { ]; description = "Stratosphere integration for AWS LookoutMetrics"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645549,6 +645922,8 @@ self: { ]; description = "Stratosphere integration for AWS LookoutVision"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645570,6 +645945,8 @@ self: { ]; description = "Stratosphere integration for AWS M2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645591,6 +645968,8 @@ self: { ]; description = "Stratosphere integration for AWS Macie"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645612,6 +645991,8 @@ self: { ]; description = "Stratosphere integration for AWS ManagedBlockchain"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645633,6 +646014,8 @@ self: { ]; description = "Stratosphere integration for AWS MediaConnect"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645654,6 +646037,8 @@ self: { ]; description = "Stratosphere integration for AWS MediaConvert"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645675,6 +646060,8 @@ self: { ]; description = "Stratosphere integration for AWS MediaLive"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645696,6 +646083,8 @@ self: { ]; description = "Stratosphere integration for AWS MediaPackage"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645717,6 +646106,8 @@ self: { ]; description = "Stratosphere integration for AWS MediaPackageV2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645738,6 +646129,8 @@ self: { ]; description = "Stratosphere integration for AWS MediaStore"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645759,6 +646152,8 @@ self: { ]; description = "Stratosphere integration for AWS MediaTailor"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645780,6 +646175,8 @@ self: { ]; description = "Stratosphere integration for AWS MemoryDB"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645801,6 +646198,8 @@ self: { ]; description = "Stratosphere integration for AWS MPA"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645822,6 +646221,8 @@ self: { ]; description = "Stratosphere integration for AWS MSK"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645843,6 +646244,8 @@ self: { ]; description = "Stratosphere integration for AWS MWAA"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645864,6 +646267,8 @@ self: { ]; description = "Stratosphere integration for AWS Neptune"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645885,6 +646290,8 @@ self: { ]; description = "Stratosphere integration for AWS NeptuneGraph"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645906,6 +646313,8 @@ self: { ]; description = "Stratosphere integration for AWS NetworkFirewall"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645927,6 +646336,8 @@ self: { ]; description = "Stratosphere integration for AWS NetworkManager"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645948,6 +646359,8 @@ self: { ]; description = "Stratosphere integration for AWS Notifications"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645969,6 +646382,8 @@ self: { ]; description = "Stratosphere integration for AWS NotificationsContacts"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -645990,6 +646405,8 @@ self: { ]; description = "Stratosphere integration for AWS Oam"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646011,6 +646428,8 @@ self: { ]; description = "Stratosphere integration for AWS ObservabilityAdmin"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646032,6 +646451,8 @@ self: { ]; description = "Stratosphere integration for AWS ODB"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646053,6 +646474,8 @@ self: { ]; description = "Stratosphere integration for AWS Omics"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646074,6 +646497,8 @@ self: { ]; description = "Stratosphere integration for AWS OpenSearchServerless"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646095,6 +646520,8 @@ self: { ]; description = "Stratosphere integration for AWS OpenSearchService"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646116,6 +646543,8 @@ self: { ]; description = "Stratosphere integration for AWS OpsWorks"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646137,6 +646566,8 @@ self: { ]; description = "Stratosphere integration for AWS Organizations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646158,6 +646589,8 @@ self: { ]; description = "Stratosphere integration for AWS OSIS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646179,6 +646612,8 @@ self: { ]; description = "Stratosphere integration for AWS Panorama"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646200,6 +646635,8 @@ self: { ]; description = "Stratosphere integration for AWS PaymentCryptography"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646221,6 +646658,8 @@ self: { ]; description = "Stratosphere integration for AWS PCAConnectorAD"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646242,6 +646681,8 @@ self: { ]; description = "Stratosphere integration for AWS PCAConnectorSCEP"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646263,6 +646704,8 @@ self: { ]; description = "Stratosphere integration for AWS PCS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646284,6 +646727,8 @@ self: { ]; description = "Stratosphere integration for AWS Personalize"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646305,6 +646750,8 @@ self: { ]; description = "Stratosphere integration for AWS Pinpoint"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646326,6 +646773,8 @@ self: { ]; description = "Stratosphere integration for AWS PinpointEmail"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646347,6 +646796,8 @@ self: { ]; description = "Stratosphere integration for AWS Pipes"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646368,6 +646819,8 @@ self: { ]; description = "Stratosphere integration for AWS Proton"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646389,6 +646842,8 @@ self: { ]; description = "Stratosphere integration for AWS QBusiness"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646410,6 +646865,8 @@ self: { ]; description = "Stratosphere integration for AWS QLDB"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646431,6 +646888,8 @@ self: { ]; description = "Stratosphere integration for AWS QuickSight"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646452,6 +646911,8 @@ self: { ]; description = "Stratosphere integration for AWS RAM"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646473,6 +646934,8 @@ self: { ]; description = "Stratosphere integration for AWS Rbin"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646494,6 +646957,8 @@ self: { ]; description = "Stratosphere integration for AWS RDS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646515,6 +646980,8 @@ self: { ]; description = "Stratosphere integration for AWS Redshift"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646536,6 +647003,8 @@ self: { ]; description = "Stratosphere integration for AWS RedshiftServerless"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646557,6 +647026,8 @@ self: { ]; description = "Stratosphere integration for AWS RefactorSpaces"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646578,6 +647049,8 @@ self: { ]; description = "Stratosphere integration for AWS Rekognition"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646599,6 +647072,8 @@ self: { ]; description = "Stratosphere integration for AWS ResilienceHub"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646620,6 +647095,8 @@ self: { ]; description = "Stratosphere integration for AWS ResourceExplorer2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646641,6 +647118,8 @@ self: { ]; description = "Stratosphere integration for AWS ResourceGroups"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646662,6 +647141,8 @@ self: { ]; description = "Stratosphere integration for AWS RoboMaker"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646683,6 +647164,8 @@ self: { ]; description = "Stratosphere integration for AWS RolesAnywhere"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646704,6 +647187,8 @@ self: { ]; description = "Stratosphere integration for AWS Route53"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646725,6 +647210,8 @@ self: { ]; description = "Stratosphere integration for AWS Route53Profiles"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646746,6 +647233,8 @@ self: { ]; description = "Stratosphere integration for AWS Route53RecoveryControl"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646767,6 +647256,8 @@ self: { ]; description = "Stratosphere integration for AWS Route53RecoveryReadiness"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646788,6 +647279,8 @@ self: { ]; description = "Stratosphere integration for AWS Route53Resolver"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646809,6 +647302,8 @@ self: { ]; description = "Stratosphere integration for AWS RTBFabric"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646830,6 +647325,8 @@ self: { ]; description = "Stratosphere integration for AWS RUM"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646851,6 +647348,8 @@ self: { ]; description = "Stratosphere integration for AWS S3"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646872,6 +647371,8 @@ self: { ]; description = "Stratosphere integration for AWS S3Express"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646893,6 +647394,8 @@ self: { ]; description = "Stratosphere integration for AWS S3ObjectLambda"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646914,6 +647417,8 @@ self: { ]; description = "Stratosphere integration for AWS S3Outposts"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646935,6 +647440,8 @@ self: { ]; description = "Stratosphere integration for AWS S3Tables"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646956,6 +647463,8 @@ self: { ]; description = "Stratosphere integration for AWS SageMaker"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646977,6 +647486,8 @@ self: { ]; description = "Stratosphere integration for AWS Scheduler"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -646998,6 +647509,8 @@ self: { ]; description = "Stratosphere integration for AWS SDB"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647019,6 +647532,8 @@ self: { ]; description = "Stratosphere integration for AWS SecretsManager"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647040,6 +647555,8 @@ self: { ]; description = "Stratosphere integration for AWS SecurityHub"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647061,6 +647578,8 @@ self: { ]; description = "Stratosphere integration for AWS SecurityLake"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647082,6 +647601,8 @@ self: { ]; description = "Stratosphere integration for AWS ServiceCatalog"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647103,6 +647624,8 @@ self: { ]; description = "Stratosphere integration for AWS ServiceCatalogAppRegistry"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647124,6 +647647,8 @@ self: { ]; description = "Stratosphere integration for AWS ServiceDiscovery"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647145,6 +647670,8 @@ self: { ]; description = "Stratosphere integration for AWS SES"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647166,6 +647693,8 @@ self: { ]; description = "Stratosphere integration for AWS Shield"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647187,6 +647716,8 @@ self: { ]; description = "Stratosphere integration for AWS Signer"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647208,6 +647739,8 @@ self: { ]; description = "Stratosphere integration for AWS SimSpaceWeaver"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647229,6 +647762,8 @@ self: { ]; description = "Stratosphere integration for AWS SMSVOICE"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647250,6 +647785,8 @@ self: { ]; description = "Stratosphere integration for AWS SNS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647271,6 +647808,8 @@ self: { ]; description = "Stratosphere integration for AWS SQS"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647292,6 +647831,8 @@ self: { ]; description = "Stratosphere integration for AWS SSM"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647313,6 +647854,8 @@ self: { ]; description = "Stratosphere integration for AWS SSMContacts"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647334,6 +647877,8 @@ self: { ]; description = "Stratosphere integration for AWS SSMGuiConnect"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647355,6 +647900,8 @@ self: { ]; description = "Stratosphere integration for AWS SSMIncidents"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647376,6 +647923,8 @@ self: { ]; description = "Stratosphere integration for AWS SSMQuickSetup"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647397,6 +647946,8 @@ self: { ]; description = "Stratosphere integration for AWS SSO"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647418,6 +647969,8 @@ self: { ]; description = "Stratosphere integration for AWS StepFunctions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647439,6 +647992,8 @@ self: { ]; description = "Stratosphere integration for AWS SupportApp"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647460,6 +648015,8 @@ self: { ]; description = "Stratosphere integration for AWS Synthetics"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647481,6 +648038,8 @@ self: { ]; description = "Stratosphere integration for AWS SystemsManagerSAP"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647502,6 +648061,8 @@ self: { ]; description = "Stratosphere integration for AWS Timestream"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647523,6 +648084,8 @@ self: { ]; description = "Stratosphere integration for AWS Transfer"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647544,6 +648107,8 @@ self: { ]; description = "Stratosphere integration for AWS VerifiedPermissions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647565,6 +648130,8 @@ self: { ]; description = "Stratosphere integration for AWS VoiceID"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647586,6 +648153,8 @@ self: { ]; description = "Stratosphere integration for AWS VpcLattice"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647607,6 +648176,8 @@ self: { ]; description = "Stratosphere integration for AWS WAF"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647628,6 +648199,8 @@ self: { ]; description = "Stratosphere integration for AWS WAFRegional"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647649,6 +648222,8 @@ self: { ]; description = "Stratosphere integration for AWS WAFv2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647670,6 +648245,8 @@ self: { ]; description = "Stratosphere integration for AWS Wisdom"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647691,6 +648268,8 @@ self: { ]; description = "Stratosphere integration for AWS WorkSpaces"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647712,6 +648291,8 @@ self: { ]; description = "Stratosphere integration for AWS WorkspacesInstances"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647733,6 +648314,8 @@ self: { ]; description = "Stratosphere integration for AWS WorkSpacesThinClient"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647754,6 +648337,8 @@ self: { ]; description = "Stratosphere integration for AWS WorkSpacesWeb"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -647775,6 +648360,8 @@ self: { ]; description = "Stratosphere integration for AWS XRay"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -667365,6 +667952,7 @@ self: { ]; description = "CLI task / todo list manager with SQLite backend"; license = lib.licensesSpdx."AGPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; mainProgram = "tasklite"; } ) { }; @@ -667502,6 +668090,7 @@ self: { ]; description = "CLI task / todo list manager with SQLite backend"; license = lib.licensesSpdx."AGPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -681690,7 +682279,9 @@ self: { ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "threads-supervisor-example"; + broken = true; } ) { }; @@ -707267,6 +707858,8 @@ self: { testHaskellDepends = [ base ]; description = "Extensible typed Dimensions"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -725595,6 +726188,8 @@ self: { ]; description = "A request rate limiting middleware using token buckets"; license = lib.licensesSpdx."Apache-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -727305,6 +727900,8 @@ self: { ]; description = "Bidirectional URL path, URL query string and HTTP headers codecs"; license = lib.licensesSpdx."Apache-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -743725,7 +744322,9 @@ self: { description = "Text-based notification server for XMobar"; license = lib.licensesSpdx."BSD-3-Clause"; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; mainProgram = "Echo"; + broken = true; } ) { }; From 2a3ef27b94601d054826758ea3e218edc80a905f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 29 Nov 2025 13:30:40 +0100 Subject: [PATCH 382/542] haskellPackages._4Blocks: fix transitive broken --- .../configuration-hackage2nix/transitive-broken.yaml | 2 +- pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9968c5c39699..d16b74d6144e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -4,6 +4,7 @@ # depend on a dependency marked as broken. dont-distribute-packages: + - 4Blocks - a50 - abcBridge - AbortT-monadstf @@ -3918,4 +3919,3 @@ dont-distribute-packages: - zoovisitor - zuramaru - zwirn - - _4Blocks diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ae896ccaa6a9..b49fcff2893c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -129,6 +129,7 @@ self: { ]; description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "4Blocks"; } ) { }; From 6c0b980950ca0dae2d993bd8a3d2cd0e80009559 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 29 Nov 2025 13:39:47 +0100 Subject: [PATCH 383/542] haskellPackages._type: mark broken The script didn't pick this up correctly, so manually fixing for now. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 47bcb243c8f8..f391ea195263 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -6838,6 +6838,7 @@ broken-packages: - TYB # failure in job https://hydra.nixos.org/build/233246075 at 2023-09-02 - tyfam-witnesses # failure in job https://hydra.nixos.org/build/233191033 at 2023-09-02 - typalyze # failure in job https://hydra.nixos.org/build/233246228 at 2023-09-02 + - type # failure in job https://hydra.nixos.org/build/315191813 at 2025-11-29 - type-combinators # failure in job https://hydra.nixos.org/build/233230024 at 2023-09-02 - type-compare # failure in job https://hydra.nixos.org/build/233207530 at 2023-09-02 - type-eq # failure in job https://hydra.nixos.org/build/233214388 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b49fcff2893c..4b8ba2977e60 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -699561,6 +699561,8 @@ self: { ]; description = "Dynamic casting library with support for arbitrary rank type kinds"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; From a9bb02ff5009fb37bcc2240bb1696069e4f88d82 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Sat, 29 Nov 2025 19:22:03 +0800 Subject: [PATCH 384/542] speechd: respect config and fix /bin/bash not found --- pkgs/by-name/sp/speechd/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix index 6155290c6ceb..c4c86dc8b3fc 100644 --- a/pkgs/by-name/sp/speechd/package.nix +++ b/pkgs/by-name/sp/speechd/package.nix @@ -15,6 +15,7 @@ glib, dotconf, libsndfile, + runtimeShell, withLibao ? true, libao, withPulse ? false, @@ -101,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { ]; configureFlags = [ + "--sysconfdir=/etc" # Audio method falls back from left to right. "--with-default-audio-method=\"libao,pulse,alsa,oss\"" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" @@ -127,8 +129,13 @@ stdenv.mkDerivation (finalAttrs: { postPatch = lib.optionalString withPico '' substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang" + substituteInPlace src/modules/generic.c --replace-fail "/bin/bash" "${runtimeShell}" ''; + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; + postInstall = if libsOnly then '' From 65037cffdb986acb08035988674765b6cf0f34e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 29 Nov 2025 15:21:57 +0100 Subject: [PATCH 385/542] rustc, cargo-llvm-cov: enable profiler runtime on Darwin Enable the LLVM profiler runtime on macOS by passing `--enable-profiler` to rustc's configure. This allows cargo-llvm-cov and other coverage tools to work on Darwin platforms. The profiler is explicitly disabled for wasm and bpf targets which don't support it. --- pkgs/by-name/ca/cargo-llvm-cov/package.nix | 3 +-- pkgs/development/compilers/rust/rustc.nix | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index 52db65a97405..4de52a2360c3 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -93,7 +93,6 @@ rustPlatform.buildRustPackage (finalAttrs: { CobaltCause ]; - # The profiler runtime is (currently) disabled on non-Linux platforms - broken = !(stdenv.hostPlatform.isLinux && !stdenv.targetPlatform.isRedox); + broken = stdenv.targetPlatform.isRedox; }; }) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index d2364f7aa533..b483594f7979 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -240,6 +240,15 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) [ "--enable-profiler" # build libprofiler_builtins ] + ++ optionals stdenv.targetPlatform.isDarwin [ + # potentially other llvm targets work with the same fix? + "--enable-profiler" # build libprofiler_builtins + # Disable profiler for targets that don't support it + "--set=target.wasm32-unknown-unknown.profiler=false" + "--set=target.wasm32v1-none.profiler=false" + "--set=target.bpfel-unknown-none.profiler=false" + "--set=target.bpfeb-unknown-none.profiler=false" + ] ++ optionals stdenv.buildPlatform.isMusl [ "${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}" ] From fe6bcf7ddbb2bc0d61fa573f67e71a8d512a8e36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 29 Nov 2025 17:59:10 +0100 Subject: [PATCH 386/542] python3Packages.trio: 0.31.0 -> 0.32.0 https://github.com/python-trio/trio/blob/v0.32.0/docs/source/history.rst --- pkgs/development/python-modules/trio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index c6a6fd857fb0..3e2452945f62 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -36,7 +36,7 @@ let in buildPythonPackage rec { pname = "trio"; - version = "0.31.0"; + version = "0.32.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "trio"; tag = "v${version}"; - hash = "sha256-cl1GstWVHDD3nWx835k2hnswt/+AnoTLXjxVIfLP6Es="; + hash = "sha256-kZKP5TFg9M+NCx9V9B0qNbGiwZtBPtgVKgZYjX5w1ok="; }; build-system = [ setuptools ]; From c0174baa2697188064a5c1ba8c18a93d81bb4166 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 29 Nov 2025 17:59:51 +0100 Subject: [PATCH 387/542] python3Packages.anyio: 4.11.0 -> 4.12.0 https://github.com/agronholm/anyio/blob/4.12.0/docs/versionhistory.rst --- pkgs/development/python-modules/anyio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 1e971d6d42cf..f43287e3578d 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.11.0"; + version = "4.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "anyio"; tag = version; - hash = "sha256-TOXg9J/Z2S5/X7OBgU+J0HZNB3BDluaWTqDiqp3O4ek="; + hash = "sha256-zFVvAK06HG40numRihLHBMKCI3d1wQvmEKk+EaBFVVU="; }; build-system = [ setuptools-scm ]; From 4d74eb6ca007f5bc8d35c176eba6758ab98eff35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Nov 2025 12:27:25 -0800 Subject: [PATCH 388/542] Revert "ceph: remove unused dependency from httpcore" This reverts commit ea34eac61bf8d9463b03d74bd9559f9f3d759972 because the dependency was removed from python3Packages.httpcore. --- pkgs/by-name/ce/ceph/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix index 64ee3416ed82..e2b1d67d4759 100644 --- a/pkgs/by-name/ce/ceph/package.nix +++ b/pkgs/by-name/ce/ceph/package.nix @@ -321,9 +321,6 @@ let }; }); - httpcore = super.httpcore.overridePythonAttrs (old: { - nativeCheckInputs = lib.remove self.pproxy old.nativeCheckInputs; - }); }; }; From 402c01b708b08f610d1f756e3ca3cb60d1752418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Nov 2025 16:36:36 -0800 Subject: [PATCH 389/542] python3Packages.deltalake: use lib.concatAttrValues --- pkgs/development/python-modules/deltalake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix index 452a6fa3330d..d8d568c45db7 100644 --- a/pkgs/development/python-modules/deltalake/default.nix +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { pytest-mock pytest-timeout ] - ++ lib.flatten (lib.attrValues optional-dependencies); + ++ lib.concatAttrValues optional-dependencies; preCheck = '' # For paths in test to work, we have to be in python dir From 4027ef18710b9cf790360038fdcc55c93f3a0933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Nov 2025 16:37:03 -0800 Subject: [PATCH 390/542] python3Packages.zope-size: use lib.concatAttrValues --- pkgs/development/python-modules/zope-size/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/zope-size/default.nix b/pkgs/development/python-modules/zope-size/default.nix index f6219f6cf56a..8632f12c9a71 100644 --- a/pkgs/development/python-modules/zope-size/default.nix +++ b/pkgs/development/python-modules/zope-size/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ] - ++ lib.flatten (lib.attrValues optional-dependencies); + ++ lib.concatAttrValues optional-dependencies; unittestFlagsArray = [ "src/zope/size" ]; From 1cb4ce7f45c9fa2cac2d96851411ecb2abad7fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Nov 2025 16:37:30 -0800 Subject: [PATCH 391/542] python3Packages.python-dotenv: use lib.concatAttrValues --- pkgs/development/python-modules/python-dotenv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 88832f7b6f1a..4aea6e6f48ef 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytestCheckHook sh ] - ++ lib.flatten (lib.attrValues optional-dependencies); + ++ lib.concatAttrValues optional-dependencies; preCheck = '' export PATH="$out/bin:$PATH" From fb8ead2032e8020f5c153559fa92047626f804dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Nov 2025 18:41:11 -0800 Subject: [PATCH 392/542] python3Packages.psutil: 7.1.2 -> 7.1.3 Diff: https://github.com/giampaolo/psutil/compare/release-7.1.2...release-7.1.3 Changelog: https://github.com/giampaolo/psutil/blob/release-7.1.3/HISTORY.rst --- pkgs/development/python-modules/psutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index dac2afcd346f..d1d2f609d652 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "psutil"; - version = "7.1.2"; + version = "7.1.3"; pyproject = true; inherit stdenv; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "giampaolo"; repo = "psutil"; tag = "release-${version}"; - hash = "sha256-LyGnLrq+SzCQmz8/P5DOugoNEyuH0IC7uIp8UAPwH0U="; + hash = "sha256-vMGUoiPr+QIe1N+I++d/DM9i2jeHTI68npGoJ2vKF10="; }; postPatch = '' From c1f54cc43580731660ffd158380c9cd125efbad1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Nov 2025 03:26:03 +0000 Subject: [PATCH 393/542] neon: 0.35.0 -> 0.36.0 --- pkgs/by-name/ne/neon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/neon/package.nix b/pkgs/by-name/ne/neon/package.nix index 9015a737ada8..ff8d50a0ddd3 100644 --- a/pkgs/by-name/ne/neon/package.nix +++ b/pkgs/by-name/ne/neon/package.nix @@ -22,12 +22,12 @@ let in stdenv.mkDerivation rec { - version = "0.35.0"; + version = "0.36.0"; pname = "neon"; src = fetchurl { url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FGevtz814/XQ6f1wYowUy6Jmpl4qH7bj+UXuM4XIWVs="; + sha256 = "sha256-cMx/Ku694mOQbhhbJm4E4N6Ss45fTszL9h6LeRd8Lwc="; }; patches = optionals stdenv.hostPlatform.isDarwin [ ./darwin-fix-configure.patch ]; From 97ac39aaa41d5bd1142949fea0176897efaae874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Nov 2025 21:02:10 -0800 Subject: [PATCH 394/542] python3Packages.typer: use mkPythonMetaPackage This fixes a collision between typer and typer-slim when building python3.withPackages (ps: [ ps.spacy ]) --- .../python-modules/typer-slim/default.nix | 90 +++++++++++++++ .../python-modules/typer/default.nix | 103 +++--------------- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 104 insertions(+), 91 deletions(-) create mode 100644 pkgs/development/python-modules/typer-slim/default.nix diff --git a/pkgs/development/python-modules/typer-slim/default.nix b/pkgs/development/python-modules/typer-slim/default.nix new file mode 100644 index 000000000000..55c736320c78 --- /dev/null +++ b/pkgs/development/python-modules/typer-slim/default.nix @@ -0,0 +1,90 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + pdm-backend, + + # dependencies + click, + typing-extensions, + + # optional-dependencies + rich, + shellingham, + + # tests + pytest-xdist, + pytestCheckHook, + writableTmpDirAsHomeHook, + procps, +}: + +buildPythonPackage rec { + pname = "typer-slim"; + version = "0.19.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fastapi"; + repo = "typer"; + tag = version; + hash = "sha256-mMsOEI4FpLkLkpjxjnUdmKdWD65Zx3Z1+L+XsS79k44="; + }; + + postPatch = '' + for f in $(find tests -type f -print); do + # replace `sys.executable -m coverage run` with `sys.executable` + sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f" + done + ''; + + env.TIANGOLO_BUILD_PACKAGE = "typer-slim"; + + build-system = [ pdm-backend ]; + + dependencies = [ + click + typing-extensions + ]; + + optional-dependencies = { + standard = [ + rich + shellingham + ]; + }; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + writableTmpDirAsHomeHook + ] + ++ lib.concatAttrValues optional-dependencies + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + procps + ]; + + disabledTests = [ + "test_scripts" + # Likely related to https://github.com/sarugaku/shellingham/issues/35 + # fails also on Linux + "test_show_completion" + "test_install_completion" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + "test_install_completion" + ]; + + pythonImportsCheck = [ "typer" ]; + + meta = { + description = "Library for building CLI applications"; + homepage = "https://typer.tiangolo.com/"; + changelog = "https://github.com/tiangolo/typer/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ winpat ]; + }; +} diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index e8f4a22ca4fd..6e1daa7b91e0 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -1,97 +1,20 @@ { lib, - stdenv, - buildPythonPackage, - fetchFromGitHub, - - # build-system - pdm-backend, - - # dependencies - click, - typing-extensions, - - # optional-dependencies - rich, - shellingham, - - # tests - pytest-xdist, - pytestCheckHook, - writableTmpDirAsHomeHook, - procps, - - # typer or typer-slim - package ? "typer", + mkPythonMetaPackage, + typer-slim, }: -buildPythonPackage rec { - pname = package; - version = "0.19.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "fastapi"; - repo = "typer"; - tag = version; - hash = "sha256-mMsOEI4FpLkLkpjxjnUdmKdWD65Zx3Z1+L+XsS79k44="; - }; - - postPatch = '' - for f in $(find tests -type f -print); do - # replace `sys.executable -m coverage run` with `sys.executable` - sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f" - done - ''; - - env.TIANGOLO_BUILD_PACKAGE = package; - - build-system = [ pdm-backend ]; - - dependencies = [ - click - typing-extensions - ] - # typer includes the standard optional by default - # https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72 - ++ lib.optionals (package == "typer") optional-dependencies.standard; - - optional-dependencies = { - standard = [ - rich - shellingham - ]; - }; - - doCheck = package == "typer"; # tests expect standard dependencies - - nativeCheckInputs = [ - pytest-xdist - pytestCheckHook - writableTmpDirAsHomeHook - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - procps - ]; - - disabledTests = [ - "test_scripts" - # Likely related to https://github.com/sarugaku/shellingham/issues/35 - # fails also on Linux - "test_show_completion" - "test_install_completion" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - "test_install_completion" - ]; - - pythonImportsCheck = [ "typer" ]; - +mkPythonMetaPackage { + pname = "typer"; + inherit (typer-slim) version optional-dependencies; + dependencies = [ typer-slim ] ++ typer-slim.optional-dependencies.standard; meta = { - description = "Library for building CLI applications"; - homepage = "https://typer.tiangolo.com/"; - changelog = "https://github.com/tiangolo/typer/releases/tag/${version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ winpat ]; + inherit (typer-slim.meta) + changelog + description + homepage + license + maintainers + ; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1bba01f0de6..ee857cfe810e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19255,7 +19255,7 @@ self: super: with self; { typer-shell = callPackage ../development/python-modules/typer-shell { }; - typer-slim = self.typer.override { package = "typer-slim"; }; + typer-slim = callPackage ../development/python-modules/typer-slim { }; types-aiobotocore = callPackage ../development/python-modules/types-aiobotocore { }; From 9ee5f177759ac9418ec3792c110b989a93ab0dce Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 27 Nov 2025 15:43:09 +0200 Subject: [PATCH 395/542] at-spi2-core: 2.58.1 -> 2.58.2 --- pkgs/by-name/at/at-spi2-core/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 1ca88332ea10..ab95cb48f6b9 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.58.1"; + version = "2.58.2"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz"; - hash = "sha256-fzdKajjNcP9LMsnToDEL+oBNlG/tTJ5pp9SfrNy5Xpw="; + hash = "sha256-ooI7li7RbN1csfxTZQKf0hg5TYUqzUCYsyGFS9ZpL24="; }; nativeBuildInputs = [ From bb46e4ab91be58ce30d51ce1155ce9de8d628f6f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 27 Nov 2025 15:43:44 +0200 Subject: [PATCH 396/542] glib: 2.86.1 -> 2.86.2 --- pkgs/by-name/gl/glib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index b217b4a0dbf4..281606682ed3 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.86.1"; + version = "2.86.2"; outputs = [ "bin" @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-EZ0XCMoCJVbW0pie6QrRuCvZwNFmfgZpRKbQAg4tXlc="; + hash = "sha256-inJOlwhVNX6oEB4ncnICOSoP/VQQqYM2rtVOxZET5hE="; }; patches = From 12742b0b3f1e878e69cee7c924fc776a3e758473 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 27 Nov 2025 15:44:33 +0200 Subject: [PATCH 397/542] libadwaita: 1.8.1 -> 1.8.2 Diff: https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.8.1...1.8.2 Changelog: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/1.8.2/NEWS --- pkgs/by-name/li/libadwaita/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index e29c04dd5b15..0b6aa26cff4c 100644 --- a/pkgs/by-name/li/libadwaita/package.nix +++ b/pkgs/by-name/li/libadwaita/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.8.1"; + version = "1.8.2"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-9CcmzwQYZZc6dZAv6x90Od4lrRcYZIejzPgm6S1vz/U="; + hash = "sha256-bymC3B5mY4r7oteA6WRViWIyazt0YE6T+P+RHrYifyY="; }; depsBuildBuild = [ From a677747fff3c929db7366b2950717884a6752032 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Nov 2025 10:27:02 +0000 Subject: [PATCH 398/542] haskellPackages.3d-graphics-example: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix build --no-link -f. haskellPackages.3d-graphics-example error: … while evaluating the attribute 'value' at pkgs/development/haskell-modul 2162| name = old; 2163| value = | ^ 2164| lib.warnOnInstantiate "haskell.packages.*.${old} has b … in the right operand of the update (//) operator at lib/derivations.nix:253:12: 252| in 253| drv // mapAttrs (_: lib.warn msg) drvToWrap; | ^ 254| } (stack trace truncated; use '--show-trace' to show the full, detailed tr error: attribute '_3d-graphics-example' missing at pkgs/development/haskell-modules/configuration-nix.nix:2165:13: 2164| lib.warnOnInstantiate "haskell.packages.*.${old} has been renamed to haskell.packages.*.${new}" 2165| self.${new}; | ^ 2166| } Did you mean one of 3d-graphics-example or _3d-graphics-examples? --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 92df739b084b..b07f2b4a770e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -2147,7 +2147,7 @@ builtins.intersectAttrs super { lib.genAttrs [ "2captcha" - "3d-graphics-example" + "3d-graphics-examples" "3dmodels" "4Blocks" "assert" From 668b0b4e480ed72735d6ac5a1ce700417de01f85 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 30 Nov 2025 16:16:47 +0100 Subject: [PATCH 399/542] texinfoInteractive: add patch for perl 5.42 Add patch for perl 5.42 from Debian that fixes syntax warnings causing test failures via Texinfo::Convert::Coverter and Texinfo::Convert::LaTeX The patch is only applied if: - Versions =< 7.2, since this is fixed in later git releases of texinfo - interactive = true, since tests are disabled for other cases, and applying it for all cases causes a mass rebuild. --- .../development/tools/misc/texinfo/common.nix | 8 +++- ...x-test-suite-failures-with-perl-5.42.patch | 41 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 49f1bf8c8018..00dd5a5811a5 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -38,6 +38,7 @@ let optional optionals optionalString + versionAtLeast versionOlder ; crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform; @@ -52,7 +53,12 @@ stdenv.mkDerivation { inherit hash; }; - patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch; + patches = + patches + ++ optional ( + interactive && versionAtLeast version "7.2" + ) ./fix-test-suite-failures-with-perl-5.42.patch + ++ optional crossBuildTools ./cross-tools-flags.patch; postPatch = '' patchShebangs tp/maintain/regenerate_commands_perl_info.pl diff --git a/pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch b/pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch new file mode 100644 index 000000000000..59f89e16db27 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch @@ -0,0 +1,41 @@ +>From 1af3c9b91625e4d115ea979c45a75752b872c10f Mon Sep 17 00:00:00 2001 +From: Niko Tyni +Date: Sat, 13 Sep 2025 08:57:55 +0100 +Subject: [PATCH] Fix test suite failures with Perl 5.42 + +The precedence issues here were flagged by new diagnostics in Perl 5.42, +and the resulting warnings caused test failures. +--- + tp/Texinfo/Convert/Converter.pm | 2 +- + tp/Texinfo/Convert/LaTeX.pm | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm +index 5e14a9e..89e623b 100644 +--- a/tp/Texinfo/Convert/Converter.pm ++++ b/tp/Texinfo/Convert/Converter.pm +@@ -386,7 +386,7 @@ sub output_tree($$) + + my $fh; + my $encoded_output_file; +- if (! $output_file eq '') { ++ if ($output_file ne '') { + my $path_encoding; + ($encoded_output_file, $path_encoding) + = $self->encoded_output_file_name($output_file); +diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm +index ae947d1..f4ba076 100644 +--- a/tp/Texinfo/Convert/LaTeX.pm ++++ b/tp/Texinfo/Convert/LaTeX.pm +@@ -1085,7 +1085,7 @@ sub output($$) + + my $fh; + my $encoded_output_file; +- if (! $output_file eq '') { ++ if ($output_file ne '') { + my $path_encoding; + ($encoded_output_file, $path_encoding) + = $self->encoded_output_file_name($output_file); +-- +2.51.0 + From 971ebdc4c8551f229daa74fc760fd5bb3fba0e10 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 1 Dec 2025 06:26:06 +0000 Subject: [PATCH 400/542] xterm: 403 -> 404 Changes: https://invisible-island.net/xterm/xterm.log.html#xterm_404 --- pkgs/by-name/xt/xterm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index a53997d95010..57a59dd24030 100644 --- a/pkgs/by-name/xt/xterm/package.nix +++ b/pkgs/by-name/xt/xterm/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "403"; + version = "404"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-EzGw31kZyyQ//jJtxv8QopHmg6Ji9wzflkpmS+czrYM="; + hash = "sha256-YzMvkhwie6WeWJ+gff2tFZnBCshZ6ibHKsHdSkG1ZaQ="; }; patches = [ ./sixel-256.support.patch ]; From 68b124821aa9272e7c4f28f8909b26710eae593d Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Tue, 18 Nov 2025 23:16:30 +0100 Subject: [PATCH 401/542] eb-garamond: disable ttfautohint's GUI --- pkgs/by-name/eb/eb-garamond/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix index e2417fd380b7..e839dbea17c5 100644 --- a/pkgs/by-name/eb/eb-garamond/package.nix +++ b/pkgs/by-name/eb/eb-garamond/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, python3, - ttfautohint, + ttfautohint-nox, }: stdenvNoCC.mkDerivation rec { pname = "eb-garamond"; @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ (python3.withPackages (p: [ p.fontforge ])) - ttfautohint + ttfautohint-nox ]; postPatch = '' From 8151f333a612bf530849a42a2997893790657ed3 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Tue, 18 Nov 2025 22:45:49 +0100 Subject: [PATCH 402/542] eb-garamond: modernise `rec` -> `finalAttrs`, inlining `with lib` --- pkgs/by-name/eb/eb-garamond/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix index e839dbea17c5..c4e589d66aca 100644 --- a/pkgs/by-name/eb/eb-garamond/package.nix +++ b/pkgs/by-name/eb/eb-garamond/package.nix @@ -5,14 +5,14 @@ python3, ttfautohint-nox, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "eb-garamond"; version = "0.016"; src = fetchFromGitHub { owner = "georgd"; repo = "EB-Garamond"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ajieKhTeH6yv2qiE2xqnHFoMS65//4ZKiccAlC2PXGQ="; }; @@ -42,15 +42,15 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "http://www.georgduffner.at/ebgaramond/"; description = "Digitization of the Garamond shown on the Egenolff-Berner specimen"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ bengsparks relrod rycee ]; - license = licenses.ofl; - platforms = platforms.all; + license = lib.licenses.ofl; + platforms = lib.platforms.all; }; -} +}) From 4e7384feb29ee3c38a6a012ebb719483b8cb3434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 1 Dec 2025 11:17:01 -0600 Subject: [PATCH 403/542] db{48,53,60,62}: get gentoo patch for gcc15 and Wno-error=incompatible-pointer-types --- pkgs/development/libraries/db/db-4.8.nix | 1 + pkgs/development/libraries/db/db-5.3.nix | 1 + pkgs/development/libraries/db/db-6.0.nix | 1 + pkgs/development/libraries/db/db-6.2.nix | 1 + pkgs/development/libraries/db/generic.nix | 14 +++++++++++++- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index b91ec5dd5b6a..23ed07441755 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 77e9a1a04269..c9e1a6bb1d1e 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index f720ca180639..a23ee5b936fc 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index 2f573aaca1e9..78c6cf4eb8a7 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index cbe36d489d9f..eb59a7e4b941 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, cxxSupport ? true, @@ -29,7 +30,14 @@ stdenv.mkDerivation ( # configure checks to work incorrectly with clang 16. nativeBuildInputs = [ autoreconfHook ]; - patches = extraPatches; + patches = [ + (fetchpatch { + name = "gcc15.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/db/files/db-4.8.30-tls-configure.patch?id=1ae36006c79ef705252f5f7009e79f6add7dc353"; + hash = "sha256-OzQL+kgXtcvhvyleDLuH1abhY4Shb/9IXx4ZkeFbHOA="; + }) + ] + ++ extraPatches; outputs = [ "bin" @@ -75,6 +83,10 @@ stdenv.mkDerivation ( popd ''; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=incompatible-pointer-types" + ]; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") From ccc5782d29bde168b4abecffcfcc6f66a6423b32 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 1 Dec 2025 23:20:07 +0000 Subject: [PATCH 404/542] re2c: 4.3 -> 4.3.1 Changes: https://re2c.org/releases/release_notes.html#release-4-3-1 --- pkgs/by-name/re/re2c/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix index e9d5c449ddd9..a93d10107db1 100644 --- a/pkgs/by-name/re/re2c/package.nix +++ b/pkgs/by-name/re/re2c/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "re2c"; - version = "4.3"; + version = "4.3.1"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - hash = "sha256-zPOENMfXXgTwds1t+Lrmz9+GTHJf2yRpQsGT7nLRvcg="; + hash = "sha256-ihtAB6HLgYhX+FKPFy01RByy/M468YrHv2v5wB9bJws="; }; nativeBuildInputs = [ From b6c3672a743a63ef2a9517e0962977527b70ec8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 5 Sep 2025 09:20:00 -0600 Subject: [PATCH 405/542] =?UTF-8?q?gcc:=2014=20=E2=86=92=2015?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/release-notes/rl-2605.section.md | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 9e1eea6eeab8..99b9bd9040e9 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -3,7 +3,8 @@ ## Highlights {#sec-nixpkgs-release-26.05-highlights} -- Create the first release note entry in this section! +- GCC has been updated from GCC 14 to GCC 15. + This introduces some backwards incompatible changes; Refer to the [upstream porting guide](https://gcc.gnu.org/gcc-15/porting_to.html) for details. ## Backward Incompatibilities {#sec-nixpkgs-release-26.05-incompatibilities} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb80334a36b6..8bacdaa62105 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4416,7 +4416,7 @@ with pkgs; gerbilPackages-unstable = pkgs.gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries glow-lang = pkgs.gerbilPackages-unstable.glow-lang; - default-gcc-version = 14; + default-gcc-version = 15; gcc = pkgs.${"gcc${toString default-gcc-version}"}; gccFun = callPackage ../development/compilers/gcc; gcc-unwrapped = gcc.cc; From 6f779d8de0d6229b6f0248d5282b3f5c754bbee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Dec 2025 00:39:14 +0000 Subject: [PATCH 406/542] imagemagick: 7.1.2-8 -> 7.1.2-9 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 47ac7b7b66d6..8d983f5602a6 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -85,13 +85,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.2-8"; + version = "7.1.2-9"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; tag = finalAttrs.version; - hash = "sha256-2jSQ59Wi6/1dbS/AgM1DfW6WlwoYuJlnTLoM8Mc6Ji8="; + hash = "sha256-bXVVnjJhtmcbczZI9rsy2JQ3p2oYX5g5vp3YdsQkdrE="; }; outputs = [ From 19265f2a2159f46e85e2b1f110a4bf6efab6be0e Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 16 Sep 2025 19:40:43 +0300 Subject: [PATCH 407/542] vde2: fix build with gcc15 - add "-std=gnu17" to `env.NIX_CFLAGS_COMPILE` similar to merged upstream commit (patch from commit does not apply): https://github.com/virtualsquare/vde-2/commit/fedcb99c5f44c397f459ed0951a8fba4f4effb73 Fixes build failure with gcc15: ``` libvdehist.c:39:27: error: initialization of 'ssize_fun' {aka 'long int (*)(void)'} from incompatible pointer type 'ssize_t (*)(int, void *, size_t)' {aka 'long int (> 39 | ssize_fun vdehist_vderead=read; | ^~~~ In file included from /nix/store/gi4cz4ir3zlwhf1azqfgxqdnczfrwsr7-glibc-2.40-66-dev/include/unistd.h:1217, from libvdehist.c:21: /nix/store/gi4cz4ir3zlwhf1azqfgxqdnczfrwsr7-glibc-2.40-66-dev/include/bits/unistd.h:26:1: note: 'read' declared here 26 | read (int __fd, __fortify_clang_overload_arg0 (void *, ,__buf), size_t __nbytes) | ^~~~ libvdehist.c:38:20: note: 'ssize_fun' declared here 38 | typedef ssize_t (* ssize_fun)(); | ^~~~~~~~~ libvdehist.c: In function 'showexpand': libvdehist.c:99:25: error: too many arguments to function 'vdehist_termwrite'; expected 0, have 3 99 | vdehist_termwrite(termfd,buf,strlen(buf)); | ^~~~~~~~~~~~~~~~~ ~~~~~~ libvdehist.c: In function 'vdehist_create_commandlist': libvdehist.c:192:17: error: too many arguments to function 'vdehist_vdewrite'; expected 0, have 3 192 | vdehist_vdewrite(vdefd,"help\n",5); | ^~~~~~~~~~~~~~~~ ~~~~~ libvdehist.c:323:27: error: too many arguments to function 'vdehist_vderead'; expected 0, have 3 323 | n=vdehist_vderead(st->mgmtfd,buf,BUFSIZE); | ^~~~~~~~~~~~~~~ ~~~~~~~~~~ ``` --- pkgs/by-name/vd/vde2/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/vd/vde2/package.nix b/pkgs/by-name/vd/vde2/package.nix index 695940bee37e..7c8972b7d25e 100644 --- a/pkgs/by-name/vd/vde2/package.nix +++ b/pkgs/by-name/vd/vde2/package.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { }) ]; + # Fix build with gcc15 + # https://github.com/virtualsquare/vde-2/commit/fedcb99c5f44c397f459ed0951a8fba4f4effb73 + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; From 257a65e31ca01e160b44d896ce700dc010a05a36 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 7 Oct 2025 17:19:50 +0300 Subject: [PATCH 408/542] unixODBCDrivers.mariadb: fix build with gcc15 - add patch from merged upstream PR that adds missing `#include ` https://www.github.com/mariadb-corporation/mariadb-connector-odbc/pull/63 https://github.com/mariadb-corporation/mariadb-connector-odbc/commit/a3ced654db2ef93de0a818f2d66171f6084e5f2d Fixes build failure with gcc15: ``` /build/source/driver/class/ColumnDefinition.h:55:10: error: 'uint8_t' does not name a type 55 | static uint8_t maxCharlen[]; | ^~~~~~~ /build/source/driver/class/ColumnDefinition.h:30:1: note: 'uint8_t' is defined in header ''; this is probably fixable by adding '#include ' 29 | #include "SQLString.h" +++ |+#include 30 | /build/source/driver/interface/CmdInformation.h:35:15: error: 'int64_t' was not declared in this scope 35 | std::vector batchRes; | ^~~~~~~ /build/source/driver/interface/CmdInformation.h:26:1: note: 'int64_t' is defined in header ''; this is probably fixable by adding '#include ' 25 | #include +++ |+#include 26 | ``` --- pkgs/development/libraries/unixODBCDrivers/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 9c6b657d0ee2..1cc6d281895d 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -61,6 +61,14 @@ ./mariadb-connector-odbc-unistd.patch ./mariadb-connector-odbc-musl.patch + + # Fix build with gcc15 + # https://github.com/mariadb-corporation/mariadb-connector-odbc/pull/63 + (fetchpatch { + name = "mariadb-connector-odbc-add-include-cstdint-gcc15.patch"; + url = "https://github.com/mariadb-corporation/mariadb-connector-odbc/commit/a3ced654db2ef93de0a818f2d66171f6084e5f2d.patch"; + hash = "sha256-GZITSryfRdAgNxZehasoBModGNZo575Dd5aokwNWzpY="; + }) ]; nativeBuildInputs = [ cmake ]; From e20fcb8e02fd96b978320c130b509141110a9125 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 2 Dec 2025 06:36:48 +0000 Subject: [PATCH 409/542] iproute2: 6.17.0 -> 6.18.0 Changes: https://lore.kernel.org/netdev/20251201091738.3a8b4303@phoenix.local/ --- pkgs/by-name/ip/iproute2/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index fd2e5d893031..62c00c8e7fd0 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -18,21 +18,13 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.17.0"; + version = "6.18.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-l4HllBCrfeqOn3m7EP8UiOY9EPy7cFA7lEJronqOLew="; + hash = "sha256-a6Ug4ZdeTFDckx7q6R6jfBmLihc3RIhfiJW4QyX51FY="; }; - patches = [ - (fetchurl { - name = "musl-redefinition.patch"; - url = "https://lore.kernel.org/netdev/20251012124002.296018-1-yureka@cyberchaos.dev/raw"; - hash = "sha256-8gSpZb/B5sMd2OilUQqg0FqM9y3GZd5Ch5AXV5wrCZQ="; - }) - ]; - postPatch = '' substituteInPlace Makefile \ --replace "CC := gcc" "CC ?= $CC" From 42cd179abeb7e1ed053d64f89fffa89c11249b72 Mon Sep 17 00:00:00 2001 From: Achmad Fathoni Date: Tue, 2 Dec 2025 17:06:14 +0700 Subject: [PATCH 410/542] python3Packages.ipython: 9.5.0 -> 9.7.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 2f846a81ae1d..f92475f19fe1 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "ipython"; - version = "9.5.0"; + version = "9.7.0"; outputs = [ "out" "man" @@ -45,7 +45,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-EpxEuUH+bZuC02/Hp8GBJ92x1vAvePhn9ALi463eMRM="; + hash = "sha256-X23ojJBaVmxqnWxACo/tVKY44fdUPReq4lURMyFrHk4="; }; build-system = [ setuptools ]; From 1fb95cb3d36a85778c77a0f56ea706b40e192f1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Dec 2025 12:50:51 +0000 Subject: [PATCH 411/542] xsimd: 13.2.0 -> 14.0.0 --- pkgs/by-name/xs/xsimd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xs/xsimd/package.nix b/pkgs/by-name/xs/xsimd/package.nix index 0a3cabfc2969..009cd74475a8 100644 --- a/pkgs/by-name/xs/xsimd/package.nix +++ b/pkgs/by-name/xs/xsimd/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xsimd"; - version = "13.2.0"; + version = "14.0.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; tag = finalAttrs.version; - hash = "sha256-L4ttJxP46uNwQAEUMoJ8rsc51Le2GeIGbT1kX7ZzcPA="; + hash = "sha256-ijNoHb6xC+OHJbUB4j1PRsoHMzjrnOHVoDRe/nKguDo="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ From 5ef2969e5584f5fffed3dd8cd7582a07f543bdd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Dec 2025 13:58:28 +0000 Subject: [PATCH 412/542] hwdata: 0.401 -> 0.402 --- pkgs/by-name/hw/hwdata/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index b8b15bd8ca18..e5b1cecf12ff 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hwdata"; - version = "0.401"; + version = "0.402"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${finalAttrs.version}"; - hash = "sha256-2NZwylrUfnzA0aE+xlVZ7QCpCzfW9DwGzRVHirt0TRU="; + hash = "sha256-akLI2MdF6BDwvSoKt1jhlMyhKQv4TWxLFZWF7ivIezA="; }; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) From 7e7c0d819ac08b6b35bb9f222f45e0fb8522e00c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Dec 2025 17:05:58 +0100 Subject: [PATCH 413/542] python3Packages.django_4: 4.2.26 -> 4.2.27 https://docs.djangoproject.com/en/4.2/releases/4.2.27/ https://www.djangoproject.com/weblog/2025/dec/02/security-releases/ Fixes: CVE-2025-13372, CVE-2025-64460 --- pkgs/development/python-modules/django/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 6ec59f663502..f9f028ae9a1b 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.26"; + version = "4.2.27"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-2NkkQcsY+BDvLGtvjYfGwgAK2S6LDbbcl7CwbwuF5a0="; + hash = "sha256-vdY85Ib2knRFLPmZZ6ojiD5R9diuvpVut1+nOVXSp0Y="; }; patches = [ From 1160854ac7ddd47f874008a772a1453c2183fc3a Mon Sep 17 00:00:00 2001 From: Leon Klingele Date: Tue, 2 Dec 2025 17:54:41 +0100 Subject: [PATCH 414/542] go_1_25: 1.25.4 -> 1.25.5 --- pkgs/development/compilers/go/1.25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index e807f81f4ab7..1a1455966f23 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25.4"; + version = "1.25.5"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-FgBDt/F7bWC1A2lDaRf9qNUDRkC6Oa4kMca5WoicyYw="; + hash = "sha256-IqX9CpHvzSihsFNxBrmVmygEth9Zw3WLUejlQpwalU8="; }; strictDeps = true; From efaa95e245745666099a81452d18a07d8c8efcc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Dec 2025 14:32:38 -0800 Subject: [PATCH 415/542] v4l-utils: make BPF support optional --- pkgs/by-name/v4/v4l-utils/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/v4/v4l-utils/package.nix b/pkgs/by-name/v4/v4l-utils/package.nix index b8adda9766ac..61f7bc3b867e 100644 --- a/pkgs/by-name/v4/v4l-utils/package.nix +++ b/pkgs/by-name/v4/v4l-utils/package.nix @@ -18,6 +18,8 @@ udevCheckHook, withUtils ? true, withGUI ? true, + # BPF support fail to cross compile, unable to find `linux/lirc.h` + withBPF ? stdenv.hostPlatform == stdenv.buildPlatform, alsa-lib, libGLU, qt6Packages, @@ -62,14 +64,11 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "gconv" stdenv.hostPlatform.isGnu) (lib.mesonEnable "qv4l2" withQt) (lib.mesonEnable "qvidcap" withQt) + (lib.mesonEnable "bpf" withBPF) (lib.mesonOption "udevdir" "${placeholder "out"}/lib/udev") ] ++ lib.optionals stdenv.hostPlatform.isGnu [ (lib.mesonOption "gconvsysdir" "${glibc.out}/lib/gconv") - ] - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # BPF support fail to cross compile, unable to find `linux/lirc.h` - (lib.mesonOption "bpf" "disabled") ]; postFixup = '' @@ -78,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - clang doxygen meson ninja @@ -86,15 +84,18 @@ stdenv.mkDerivation (finalAttrs: { perl udevCheckHook ] + ++ lib.optional withBPF clang ++ lib.optional withQt qt6Packages.wrapQtAppsHook; buildInputs = [ json_c - libbpf - libelf udev ] ++ lib.optional (!stdenv.hostPlatform.isGnu) argp-standalone + ++ lib.optionals withBPF [ + libbpf + libelf + ] ++ lib.optionals withQt [ alsa-lib qt6Packages.qt5compat From c66b12ff90768587735a54e94e0d448558cf5046 Mon Sep 17 00:00:00 2001 From: DavHau Date: Thu, 29 May 2025 13:39:50 +0700 Subject: [PATCH 416/542] make-symlinks-relative.sh: optimize - use multiple cores This optimizes the performance of the hook on machines with multiple cores. The previous implementation was slow, as it was launching two extra processes per symlink (readlink and ln) while not making use of multiprocessing. The following improvements were made: - don't even execute the hook if dontRewriteSymlinks is set - replace multiple find calls with single find call over all outputs - use xargs -P to process symlinks in parallel - add test to check that the hook operates as expected --- .../setup-hooks/make-symlinks-relative.sh | 56 ++++++------ pkgs/test/stdenv/default.nix | 7 +- pkgs/test/stdenv/hooks.nix | 86 +++++++++++++------ 3 files changed, 90 insertions(+), 59 deletions(-) diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh index b07b0c5ae804..478543afed11 100644 --- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh +++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh @@ -1,37 +1,35 @@ # symlinks are often created in postFixup # don't use fixupOutputHooks, it is before postFixup -postFixupHooks+=(_makeSymlinksRelativeInAllOutputs) +if [[ -z "${dontRewriteSymlinks-}" ]]; then + postFixupHooks+=(_makeSymlinksRelative) +fi + # For every symlink in $output that refers to another file in $output -# ensure that the symlink is relative. This removes references to the output -# has from the resulting store paths and thus the NAR files. +# ensure that the symlink is relative. +# This increases the chance that NAR files can be deduplicated. _makeSymlinksRelative() { - local symlinkTarget - - if [ "${dontRewriteSymlinks-}" ] || [ ! -e "$prefix" ]; then - return - fi - - while IFS= read -r -d $'\0' f; do - symlinkTarget=$(readlink "$f") - if [[ "$symlinkTarget"/ != "$prefix"/* ]]; then - # skip this symlink as it doesn't point to $prefix - continue - fi - - if [ ! -e "$symlinkTarget" ]; then - echo "the symlink $f is broken, it points to $symlinkTarget (which is missing)" - fi - - echo "rewriting symlink $f to be relative to $prefix" - ln -snrf "$symlinkTarget" "$f" - - done < <(find $prefix -type l -print0) -} - -_makeSymlinksRelativeInAllOutputs() { - local output + local prefixes + prefixes=() for output in $(getAllOutputNames); do - prefix="${!output}" _makeSymlinksRelative + [ ! -e "${!output}" ] && continue + prefixes+=( "${!output}" ) done + find "${prefixes[@]}" -type l -printf '%H\0%p\0' \ + | xargs -0 -n2 -r -P "$NIX_BUILD_CORES" sh -c ' + output="$1" + link="$2" + + linkTarget=$(readlink "$link") + + # only touch links that point inside the same output tree + [[ $linkTarget == "$output"/* ]] || exit 0 + + if [ ! -e "$linkTarget" ]; then + echo "the symlink $link is broken, it points to $linkTarget (which is missing)" + fi + + echo "making symlink relative: $link" + ln -snrf "$linkTarget" "$link" + ' _ } diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index cf09258d6fbc..ecc7bbaadac0 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -9,6 +9,9 @@ }: let + # tests can be based on builtins.derivation and bootstrapTools directly to minimize rebuilds + # see test 'make-symlinks-relative' in ./hooks.nix as an example. + bootstrapTools = stdenv.bootstrapTools; # early enough not to rebuild gcc but late enough to have patchelf earlyPkgs = stdenv.__bootPackages.stdenv.__bootPackages; earlierPkgs = @@ -223,7 +226,7 @@ in import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; - inherit lib; + inherit bootstrapTools lib; } ); @@ -433,7 +436,7 @@ in import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; - inherit lib; + inherit bootstrapTools lib; } ); diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index aa138040d50f..70daaf5d403e 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -1,4 +1,5 @@ { + bootstrapTools, stdenv, pkgs, lib, @@ -28,36 +29,65 @@ [[ -e $out/share/man/small-man.1.gz ]] ''; }; - make-symlinks-relative = stdenv.mkDerivation { - name = "test-make-symlinks-relative"; - outputs = [ - "out" - "man" - ]; - buildCommand = '' - mkdir -p $out/{bar,baz} - mkdir -p $man/share/{x,y} - source1="$out/bar/foo" - destination1="$out/baz/foo" - source2="$man/share/x/file1" - destination2="$man/share/y/file2" - echo foo > $source1 - echo foo > $source2 - ln -s $source1 $destination1 - ln -s $source2 $destination2 - echo "symlink before patching: $(readlink $destination1)" - echo "symlink before patching: $(readlink $destination2)" + # test based on bootstrapTools to minimize rebuilds + make-symlinks-relative = + (derivation { + name = "test-make-symlinks-relative"; + system = stdenv.system; + builder = "${bootstrapTools}/bin/bash"; + initialPath = "${bootstrapTools}"; + outputs = [ + "out" + "out2" + ]; + args = [ + "-c" + '' + set -euo pipefail + . ${../../stdenv/generic/setup.sh} + . ${../../build-support/setup-hooks/make-symlinks-relative.sh} - _makeSymlinksRelativeInAllOutputs + mkdir -p $out $out2 - echo "symlink after patching: $(readlink $destination1)" - ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) - ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1) - echo "symlink after patching: $(readlink $destination2)" - ([[ -e $destination2 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) - ([[ $(readlink $destination2) == "../x/file1" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1) - ''; - }; + # create symlink targets + touch $out/target $out2/target + + # link within out + ln -s $out/target $out/linkToOut + + # link across different outputs + ln -s $out2/target $out/linkToOut2 + + # broken link + ln -s $out/does-not-exist $out/brokenLink + + # call hook + _makeSymlinksRelative + + # verify link within out became relative + echo "readlink linkToOut: $(readlink $out/linkToOut)" + if test "$(readlink $out/linkToOut)" != 'target'; then + echo "Expected relative link, got: $(readlink $out/linkToOut)" + exit 1 + fi + + # verify link across outputs is still absolute + if test "$(readlink $out/linkToOut2)" != "$out2/target"; then + echo "Expected absolute link, got: $(readlink $out/linkToOut2)" + exit 1 + fi + + # verify broken link was made relative + if test "$(readlink $out/brokenLink)" != 'does-not-exist'; then + echo "Expected relative broken link, got: $(readlink $out/brokenLink)" + exit 1 + fi + '' + ]; + }) + // { + meta = { }; + }; move-docs = stdenv.mkDerivation { name = "test-move-docs"; buildCommand = '' From 367dac5dcf1d92186be6a3d4d430be5a29194224 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Dec 2025 00:25:03 +0100 Subject: [PATCH 417/542] python313: 3.13.9 -> 3.13.10 https://docs.python.org/release/3.13.10/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 2bc80e5df118..d347f2011bd7 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "13"; - patch = "9"; + patch = "10"; suffix = ""; }; - hash = "sha256-7V7zTNo2z6Lzo0DwfKx+eBT5HH88QR9tNWIyOoZsXGY="; + hash = "sha256-vGc8BDdaGj8ICMJ7qPBBGrgRrTkKh0AxjMucYPrY/Xc="; }; }; From a2ccc79edb1f5fe378d3818ca25e3fe9e3c9791f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Dec 2025 10:04:42 +0100 Subject: [PATCH 418/542] python314: 3.14.0 -> 3.14.1 https://docs.python.org/release/3.14.1/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index d347f2011bd7..d8fdc04a097f 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -91,10 +91,10 @@ sourceVersion = { major = "3"; minor = "14"; - patch = "0"; + patch = "1"; suffix = ""; }; - hash = "sha256-Ipna5ULTlc44g6ygDTyRAwfNaOCy9zNgmMjnt+7p8+k="; + hash = "sha256-jfoIsZWdnRWDihwtq3fcjY/0pVOh7QRt+svICVxtQvw="; inherit passthruFun; }; From 95c583a64d975e9911f73c6b86810f547ee52974 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 3 Dec 2025 17:17:52 +0100 Subject: [PATCH 419/542] sdl3: 3.2.26 -> 3.2.28 Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/sdl3/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 0e5feb85776a..48ef594995ad 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -61,7 +61,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; - version = "3.2.26"; + version = "3.2.28"; outputs = [ "lib" @@ -74,18 +74,14 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL"; tag = "release-${finalAttrs.version}"; - hash = "sha256-edcub/zeho4mB3tItp+PSD5l+H6jUPm3seiBP6ppT0k="; + hash = "sha256-nfnvzog1bON2IaBOeWociV82lmRY+qXgdeXBe6GYlww="; }; postPatch = # Tests timeout on Darwin - # `testtray` loads assets from a relative path, which we are patching to be absolute lib.optionalString (finalAttrs.finalPackage.doCheck) '' substituteInPlace test/CMakeLists.txt \ --replace-fail 'set(noninteractive_timeout 10)' 'set(noninteractive_timeout 30)' - - substituteInPlace test/testtray.c \ - --replace-warn '../test/' '${placeholder "installedTests"}/share/assets/' '' + lib.optionalString waylandSupport '' substituteInPlace src/video/wayland/SDL_waylandmessagebox.c \ From 9081cd4c6df9c9b665057801f78442dab011c2c6 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 3 Dec 2025 17:21:13 +0100 Subject: [PATCH 420/542] sdl2-compat: 2.32.58 -> 2.32.60 Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/sdl2-compat/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index e16eb5927cec..fde780a23042 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -2,7 +2,6 @@ cmake, lib, fetchFromGitHub, - fetchpatch2, ninja, sdl3, stdenv, @@ -31,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sdl2-compat"; - version = "2.32.58"; + version = "2.32.60"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "sdl2-compat"; tag = "release-${finalAttrs.version}"; - hash = "sha256-Ngmr/KG5dQ1IDVafn2Jw/29hFCzPGKc9GOenT/4fsIM="; + hash = "sha256-8nhSyifEeYEZj9tqid1x67jhxqmrR61NwQ/g0Z8vbw8="; }; nativeBuildInputs = [ @@ -74,12 +73,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./find-headers.patch - - # https://github.com/libsdl-org/sdl2-compat/pull/545 - (fetchpatch2 { - url = "https://github.com/libsdl-org/sdl2-compat/commit/b799076c72c2492224e81544f58f92b737cccbd3.patch?full_index=1"; - hash = "sha256-fAc8yBlT+XFHDKcF4MFgBAz2WtXGmhYzNNrjaGSr+do="; - }) ]; setupHook = ./setup-hook.sh; From 3634e63bc2c87a1e155a188eecc4cd7e2bf20ce9 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 3 Dec 2025 17:22:26 +0100 Subject: [PATCH 421/542] python3Packages.pygame-ce: remove no longer needed patches Signed-off-by: Marcin Serwin --- ...rmat-instead-of-creating-it-manually.patch | 151 ------------------ .../python-modules/pygame-ce/default.nix | 5 +- .../pygame-ce/skip-rle-tests.patch | 8 - 3 files changed, 1 insertion(+), 163 deletions(-) delete mode 100644 pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch diff --git a/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch b/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch deleted file mode 100644 index 1e1f407dbc19..000000000000 --- a/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 3e3fbdc11ab00c4c04eb68c40b23979245c987fa Mon Sep 17 00:00:00 2001 -From: Marcin Serwin -Date: Sat, 8 Nov 2025 19:47:41 +0100 -Subject: [PATCH] Use SDL_AllocFormat instead of creating it manually - -According to the docs, `SDL_PixelFormat` is a read-only structure. -Creating it manually leaves out some important fields like `format` and -`next` pointer to be undefined. - -Signed-off-by: Marcin Serwin ---- - src_c/surface.c | 80 ++++++++++++++----------------------------------- - 1 file changed, 23 insertions(+), 57 deletions(-) - -diff --git a/src_c/surface.c b/src_c/surface.c -index f118a4db4..e51e80554 100644 ---- a/src_c/surface.c -+++ b/src_c/surface.c -@@ -1844,9 +1844,8 @@ surf_convert(pgSurfaceObject *self, PyObject *args) - */ - int bpp = 0; - SDL_Palette *palette = SDL_AllocPalette(default_palette_size); -- SDL_PixelFormat format; -+ Uint32 format_enum = 0; - -- memcpy(&format, surf->format, sizeof(format)); - if (pg_IntFromObj(argobject, &bpp)) { - Uint32 Rmask, Gmask, Bmask, Amask; - -@@ -1904,30 +1903,23 @@ surf_convert(pgSurfaceObject *self, PyObject *args) - "nonstandard bit depth given"); - } - } -- format.Rmask = Rmask; -- format.Gmask = Gmask; -- format.Bmask = Bmask; -- format.Amask = Amask; -+ format_enum = SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, -+ Bmask, Amask); - } - else if (PySequence_Check(argobject) && - PySequence_Size(argobject) == 4) { -- Uint32 mask; -+ Uint32 Rmask, Gmask, Bmask, Amask; - -- if (!pg_UintFromObjIndex(argobject, 0, &format.Rmask) || -- !pg_UintFromObjIndex(argobject, 1, &format.Gmask) || -- !pg_UintFromObjIndex(argobject, 2, &format.Bmask) || -- !pg_UintFromObjIndex(argobject, 3, &format.Amask)) { -+ if (!pg_UintFromObjIndex(argobject, 0, &Rmask) || -+ !pg_UintFromObjIndex(argobject, 1, &Gmask) || -+ !pg_UintFromObjIndex(argobject, 2, &Bmask) || -+ !pg_UintFromObjIndex(argobject, 3, &Amask)) { - pgSurface_Unprep(self); - return RAISE(PyExc_ValueError, - "invalid color masks given"); - } -- mask = -- format.Rmask | format.Gmask | format.Bmask | format.Amask; -- for (bpp = 0; bpp < 32; ++bpp) { -- if (!(mask >> bpp)) { -- break; -- } -- } -+ format_enum = SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, -+ Bmask, Amask); - } - else { - pgSurface_Unprep(self); -@@ -1935,22 +1927,11 @@ surf_convert(pgSurfaceObject *self, PyObject *args) - PyExc_ValueError, - "invalid argument specifying new format to convert to"); - } -- format.BitsPerPixel = (Uint8)bpp; -- format.BytesPerPixel = (bpp + 7) / 8; -- if (PG_FORMAT_BitsPerPixel((&format)) > 8) { -- /* Allow a 8 bit source surface with an empty palette to be -- * converted to a format without a palette (pygame-ce issue -- * #146). If the target format has a non-NULL palette pointer -- * then SDL_ConvertSurface checks that the palette is not -- * empty-- that at least one entry is not black. -- */ -- format.palette = NULL; -- } -- if (SDL_ISPIXELFORMAT_INDEXED(SDL_MasksToPixelFormatEnum( -- PG_FORMAT_BitsPerPixel((&format)), format.Rmask, -- format.Gmask, format.Bmask, format.Amask))) { -+ SDL_PixelFormat *format = SDL_AllocFormat(format_enum); -+ -+ if (SDL_ISPIXELFORMAT_INDEXED(format_enum)) { - if (SDL_ISPIXELFORMAT_INDEXED(PG_SURF_FORMATENUM(surf))) { -- SDL_SetPixelFormatPalette(&format, surf->format->palette); -+ SDL_SetPixelFormatPalette(format, surf->format->palette); - } - else { - /* Give the surface something other than an all white -@@ -1958,12 +1939,13 @@ surf_convert(pgSurfaceObject *self, PyObject *args) - */ - SDL_SetPaletteColors(palette, default_palette_colors, 0, - default_palette_size); -- SDL_SetPixelFormatPalette(&format, palette); -+ SDL_SetPixelFormatPalette(format, palette); - } - } -- newsurf = PG_ConvertSurface(surf, &format); -+ newsurf = PG_ConvertSurface(surf, format); - SDL_SetSurfaceBlendMode(newsurf, SDL_BLENDMODE_NONE); - SDL_FreePalette(palette); -+ SDL_FreeFormat(format); - } - } - else { -@@ -4540,29 +4522,13 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj, - } - else { - SDL_PixelFormat *fmt = src->format; -- SDL_PixelFormat newfmt; -+ SDL_PixelFormat *newfmt = -+ SDL_AllocFormat(SDL_MasksToPixelFormatEnum( -+ fmt->BitsPerPixel, fmt->Rmask, fmt->Gmask, fmt->Bmask, 0)); - -- newfmt.palette = 0; /* Set NULL (or SDL gets confused) */ --#if SDL_VERSION_ATLEAST(3, 0, 0) -- newfmt.bits_per_pixel = fmt->bits_per_pixel; -- newfmt.bytes_per_pixel = fmt->bytes_per_pixel; --#else -- newfmt.BitsPerPixel = fmt->BitsPerPixel; -- newfmt.BytesPerPixel = fmt->BytesPerPixel; --#endif -- newfmt.Amask = 0; -- newfmt.Rmask = fmt->Rmask; -- newfmt.Gmask = fmt->Gmask; -- newfmt.Bmask = fmt->Bmask; -- newfmt.Ashift = 0; -- newfmt.Rshift = fmt->Rshift; -- newfmt.Gshift = fmt->Gshift; -- newfmt.Bshift = fmt->Bshift; -- newfmt.Aloss = 0; -- newfmt.Rloss = fmt->Rloss; -- newfmt.Gloss = fmt->Gloss; -- newfmt.Bloss = fmt->Bloss; -- src = PG_ConvertSurface(src, &newfmt); -+ src = PG_ConvertSurface(src, newfmt); -+ -+ SDL_FreeFormat(newfmt); - if (src) { - #if SDL_VERSION_ATLEAST(3, 0, 0) - result = SDL_BlitSurface(src, srcrect, dst, dstrect) ? 0 : -1; --- -2.51.0 - diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 1f132ab7fab0..ed120e12e761 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -62,11 +62,8 @@ buildPythonPackage rec { ); }) - # Can be removed with the next SDL3 bump. + # Can be removed after the SDL 3.4.0 bump. ./skip-rle-tests.patch - - # https://github.com/pygame-community/pygame-ce/pull/3639 - ./0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch ]; postPatch = '' diff --git a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch index f7ecc1ccb330..6b488f0c880a 100644 --- a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch +++ b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch @@ -2,14 +2,6 @@ diff --git a/test/surface_test.py b/test/surface_test.py index c2c91f4f5..58d916de8 100644 --- a/test/surface_test.py +++ b/test/surface_test.py -@@ -404,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase): - finally: - pygame.display.quit() - -+ @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/pull/14429") - def test_solarwolf_rle_usage_2(self): - """Test for RLE status after setting alpha""" - @@ -435,6 +436,7 @@ class SurfaceTypeTest(unittest.TestCase): finally: pygame.display.quit() From 1aa8fda5643d809869e11729d47563e3d0f64e12 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Dec 2025 20:42:22 +0100 Subject: [PATCH 422/542] lvm2: 2.03.35 -> 2.03.37 https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_36 https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_37 --- pkgs/os-specific/linux/lvm2/2_03.nix | 4 +-- pkgs/os-specific/linux/lvm2/common.nix | 2 -- .../lvm2/fix-manpage-reproducibility.patch | 31 ------------------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 19e62bd4a2f7..2081ba8eacc2 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.35"; - hash = "sha256-6/KLNCdTXitavZmRzYObYWIqDb+4yG3w968fadyqg3E="; + version = "2.03.37"; + hash = "sha256-sCZWzDmi+GpwLEMtqw0DF+EhEfyp1iOhjxucP4e4ggA="; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index c357a3e7ebdc..24cd4b41192f 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -143,8 +143,6 @@ stdenv.mkDerivation rec { } )) ./fix-stdio-usage.patch - # https://gitlab.com/lvmteam/lvm2/-/merge_requests/33 - ./fix-manpage-reproducibility.patch ]; doCheck = false; # requires root diff --git a/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch b/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch deleted file mode 100644 index 1e687f3630cc..000000000000 --- a/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 950f219ed287358df8c128f7e22989177a8de47c -Author: Arnout Engelen -Date: Mon Aug 25 15:55:44 2025 +0200 - - man: simplify vmautoactivation(7) - - Previously this was hard-coded to: "Autoactivation commands use a number - of temp files in /run/lvm (with the expectation that /run is cleared - between boots.)" - - Since c1bfc8737f08bf7558b2d788e9756f895cd9eaaa it was made more generic, - but on some systems this logic leads to "Autoactivation commands use a - number of temp files in /run/lvm (with the expectation that /var/run - is cleared between boots)." which I'd say adds more confusion than it - solves. - -diff --git a/man/lvmautoactivation.7_main b/man/lvmautoactivation.7_main -index e55943b29..9d429055c 100644 ---- a/man/lvmautoactivation.7_main -+++ b/man/lvmautoactivation.7_main -@@ -175,9 +175,7 @@ is reserved for udev output.) - . - Autoactivation commands use a number of temp files in - .I #DEFAULT_RUN_DIR# --(with the expectation that --.I #DEFAULT_PID_DIR# --is cleared between boots). -+(with the expectation that it is cleared between boots). - . - .TP - .B pvs_online From 485617f4a73549497cc24aed1d8cf7bee71a1dcd Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Dec 2025 20:47:42 +0100 Subject: [PATCH 423/542] nixosTests.lvm2: drop 5.4 kernel and add 6.12 5.4 is not in nixpkgs anymore and 6.12 is the new default --- nixos/tests/lvm2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix index 58eef6e0ccef..a03ada67cdac 100644 --- a/nixos/tests/lvm2/default.nix +++ b/nixos/tests/lvm2/default.nix @@ -4,11 +4,11 @@ pkgs ? import ../../.. { inherit system config; }, lib ? pkgs.lib, kernelVersionsToTest ? [ - "5.4" "5.10" "5.15" "6.1" "6.6" + "6.12" "latest" ], }: From 138a3a85e0b08a75c49668ba6d5bf493bf4bb833 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 3 Dec 2025 21:27:32 +0000 Subject: [PATCH 424/542] nghttp3: 1.13.0 -> 1.13.1 Changes: https://github.com/ngtcp2/nghttp3/releases/tag/v1.13.1 --- pkgs/by-name/ng/nghttp3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix index 3885fc9b8ab7..410708dbb7f0 100644 --- a/pkgs/by-name/ng/nghttp3/package.nix +++ b/pkgs/by-name/ng/nghttp3/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "nghttp3"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2"; - hash = "sha256-hl22uuyA5zo7cXIJVgajvK85I0iQbhBBGtaQb6SfRy4="; + hash = "sha256-8lH+Vm4oIdz9BChVN15QsevqxfHKeUjQDiFWPFgiHiA="; }; outputs = [ From dd7694044310bb25065267502e90c106bb9d5897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 3 Dec 2025 14:31:05 -0800 Subject: [PATCH 425/542] v4l-utils: enable BPF support in cross builds --- pkgs/by-name/v4/v4l-utils/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/v4/v4l-utils/package.nix b/pkgs/by-name/v4/v4l-utils/package.nix index 61f7bc3b867e..898ea75eb8bc 100644 --- a/pkgs/by-name/v4/v4l-utils/package.nix +++ b/pkgs/by-name/v4/v4l-utils/package.nix @@ -18,8 +18,7 @@ udevCheckHook, withUtils ? true, withGUI ? true, - # BPF support fail to cross compile, unable to find `linux/lirc.h` - withBPF ? stdenv.hostPlatform == stdenv.buildPlatform, + withBPF ? true, alsa-lib, libGLU, qt6Packages, From 24fe32a370c900048de38ade2d184f806c1692c0 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Thu, 23 Oct 2025 11:24:04 +0300 Subject: [PATCH 426/542] tiledb: fix build with gcc15 - add patch from merged upstream PR: https://www.github.com/TileDB-Inc/TileDB/pull/5612 https://github.com/TileDB-Inc/TileDB/commit/4f946ad57fe823c3f53c06bf29dc18799ec6395a Fixes build failure with gcc15: ``` /build/source/external/blosc/src/shuffle.c:30:15: error: 'bool' cannot be defined via 'typedef' 30 | typedef _Bool bool; | ^~~~ /build/source/external/blosc/src/shuffle.c:30:15: note: 'bool' is a keyword with '-std=c23' onwards ``` --- pkgs/by-name/ti/tiledb/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index 1286d54fb83a..834048882e0f 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -56,6 +56,14 @@ stdenv.mkDerivation rec { extraPrefix = "tiledb/sm/serialization/"; hash = "sha256-5z/eJEHl+cnWRf1sMULodJyhmNh5KinDLlL1paMNiy4="; }) + + # Fix build with gcc15 + # https://github.com/TileDB-Inc/TileDB/pull/5612 + (fetchpatch { + name = "tiledb-set-c-version-to-c99.patch"; + url = "https://github.com/TileDB-Inc/TileDB/commit/4f946ad57fe823c3f53c06bf29dc18799ec6395a.patch"; + hash = "sha256-chdaa6Ysqeb3p+FcWp7GTnAzgShoPGSCErmIGn+Q4tA="; + }) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ]; From b8a9596cd32b58ae5d277641b78a01e9588dec0d Mon Sep 17 00:00:00 2001 From: Brian Lyles Date: Wed, 3 Dec 2025 22:39:48 -0600 Subject: [PATCH 427/542] maintainers: add zivarah --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/version-management/git/default.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 06c637723ef4..9a6416f3c1aa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -29233,6 +29233,12 @@ email = "rasmus@liaskar.net"; githubId = 152716976; }; + zivarah = { + name = "Brian Lyles"; + github = "zivarah"; + email = "brianmlyles@gmail.com"; + githubId = 1123282; + }; zlepper = { name = "Rasmus Hansen"; github = "zlepper"; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 5ca46db3dcf9..b8017f1247dd 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -565,6 +565,7 @@ stdenv.mkDerivation (finalAttrs: { kashw2 me-and philiptaron + zivarah ]; mainProgram = "git"; }; From 37241159a4002a2d5deef61dfe66a9740a00094b Mon Sep 17 00:00:00 2001 From: Brian Lyles Date: Fri, 28 Nov 2025 20:58:56 -0500 Subject: [PATCH 428/542] git: 2.51.2 -> 2.52.0 A patch is needed to address one newly-failing test. The patch is pulled from a submission to the upstream mailing list that has not yet been commented on or accepted, but trivially addresses the failure in nixpkgs by updating the test itself. --- pkgs/applications/version-management/git/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index b8017f1247dd..5c2e61907f10 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -60,7 +60,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.51.2"; + version = "2.52.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { }.tar.xz" else "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-Iz1xQ6LVjmB1Xu6bdvVZ7HPqKzwpf1tQMWKs6VlmtOM="; + hash = "sha256-PNj+6G9pqUnLYQ/ujNkmTmhz0H+lhBH2Bgs9YnKe18U="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -109,6 +109,14 @@ stdenv.mkDerivation (finalAttrs: { ./git-sh-i18n.patch # Do not search for sendmail in /usr, only in $PATH ./git-send-email-honor-PATH.patch + # Address test failure (new in 2.52.0) caused by `git-gui--askyesno` being + # installed by `make install`. + (fetchurl { + name = "expect-gui--askyesno-failure-in-t1517.patch"; + url = "https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/raw"; + hash = "sha256-vvhbvg74OIMzfksHiErSnjOZ+W0M/T9J8GOQ4E4wKbU="; + }) + ] ++ lib.optionals withSsh [ # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of From b2a4edc3a2b444f93c85cefd2c82e81be4217b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 4 Dec 2025 08:14:51 +0100 Subject: [PATCH 429/542] libpng: 1.6.51 -> 1.6.52 (CVE-2025-66293) https://www.openwall.com/lists/oss-security/2025/12/03/5 https://raw.githubusercontent.com/pnggroup/libpng/refs/tags/v1.6.52/CHANGES --- pkgs/development/libraries/libpng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index d0a5b5d6a83c..3f284ba382ce 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.51"; + version = "1.6.52"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; - hash = "sha256-oFCoktO0p7sBDDqVxzAeSWVtcqZPH8cJqQuK3tGSvtI="; + hash = "sha256-Nr1yYijsk6O2wi/bSelKZ7FvL+mzm3i3y2V3KWZmHMw="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" From c845fe82dadc2883c1a858e770293c1936dfc508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 4 Dec 2025 09:09:14 +0100 Subject: [PATCH 430/542] xorg.xkbcomp: 1.4.7 -> 1.5.0 (security) CVE-2018-15853 CVE-2018-15859 CVE-2018-15861 CVE-2018-15863 https://lists.x.org/archives/xorg-announce/2025-December/003644.html https://lists.x.org/archives/xorg-announce/2025-December/003645.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9ac3233310e9..3d9641cbc16d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2643,11 +2643,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xkbcomp"; - version = "1.4.7"; + version = "1.5.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz"; - sha256 = "0xqzz209m9i43jbyrf2lh4xdbyhzzzn9mis2f2c32kplwla82a0a"; + url = "mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz"; + sha256 = "0q3092w42w9wyfr5zf3ymkmzlqr24z6kz6ypkinxnxh7c0k1zhra"; }; hardeningDisable = [ "bindnow" diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index d1ad67f3350c..477b8cec5ad5 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -5,7 +5,7 @@ mirror://xorg/individual/app/xfd-1.1.4.tar.xz mirror://xorg/individual/app/xfs-1.2.2.tar.xz mirror://xorg/individual/app/xinit-1.4.4.tar.xz mirror://xorg/individual/app/xinput-1.6.4.tar.xz -mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz +mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz mirror://xorg/individual/app/xload-1.2.0.tar.xz From 083d516ae413527dfe385c0b21d51a52a6ad78f0 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sat, 25 Oct 2025 20:57:05 +0300 Subject: [PATCH 431/542] rocmPackages.rocm-runtime: fix build with gcc15 - add patch from upstream commit: https://github.com/ROCm/ROCR-Runtime/commit/5cc61b714d5b59ed5405639a37a582d839e6ebe9 Fixes build failure with gcc15: ``` In file included from /build/source/runtime/hsa-runtime/libamdhsacode/amd_elf_image.cpp:43: /build/source/runtime/hsa-runtime/core/inc/amd_elf_image.hpp:62:15: error: 'uint64_t' does not name a type 62 | virtual uint64_t type() const = 0; | ^~~~~~~~ /build/source/runtime/hsa-runtime/core/inc/amd_elf_image.hpp:50:1: note: 'uint64_t' is defined in header ''; this is probably fixable by adding '#include 49 | #include +++ |+#include 50 | ``` --- pkgs/development/rocm-modules/6/rocm-runtime/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix index 56d4fb253490..cdd7037c83c3 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix @@ -79,6 +79,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/ROCR-Runtime/commit/41bfc66aef437a5b349f71105fa4b907cc7e17d5.patch"; hash = "sha256-A7VhPR3eSsmjq2cTBSjBIz9i//WiNjoXm0EsRKtF+ns="; }) + # Fix build with gcc15 + (fetchpatch { + # [PATCH] rocr:Add missing cstdint include + url = "https://github.com/ROCm/ROCR-Runtime/commit/5cc61b714d5b59ed5405639a37a582d839e6ebe9.patch"; + hash = "sha256-IPxDShpoFB0PjCG+zwFbnW9IBTCG3G2o9sfITGs+bN4="; + }) # This causes a circular dependency, aqlprofile relies on hsa-runtime64 # which is part of rocm-runtime # Worked around by having rocprofiler load aqlprofile directly From 08112c247613340d7ecef57dd4928ccf52d79ea5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Nov 2025 13:03:38 +0000 Subject: [PATCH 432/542] apache-orc: 2.1.2 -> 2.2.1 Diff: https://github.com/apache/orc/compare/v2.1.2...v2.2.1 Changelog: https://github.com/apache/orc/releases/tag/v2.2.1 --- pkgs/by-name/ap/apache-orc/package.nix | 27 +++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix index c22580231973..577eb5013e7e 100644 --- a/pkgs/by-name/ap/apache-orc/package.nix +++ b/pkgs/by-name/ap/apache-orc/package.nix @@ -3,32 +3,37 @@ stdenv, fetchFromGitHub, fetchurl, - fetchpatch, cmake, gtest, lz4, - protobuf_30, + protobuf, snappy, zlib, zstd, }: let - orc-format = fetchurl { - name = "orc-format-1.1.0.tar.gz"; - url = "https://www.apache.org/dyn/closer.lua/orc/orc-format-1.1.0/orc-format-1.1.0.tar.gz?action=download"; - hash = "sha256-1KesdsVEKr9xGeLLhOcbZ34HWv9TUYqoZgVeLq0EUNc="; - }; + orc-format = + let + version = "1.1.1"; + name = "orc-format-${version}"; + archiveName = "${name}.tar.gz"; + in + fetchurl { + name = archiveName; + url = "https://www.apache.org/dyn/closer.lua/orc/${name}/${archiveName}?action=download"; + hash = "sha256-WE3+KkIClGF4/Y/H0SOb54BbntRZarIELe5znniAmSs="; + }; in stdenv.mkDerivation (finalAttrs: { pname = "apache-orc"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "apache"; repo = "orc"; tag = "v${finalAttrs.version}"; - hash = "sha256-hNKzqNOagBJOWQRebkVHIuvqfpk9Mi30bu4z7dGbsxk="; + hash = "sha256-H7nowl2pq31RIAmTUz15x48Wc99MljFJboc4F7Ln/zk="; }; nativeBuildInputs = [ @@ -38,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest lz4 - protobuf_30 + protobuf snappy zlib zstd @@ -62,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { GTEST_HOME = gtest.dev; LZ4_ROOT = lz4; ORC_FORMAT_URL = orc-format; - PROTOBUF_HOME = protobuf_30; + PROTOBUF_HOME = protobuf; SNAPPY_ROOT = snappy.dev; ZLIB_ROOT = zlib.dev; ZSTD_ROOT = zstd.dev; From ae4f7fd1e9478b043606132b87c22c13198eb037 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Dec 2025 02:40:35 +0100 Subject: [PATCH 433/542] cpython: fix gh-142218 on 3.13.10 and 3.14.1 Fixes split table dictionary crash regression. --- .../python/cpython/3.13/gh-142218.patch | 66 ++++++++++++++++++ .../python/cpython/3.14/gh-142218.patch | 69 +++++++++++++++++++ .../interpreters/python/cpython/default.nix | 4 ++ 3 files changed, 139 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.13/gh-142218.patch create mode 100644 pkgs/development/interpreters/python/cpython/3.14/gh-142218.patch diff --git a/pkgs/development/interpreters/python/cpython/3.13/gh-142218.patch b/pkgs/development/interpreters/python/cpython/3.13/gh-142218.patch new file mode 100644 index 000000000000..2a8aaf9aeaa7 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.13/gh-142218.patch @@ -0,0 +1,66 @@ +From 1a75c0fb054db6910fc2b74c99911329b80e25b5 Mon Sep 17 00:00:00 2001 +From: Sam Gross +Date: Thu, 4 Dec 2025 02:46:24 -0500 +Subject: [PATCH] [3.13] gh-142218: Fix split table dictionary crash + (gh-142229) (gh-142245) + +This fixes a regression introduced in gh-140558. The interpreter would +crash if we inserted a non `str` key into a split table that matches an +existing key. +(cherry picked from commit 547d8daf780646e2800bec598ed32085817c8606) +--- + Lib/test/test_dict.py | 8 ++++++++ + .../2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst | 2 ++ + Objects/dictobject.c | 10 +++++++--- + 3 files changed, 17 insertions(+), 3 deletions(-) + create mode 100644 Misc/NEWS.d/next/Core and Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst + +diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py +index 5c3889550953dd..c7b6f64b53b42f 100644 +--- a/Lib/test/test_dict.py ++++ b/Lib/test/test_dict.py +@@ -1674,6 +1674,14 @@ def __eq__(self, other): + + self.assertEqual(len(d), 1) + ++ def test_split_table_update_with_str_subclass(self): ++ class MyStr(str): pass ++ class MyClass: pass ++ obj = MyClass() ++ obj.attr = 1 ++ obj.__dict__[MyStr('attr')] = 2 ++ self.assertEqual(obj.attr, 2) ++ + + class CAPITest(unittest.TestCase): + +diff --git a/Misc/NEWS.d/next/Core and Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst b/Misc/NEWS.d/next/Core and Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst +new file mode 100644 +index 00000000000000..a8ce0fc65267d5 +--- /dev/null ++++ b/Misc/NEWS.d/next/Core and Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst +@@ -0,0 +1,2 @@ ++Fix crash when inserting into a split table dictionary with a non ++:class:`str` key that matches an existing key. +diff --git a/Objects/dictobject.c b/Objects/dictobject.c +index 4a88e08d1da52e..c987af31c45dd1 100644 +--- a/Objects/dictobject.c ++++ b/Objects/dictobject.c +@@ -1873,10 +1873,14 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp, + uint64_t new_version = _PyDict_NotifyEvent( + interp, PyDict_EVENT_MODIFIED, mp, key, value); + assert(old_value != NULL); +- assert(!_PyDict_HasSplitTable(mp)); + if (DK_IS_UNICODE(mp->ma_keys)) { +- PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix]; +- STORE_VALUE(ep, value); ++ if (_PyDict_HasSplitTable(mp)) { ++ STORE_SPLIT_VALUE(mp, ix, value); ++ } ++ else { ++ PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix]; ++ STORE_VALUE(ep, value); ++ } + } + else { + PyDictKeyEntry *ep = &DK_ENTRIES(mp->ma_keys)[ix]; diff --git a/pkgs/development/interpreters/python/cpython/3.14/gh-142218.patch b/pkgs/development/interpreters/python/cpython/3.14/gh-142218.patch new file mode 100644 index 000000000000..347ba638c153 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.14/gh-142218.patch @@ -0,0 +1,69 @@ +From 319c6a2ae1ea033d5aea09a43acbc8d451764869 Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Thu, 4 Dec 2025 01:03:18 +0100 +Subject: [PATCH] [3.14] gh-142218: Fix split table dictionary crash + (gh-142229) (gh-142244) + +This fixes a regression introduced in gh-140558. The interpreter would +crash if we inserted a non `str` key into a split table that matches an +existing key. +(cherry picked from commit 547d8daf780646e2800bec598ed32085817c8606) + +Co-authored-by: Sam Gross +--- + Lib/test/test_dict.py | 8 ++++++++ + .../2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst | 2 ++ + Objects/dictobject.c | 10 +++++++--- + 3 files changed, 17 insertions(+), 3 deletions(-) + create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst + +diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py +index 2e6c2bbdf19409..665b3e843dd3a5 100644 +--- a/Lib/test/test_dict.py ++++ b/Lib/test/test_dict.py +@@ -1621,6 +1621,14 @@ def __eq__(self, other): + + self.assertEqual(len(d), 1) + ++ def test_split_table_update_with_str_subclass(self): ++ class MyStr(str): pass ++ class MyClass: pass ++ obj = MyClass() ++ obj.attr = 1 ++ obj.__dict__[MyStr('attr')] = 2 ++ self.assertEqual(obj.attr, 2) ++ + + class CAPITest(unittest.TestCase): + +diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst +new file mode 100644 +index 00000000000000..a8ce0fc65267d5 +--- /dev/null ++++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst +@@ -0,0 +1,2 @@ ++Fix crash when inserting into a split table dictionary with a non ++:class:`str` key that matches an existing key. +diff --git a/Objects/dictobject.c b/Objects/dictobject.c +index 1b4640f9649569..0eb00410cf41eb 100644 +--- a/Objects/dictobject.c ++++ b/Objects/dictobject.c +@@ -1863,10 +1863,14 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp, + if (old_value != value) { + _PyDict_NotifyEvent(interp, PyDict_EVENT_MODIFIED, mp, key, value); + assert(old_value != NULL); +- assert(!_PyDict_HasSplitTable(mp)); + if (DK_IS_UNICODE(mp->ma_keys)) { +- PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix]; +- STORE_VALUE(ep, value); ++ if (_PyDict_HasSplitTable(mp)) { ++ STORE_SPLIT_VALUE(mp, ix, value); ++ } ++ else { ++ PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix]; ++ STORE_VALUE(ep, value); ++ } + } + else { + PyDictKeyEntry *ep = &DK_ENTRIES(mp->ma_keys)[ix]; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 2c754ba43fc7..e7812913654b 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -399,6 +399,10 @@ stdenv.mkDerivation (finalAttrs: { # backport fix for https://github.com/python/cpython/issues/95855 ./platform-triplet-detection.patch ] + ++ optionals (version == "3.13.10" || version == "3.14.1") [ + # https://github.com/python/cpython/issues/142218 + ./${lib.versions.majorMinor version}/gh-142218.patch + ] ++ optionals (stdenv.hostPlatform.isMinGW) ( let # https://src.fedoraproject.org/rpms/mingw-python3 From 8b6f9f39cc2bc2597c949e8c6d885aff77d2b2f4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Nov 2025 13:12:52 +0000 Subject: [PATCH 434/542] arrow-cpp: 20.0.0 -> 22.0.0 Diff: https://github.com/apache/arrow/compare/apache-arrow-20.0.0...apache-arrow-22.0.0 Changelog: https://arrow.apache.org/release/22.0.0.html --- pkgs/by-name/ar/arrow-cpp/package.nix | 109 +++++++++++++------------- 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 2a5e0d03d7a4..869e4946ee24 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -188,55 +188,60 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" - "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" - "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" - "-DARROW_BUILD_TESTS=${if enableShared then "ON" else "OFF"}" - "-DARROW_BUILD_INTEGRATION=ON" - "-DARROW_BUILD_UTILITIES=ON" - "-DARROW_EXTRA_ERROR_CONTEXT=ON" - "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" - "-DARROW_DEPENDENCY_SOURCE=SYSTEM" - "-Dxsimd_SOURCE=AUTO" - "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" - "-DARROW_COMPUTE=ON" - "-DARROW_CSV=ON" - "-DARROW_DATASET=ON" - "-DARROW_FILESYSTEM=ON" - "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}" - "-DARROW_HDFS=ON" - "-DARROW_IPC=ON" - "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" - "-DARROW_JSON=ON" - "-DARROW_USE_GLOG=ON" - "-DARROW_WITH_BACKTRACE=ON" - "-DARROW_WITH_BROTLI=ON" - "-DARROW_WITH_BZ2=ON" - "-DARROW_WITH_LZ4=ON" - "-DARROW_WITH_NLOHMANN_JSON=ON" - "-DARROW_WITH_SNAPPY=ON" - "-DARROW_WITH_UTF8PROC=ON" - "-DARROW_WITH_ZLIB=ON" - "-DARROW_WITH_ZSTD=ON" - "-DARROW_MIMALLOC=ON" - "-DARROW_SUBSTRAIT=ON" - "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}" - "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}" - "-DARROW_S3=${if enableS3 then "ON" else "OFF"}" - "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}" - "-DARROW_ORC=ON" + (lib.cmakeBool "CMAKE_FIND_PACKAGE_PREFER_CONFIG" true) + (lib.cmakeBool "ARROW_BUILD_SHARED" enableShared) + (lib.cmakeBool "ARROW_BUILD_STATIC" (!enableShared)) + (lib.cmakeBool "ARROW_BUILD_TESTS" enableShared) + (lib.cmakeBool "ARROW_BUILD_INTEGRATION" true) + (lib.cmakeBool "ARROW_BUILD_UTILITIES" true) + (lib.cmakeBool "ARROW_EXTRA_ERROR_CONTEXT" true) + (lib.cmakeBool "ARROW_VERBOSE_THIRDPARTY_BUILD" true) + (lib.cmakeFeature "ARROW_DEPENDENCY_SOURCE" "SYSTEM") + (lib.cmakeFeature "xsimd_SOURCE" "AUTO") + (lib.cmakeBool "ARROW_DEPENDENCY_USE_SHARED" enableShared) + (lib.cmakeBool "ARROW_COMPUTE" true) + (lib.cmakeBool "ARROW_CSV" true) + (lib.cmakeBool "ARROW_DATASET" true) + (lib.cmakeBool "ARROW_FILESYSTEM" true) + (lib.cmakeBool "ARROW_FLIGHT_SQL" enableFlight) + (lib.cmakeBool "ARROW_HDFS" true) + (lib.cmakeBool "ARROW_IPC" true) + (lib.cmakeBool "ARROW_JEMALLOC" enableJemalloc) + (lib.cmakeBool "ARROW_JSON" true) + (lib.cmakeBool "ARROW_USE_GLOG" true) + (lib.cmakeBool "ARROW_WITH_BACKTRACE" true) + (lib.cmakeBool "ARROW_WITH_BROTLI" true) + (lib.cmakeBool "ARROW_WITH_BZ2" true) + (lib.cmakeBool "ARROW_WITH_LZ4" true) + (lib.cmakeBool "ARROW_WITH_NLOHMANN_JSON" true) + (lib.cmakeBool "ARROW_WITH_SNAPPY" true) + (lib.cmakeBool "ARROW_WITH_UTF8PROC" true) + (lib.cmakeBool "ARROW_WITH_ZLIB" true) + (lib.cmakeBool "ARROW_WITH_ZSTD" true) + (lib.cmakeBool "ARROW_MIMALLOC" true) + (lib.cmakeBool "ARROW_SUBSTRAIT" true) + (lib.cmakeBool "ARROW_FLIGHT" enableFlight) + (lib.cmakeBool "ARROW_FLIGHT_TESTING" enableFlight) + (lib.cmakeBool "ARROW_S3" enableS3) + (lib.cmakeBool "ARROW_GCS" enableGcs) + (lib.cmakeBool "ARROW_ORC" true) # Parquet options: - "-DARROW_PARQUET=ON" - "-DPARQUET_BUILD_EXECUTABLES=ON" - "-DPARQUET_REQUIRE_ENCRYPTION=ON" + (lib.cmakeBool "ARROW_PARQUET" true) + (lib.cmakeBool "PARQUET_BUILD_EXECUTABLES" true) + (lib.cmakeBool "PARQUET_REQUIRE_ENCRYPTION" true) + ] + ++ lib.optionals (!enableShared) [ + (lib.cmakeFeature "ARROW_TEST_LINKAGE" "static") ] - ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables + # needed for tools executables + (lib.cmakeFeature "CMAKE_INSTALL_RPATH" "@loader_path/../lib") + ] + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ + (lib.cmakeBool "ARROW_USE_SIMD" false) ] - ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] ++ lib.optionals enableS3 [ - "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" + (lib.cmakeFeature "AWSSDK_CORE_HEADER_FILE" "${aws-sdk-cpp-arrow}/include/aws/core/Aws.h") ]; doInstallCheck = true; @@ -259,13 +264,6 @@ stdenv.mkDerivation (finalAttrs: { "TestMinioServer.Connect" "TestS3FS.*" "TestS3FSGeneric.*" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # TODO: revisit at 12.0.0 or when - # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989 - # is available, see - # https://github.com/apache/arrow/pull/15288#discussion_r1071244661 - "ExecPlanExecution.StressSourceSinkStopped" ]; in lib.optionalString finalAttrs.doInstallCheck "-${lib.concatStringsSep ":" filteredTests}"; @@ -306,12 +304,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; - meta = with lib; { + meta = { description = "Cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/docs/cpp/"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ + changelog = "https://arrow.apache.org/release/${finalAttrs.version}.html"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ tobim veprbl cpcloud From 58b811854cfa3b819b2a4173b1796a5076bd4f70 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 May 2025 02:56:40 +0200 Subject: [PATCH 435/542] python3Packages.django-jinja: fix build with django 5.2 Also migrate to PEP517 builder and use pytest for tests. --- .../python-modules/django-jinja2/default.nix | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index 0bbaf6e0699d..079a6ab677c1 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -3,19 +3,26 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies django, jinja2, - python, + + # tests + pytest-django, + pytestCheckHook }: buildPythonPackage rec { pname = "django-jinja"; version = "2.11.0"; + pyproject = true; disabled = pythonOlder "3.8"; - format = "setuptools"; - src = fetchFromGitHub { owner = "niwinz"; repo = "django-jinja"; @@ -23,17 +30,34 @@ buildPythonPackage rec { hash = "sha256-0gkv9xinHux8TRiNBLl/JgcimXU3CzysxzGR2jn7OZ4="; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ django jinja2 ]; - checkPhase = '' - runHook preCheck + nativeCheckInputs = [ + pytestCheckHook + pytest-django + ]; - ${python.interpreter} testing/runtests.py + preCheck = '' + pushd testing + export DJANGO_SETTINGS_MODULE=settings + ''; - runHook postCheck + pytestFlagsArray = [ + "testapp/tests.py" + ]; + + disabledTests = lib.optionals (lib.versionAtLeast django.version "5.2") [ + # https://github.com/niwinz/django-jinja/issues/317 + "test_autoscape_with_form_errors" + ]; + + postCheck = '' + popd ''; meta = { From 08276b73ca1c99fc761feb93f5d36021941efb93 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 May 2025 02:58:04 +0200 Subject: [PATCH 436/542] python3Packages.django-jinja: normalize package directory and cleanup --- .../{django-jinja2 => django-jinja}/default.nix | 7 ++----- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{django-jinja2 => django-jinja}/default.nix (92%) diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja/default.nix similarity index 92% rename from pkgs/development/python-modules/django-jinja2/default.nix rename to pkgs/development/python-modules/django-jinja/default.nix index 079a6ab677c1..20f88ca5ac2c 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -13,7 +12,7 @@ # tests pytest-django, - pytestCheckHook + pytestCheckHook, }: buildPythonPackage rec { @@ -21,8 +20,6 @@ buildPythonPackage rec { version = "2.11.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "niwinz"; repo = "django-jinja"; @@ -32,7 +29,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ django jinja2 ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 396a8a1c0f79..e5d023c680ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4093,7 +4093,7 @@ self: super: with self; { django-ipware = callPackage ../development/python-modules/django-ipware { }; - django-jinja = callPackage ../development/python-modules/django-jinja2 { }; + django-jinja = callPackage ../development/python-modules/django-jinja { }; django-jquery-js = callPackage ../development/python-modules/django-jquery-js { }; From 5c5a120b4e2c2b7a853c5ba6a98b184169d2d04f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 May 2025 03:12:36 +0200 Subject: [PATCH 437/542] python3Packages.django-cryptography: 1.1 -> 1.1-unstable-2024-02-16 Upstream author has apparently vanished, so this is probably it until a fork appears. --- .../django-cryptography/default.nix | 45 +++++++++++-------- .../django-cryptography/fix-setup-cfg.patch | 16 ------- 2 files changed, 26 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch diff --git a/pkgs/development/python-modules/django-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix index 7f4d2804c4dd..1d2c375e2749 100644 --- a/pkgs/development/python-modules/django-cryptography/default.nix +++ b/pkgs/development/python-modules/django-cryptography/default.nix @@ -5,45 +5,52 @@ django-appconf, fetchFromGitHub, lib, - python, - pythonOlder, + pytestCheckHook, + pytest-django, setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "django-cryptography"; - version = "1.1"; - disabled = pythonOlder "3.7"; - format = "pyproject"; + version = "1.1-unstable-2024-02-16"; + pyproject = true; src = fetchFromGitHub { owner = "georgemarshall"; repo = "django-cryptography"; - tag = version; - hash = "sha256-C3E2iT9JdLvF+1g+xhZ8dPDjjh25JUxLAtTMnalIxPk="; + rev = "a5cde9beed707a14a2ef2f1f7f1fee172feb8b5e"; + hash = "sha256-Xj/fw8EapsYvVbZPRQ81yeE9QpIQ1TIuk+ASOCGh/Uc="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "packages = django_cryptography" "packages = find:" + ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cryptography django django-appconf ]; - patches = [ - # See: https://github.com/georgemarshall/django-cryptography/pull/88 - ./fix-setup-cfg.patch - ]; - pythonImportsCheck = [ "django_cryptography" ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} ./runtests.py - runHook postCheck + nativeCheckInputs = [ + pytest-django + pytestCheckHook + ]; + + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings ''; + disabledTests = [ + # self.assertEqual(len(errors), 1) - AssertionError: 0 != 1 + "test_field_checks" + ]; + meta = with lib; { homepage = "https://github.com/georgemarshall/django-cryptography"; description = "Set of primitives for performing cryptography in Django"; diff --git a/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch b/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch deleted file mode 100644 index 0cb7b9dba2aa..000000000000 --- a/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 865b4c3..577d917 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -35,7 +35,10 @@ project_urls = - Documentation = https://django-cryptography.readthedocs.io - - [options] --packages = django_cryptography -+packages = -+ django_cryptography -+ django_cryptography.core -+ django_cryptography.utils - python_requires = >=3.6 - include_package_data = True - install_requires = From 6a1f7d4003962a21247a8624f0df22b288b90437 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 May 2025 03:34:49 +0200 Subject: [PATCH 438/542] python3Packages.django-scheduler: fix build with django 5.2 --- .../django-scheduler/default.nix | 20 +++++- .../django-scheduler/index_together.patch | 65 +++++++++++++++++++ 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/django-scheduler/index_together.patch diff --git a/pkgs/development/python-modules/django-scheduler/default.nix b/pkgs/development/python-modules/django-scheduler/default.nix index 3ffe10f0d65c..2c1d48a428a0 100644 --- a/pkgs/development/python-modules/django-scheduler/default.nix +++ b/pkgs/development/python-modules/django-scheduler/default.nix @@ -30,9 +30,9 @@ buildPythonPackage rec { dependencies = [ django + icalendar python-dateutil pytz - icalendar ]; nativeCheckInputs = [ @@ -44,6 +44,24 @@ buildPythonPackage rec { export DJANGO_SETTINGS_MODULE=tests.settings ''; + patches = [ + # Remove in Django 5.1 + # https://github.com/llazzaro/django-scheduler/pull/567 + ./index_together.patch + ]; + + postPatch = '' + # Remove in Django 5.1 + substituteInPlace tests/settings.py \ + --replace-fail "SHA1PasswordHasher" "PBKDF2PasswordHasher" + ''; + + disabledTests = lib.optionals (lib.versionAtLeast django.version "5.1") [ + # test_delete_event_authenticated_user - AssertionError: 302 != 200 + "test_delete_event_authenticated_user" + "test_event_creation_authenticated_user" + ]; + pythonImportsCheck = [ "schedule" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/django-scheduler/index_together.patch b/pkgs/development/python-modules/django-scheduler/index_together.patch new file mode 100644 index 000000000000..5777410eca67 --- /dev/null +++ b/pkgs/development/python-modules/django-scheduler/index_together.patch @@ -0,0 +1,65 @@ +From d691550163941db6dbcec2f347fee4d3941615a0 Mon Sep 17 00:00:00 2001 +From: Robin +Date: Wed, 1 Jan 2025 10:31:44 -0500 +Subject: [PATCH 1/2] Update calendars.py + +Django 5.1 ... index_together deprecated. +--- + schedule/models/calendars.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/schedule/models/calendars.py b/schedule/models/calendars.py +index 81f8a7de..d37097a7 100644 +--- a/schedule/models/calendars.py ++++ b/schedule/models/calendars.py +@@ -231,7 +231,7 @@ class CalendarRelation(models.Model): + class Meta: + verbose_name = _("calendar relation") + verbose_name_plural = _("calendar relations") +- index_together = [("content_type", "object_id")] ++ indexes = [models.Index(fields=["content_type", "object_id"])] + + def __str__(self): + return "{} - {}".format(self.calendar, self.content_object) + +From 768d2d3842ce6af8115741ef5758a72ab4659491 Mon Sep 17 00:00:00 2001 +From: Robin +Date: Wed, 1 Jan 2025 10:32:56 -0500 +Subject: [PATCH 2/2] Update events.py + +Django 5.1 .... index_together deprecated +--- + schedule/models/events.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/schedule/models/events.py b/schedule/models/events.py +index bf6fa5f1..bc9671c5 100644 +--- a/schedule/models/events.py ++++ b/schedule/models/events.py +@@ -92,7 +92,7 @@ class Event(models.Model): + class Meta: + verbose_name = _("event") + verbose_name_plural = _("events") +- index_together = (("start", "end"),) ++ indexes = [models.Index(fields=["start", "end"])] + + def __str__(self): + return gettext("%(title)s: %(start)s - %(end)s") % { +@@ -571,7 +571,7 @@ class EventRelation(models.Model): + class Meta: + verbose_name = _("event relation") + verbose_name_plural = _("event relations") +- index_together = [("content_type", "object_id")] ++ indexes = [models.Index(fields=["content_type", "object_id"])] + + def __str__(self): + return "{}({})-{}".format( +@@ -594,7 +594,7 @@ class Occurrence(models.Model): + class Meta: + verbose_name = _("occurrence") + verbose_name_plural = _("occurrences") +- index_together = (("start", "end"),) ++ indexes = [models.Index(fields=["start", "end"])] + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) From 1b3d5b91c2608da9272679bb9223ebaa2f2fe30a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Dec 2025 16:27:44 +0100 Subject: [PATCH 439/542] mailman: pin to django 4.2 --- pkgs/servers/mail/mailman/python.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index f99f5a9bc825..c8fd7159f717 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -26,6 +26,7 @@ lib.fix ( [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 */ + # https://gitlab.com/mailman/hyperkitty/-/merge_requests/681 django = super.django_4; django-allauth = super.django-allauth.overrideAttrs ( From ce41ef26fa6b4dfb7590dc7cb41cbd80ab2a0be2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Dec 2025 17:29:17 +0100 Subject: [PATCH 440/542] python3Packages.django-rest-registration: fix build Wrong jwt dependency broke a test. Accelerate the otherwise slow tests with xdist and clean up and reannotate failing tests. --- .../django-rest-registration/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix index 695da5c5470c..bd3f7ff6e52c 100644 --- a/pkgs/development/python-modules/django-rest-registration/default.nix +++ b/pkgs/development/python-modules/django-rest-registration/default.nix @@ -5,9 +5,10 @@ djangorestframework, fetchFromGitHub, pytest-django, + pytest-xdist, pytestCheckHook, pythonOlder, - jwt, + pyjwt, setuptools, }: @@ -35,16 +36,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-django - jwt + pytest-xdist + pyjwt ]; pythonImportsCheck = [ "rest_registration" ]; disabledTests = [ - # This test fails on Python 3.10 + # Failed: DID NOT RAISE "test_convert_html_to_text_fails" - # This test is broken and was removed after 0.7.3. Remove this line once version > 0.7.3 - "test_coreapi_autoschema_success" ]; meta = { From 35f9c62497bdc2a50bb9e3049538fdf2389606a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Dec 2025 01:08:07 +0100 Subject: [PATCH 441/542] python3Packages.mezzanine: mark broken with django>=5 --- pkgs/development/python-modules/mezzanine/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index e96d65184f84..800b5ba4e421 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -68,6 +68,8 @@ buildPythonPackage rec { ]; meta = with lib; { + # not updated to django 5.x + broken = lib.versionAtLeast django.version "5"; description = "Content management platform built using the Django framework"; mainProgram = "mezzanine-project"; longDescription = '' From 794e77e0966fa9b8addc4612472e68898e43373f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Dec 2025 01:19:05 +0100 Subject: [PATCH 442/542] python3Packages.pylint-django: 2.6.1 -> 2.6.1-unstable-2025-11-09 Fast-forward for Django 5.2 support. --- .../development/python-modules/pylint-django/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 01aa04f0817a..f18ca729a808 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -9,21 +9,18 @@ poetry-core, pylint-plugin-utils, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pylint-django"; - version = "2.6.1"; + version = "2.6.1-unstable-2025-11-09"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint-django"; - tag = "v${version}"; - hash = "sha256-9b0Sbo6E036UmUmP/CVPrS9cxxKtkMMZtqJsI53g4sU="; + rev = "e40d785abbf26af0738c14247fb4ac0aa7265b24"; + hash = "sha256-INQSQjubcwQwspaxevXQOF92L2K9WRLMLYsP18Ffhos="; }; build-system = [ poetry-core ]; From 3793aae7bd3f8cfbe2bf40dfb3fcb8eeba197040 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Dec 2025 01:26:45 +0100 Subject: [PATCH 443/542] python3Packages.pyscaffoldext-django: relax django, modernize, cleanup --- .../pyscaffoldext-django/default.nix | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix index e0e9ca4cf69f..b86594b4e8f1 100644 --- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix @@ -2,18 +2,14 @@ lib, buildPythonPackage, fetchPypi, + + # build-system setuptools, setuptools-scm, - wheel, + + # dependencies django, pyscaffold, - configupdater, - pre-commit, - pytest, - pytest-cov, - pytest-xdist, - tox, - virtualenv, }: buildPythonPackage rec { @@ -26,29 +22,19 @@ buildPythonPackage rec { hash = "sha256-5yzF3VK/9VlCSrRsRJWX4arr9n34G2R6O5A51jTpLhg="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ django pyscaffold ]; - optional-dependencies = { - testing = [ - configupdater - pre-commit - pytest - pytest-cov - pytest-xdist - setuptools-scm - tox - virtualenv - ]; - }; + pythonRelaxDeps = [ "django" ]; + + doCheck = false; # tests require git checkout pythonImportsCheck = [ "pyscaffoldext.django" ]; From 0f0117f43842017a15f4b1dd38485f243832aaf7 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 5 Dec 2025 07:14:26 -0500 Subject: [PATCH 444/542] libarchive: 3.8.2 -> 3.8.4 Version 3.8.3 lists 3 security fixes. No known CVEs. Changes: https://github.com/libarchive/libarchive/releases/tag/v3.8.3 Changes: https://github.com/libarchive/libarchive/releases/tag/v3.8.4 --- pkgs/by-name/li/libarchive/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index f0bfd5355b44..15c8ade4fa4b 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -31,13 +31,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.8.2"; + version = "3.8.4"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-s7duwuNFyYq8obTS3qc6JewJ9f8LJhItlEx8wxnMgwk="; + hash = "sha256-qNz7BAvi3dTNg6Bz2cfqaYGKFJlM4C+y/GARsQRRYsY="; }; outputs = [ From 0ca2e4c851bbe491b16ffeddeca738f2ef251635 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 5 Dec 2025 09:10:33 +0100 Subject: [PATCH 445/542] elfutils: patch for run-sysroot test --- pkgs/by-name/el/elfutils/package.nix | 2 + .../test-run-sysroot-reliability.patch | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix index db1c0b053bd0..7bdfdfedd5c3 100644 --- a/pkgs/by-name/el/elfutils/package.nix +++ b/pkgs/by-name/el/elfutils/package.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; }) + # https://patchwork.sourceware.org/project/elfutils/patch/20251205145241.1165646-1-arnout@bzzt.net/ + ./test-run-sysroot-reliability.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; diff --git a/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch b/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch new file mode 100644 index 000000000000..6e5b5890a758 --- /dev/null +++ b/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch @@ -0,0 +1,44 @@ +commit 898804bed022d1ef26e5c0b12550f87fc86f29ed +Author: Arnout Engelen +Date: Thu Dec 4 21:42:40 2025 +0100 + + tests: improve reliability of run-sysroot.sh + + Previously, the 'second' test would test the `RESOLVE_IN_ROOT` feature + when the current libc supports it, even when the currently running + kernel did not yet support it. + + Signed-off-by: Arnout Engelen + +diff --git a/tests/run-sysroot.sh b/tests/run-sysroot.sh +index fe302446..d2041e8a 100755 +--- a/tests/run-sysroot.sh ++++ b/tests/run-sysroot.sh +@@ -46,10 +46,14 @@ TID 431185: + #8 0x0000aaaae56127f0 _start + EOF + +-HAVE_OPENAT2=$(grep '^#define HAVE_OPENAT2_RESOLVE_IN_ROOT' \ +- ${abs_builddir}/../config.h | awk '{print $3}') ++libc_has_openat2_resolve_in_root() { ++ grep '^#define HAVE_OPENAT2_RESOLVE_IN_ROOT' ${abs_builddir}/../config.h | awk '{print $3}' ++} ++kernel_has_openat2_resolve_in_root() { ++ printf "%s\n%s" "5.6.0" "$(uname -r)" | sort -V -C ++} + +-if [[ "$HAVE_OPENAT2" = 1 ]]; then ++if libc_has_openat2_resolve_in_root && kernel_has_openat2_resolve_in_root; then + # Change the layout of files in sysroot to test symlink escape scenario + rm -f "${tmpdir}/sysroot/bin" + mkdir "${tmpdir}/sysroot/bin" +@@ -57,7 +61,8 @@ if [[ "$HAVE_OPENAT2" = 1 ]]; then + ln -s /bin/bash "${tmpdir}/sysroot/usr/bin/bash" + + # Check that stack with --sysroot generates correct backtrace even if target +- # binary is actually absolute symlink pointing outside of sysroot directory ++ # binary is actually absolute symlink to be interpreted relative to the sysroot ++ # directory + testrun "${abs_top_builddir}"/src/stack --core "${tmpdir}/core.bash" \ + --sysroot "${tmpdir}/sysroot" >"${tmpdir}/stack.out" + From 27dcfd3e044aea0bed1fe234a88ebf5d0efeadc6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Dec 2025 13:23:01 +0100 Subject: [PATCH 446/542] cpython: fix gh-142214 on 3.14.1 Fixes two regressions in dataclasses. --- .../python/cpython/3.14/gh-142214.patch | 114 ++++++++++++++++++ .../interpreters/python/cpython/default.nix | 4 + 2 files changed, 118 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.14/gh-142214.patch diff --git a/pkgs/development/interpreters/python/cpython/3.14/gh-142214.patch b/pkgs/development/interpreters/python/cpython/3.14/gh-142214.patch new file mode 100644 index 000000000000..d38eaee0c8ba --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.14/gh-142214.patch @@ -0,0 +1,114 @@ +From 654e3c7435180d4aec8a2fcb16a16585cea7ab70 Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Fri, 5 Dec 2025 09:08:15 +0100 +Subject: [PATCH] [3.14] gh-142214: Fix two regressions in dataclasses + (GH-142223) (#142277) + +gh-142214: Fix two regressions in dataclasses (GH-142223) +(cherry picked from commit 53ec7c8fc07eb6958869638a0cad70c52ad6fcf5) + +Co-authored-by: Jelle Zijlstra +--- + Lib/dataclasses.py | 14 +++++++--- + Lib/test/test_dataclasses/__init__.py | 28 +++++++++++++++++++ + ...-12-03-06-12-39.gh-issue-142214.appYNZ.rst | 12 ++++++++ + 3 files changed, 50 insertions(+), 4 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2025-12-03-06-12-39.gh-issue-142214.appYNZ.rst + +diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py +index fb7e1701cce0a4..c8dbb247745ab7 100644 +--- a/Lib/dataclasses.py ++++ b/Lib/dataclasses.py +@@ -550,7 +550,12 @@ def __annotate__(format, /): + + new_annotations = {} + for k in annotation_fields: +- new_annotations[k] = cls_annotations[k] ++ # gh-142214: The annotation may be missing in unusual dynamic cases. ++ # If so, just skip it. ++ try: ++ new_annotations[k] = cls_annotations[k] ++ except KeyError: ++ pass + + if return_type is not MISSING: + if format == Format.STRING: +@@ -1398,9 +1403,10 @@ def _add_slots(cls, is_frozen, weakref_slot, defined_fields): + f.type = ann + + # Fix the class reference in the __annotate__ method +- init_annotate = newcls.__init__.__annotate__ +- if getattr(init_annotate, "__generated_by_dataclasses__", False): +- _update_func_cell_for__class__(init_annotate, cls, newcls) ++ init = newcls.__init__ ++ if init_annotate := getattr(init, "__annotate__", None): ++ if getattr(init_annotate, "__generated_by_dataclasses__", False): ++ _update_func_cell_for__class__(init_annotate, cls, newcls) + + return newcls + +diff --git a/Lib/test/test_dataclasses/__init__.py b/Lib/test/test_dataclasses/__init__.py +index 513dd78c4381b4..3b335429b98500 100644 +--- a/Lib/test/test_dataclasses/__init__.py ++++ b/Lib/test/test_dataclasses/__init__.py +@@ -927,6 +927,20 @@ class C: + + validate_class(C) + ++ def test_incomplete_annotations(self): ++ # gh-142214 ++ @dataclass ++ class C: ++ "doc" # needed because otherwise we fetch the annotations at the wrong time ++ x: int ++ ++ C.__annotate__ = lambda _: {} ++ ++ self.assertEqual( ++ annotationlib.get_annotations(C.__init__), ++ {"return": None} ++ ) ++ + def test_missing_default(self): + # Test that MISSING works the same as a default not being + # specified. +@@ -2578,6 +2592,20 @@ def __init__(self, x: int) -> None: + + self.assertFalse(hasattr(E.__init__.__annotate__, "__generated_by_dataclasses__")) + ++ def test_slots_true_init_false(self): ++ # Test that slots=True and init=False work together and ++ # that __annotate__ is not added to __init__. ++ ++ @dataclass(slots=True, init=False) ++ class F: ++ x: int ++ ++ f = F() ++ f.x = 10 ++ self.assertEqual(f.x, 10) ++ ++ self.assertFalse(hasattr(F.__init__, "__annotate__")) ++ + def test_init_false_forwardref(self): + # Test forward references in fields not required for __init__ annotations. + +diff --git a/Misc/NEWS.d/next/Library/2025-12-03-06-12-39.gh-issue-142214.appYNZ.rst b/Misc/NEWS.d/next/Library/2025-12-03-06-12-39.gh-issue-142214.appYNZ.rst +new file mode 100644 +index 00000000000000..b87430ec1a3d65 +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2025-12-03-06-12-39.gh-issue-142214.appYNZ.rst +@@ -0,0 +1,12 @@ ++Fix two regressions in :mod:`dataclasses` in Python 3.14.1 related to ++annotations. ++ ++* An exception is no longer raised if ``slots=True`` is used and the ++ ``__init__`` method does not have an ``__annotate__`` attribute ++ (likely because ``init=False`` was used). ++ ++* An exception is no longer raised if annotations are requested on the ++ ``__init__`` method and one of the fields is not present in the class ++ annotations. This can occur in certain dynamic scenarios. ++ ++Patch by Jelle Zijlstra. diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index e7812913654b..3e8246250b5a 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -403,6 +403,10 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/python/cpython/issues/142218 ./${lib.versions.majorMinor version}/gh-142218.patch ] + ++ optionals (version == "3.14.1") [ + # https://github.com/python/cpython/issues/142214 + ./3.14/gh-142214.patch + ] ++ optionals (stdenv.hostPlatform.isMinGW) ( let # https://src.fedoraproject.org/rpms/mingw-python3 From 8a3548925c294662a1860375ed3e36b58436fdf8 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 21 Sep 2025 20:21:41 -0300 Subject: [PATCH 447/542] bash: fix cygwin build Co-authored-by: Brian McKenna --- pkgs/shells/bash/5.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 015872e3b2f7..64d02ed4ff68 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -107,12 +107,9 @@ lib.warnIf (withDocs != null) }" ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ - "--without-libintl-prefix" - "--without-libiconv-prefix" - "--with-installed-readline" "bash_cv_dev_stdin=present" "bash_cv_dev_fd=standard" - "bash_cv_termcap_lib=libncurses" + "gt_cv_func_printf_posix=yes" ] ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [ "--disable-nls" @@ -136,15 +133,10 @@ lib.warnIf (withDocs != null) enableParallelBuilding = true; - makeFlags = lib.optionals stdenv.hostPlatform.isCygwin [ - "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a" - "SHOBJ_LIBS=-lbash" - ]; - doCheck = false; # Can't be enabled by default due to dependency cycle, use passthru.tests.withChecks instead postInstall = '' - ln -s bash "$out/bin/sh" + ln -s bash${stdenv.hostPlatform.extensions.executable} "$out/bin/sh" rm -f $out/lib/bash/Makefile.inc ''; From 950ab449144c3dd4408b7d3bf7061053b1d6a5cd Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 29 Sep 2025 14:42:06 -0300 Subject: [PATCH 448/542] libedit: fix cygwin build --- pkgs/by-name/li/libedit/01-cygwin.patch | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/li/libedit/01-cygwin.patch b/pkgs/by-name/li/libedit/01-cygwin.patch index 33bd39ed61e5..ef6aa79c9561 100644 --- a/pkgs/by-name/li/libedit/01-cygwin.patch +++ b/pkgs/by-name/li/libedit/01-cygwin.patch @@ -1,17 +1,3 @@ ---- libedit-20120311-3.0/src/chartype.h 2012-03-11 10:54:58.000000000 +0100 -+++ libedit-20120311-3.0/src/chartype.h 2012-05-03 19:00:20.651847423 +0200 -@@ -56,9 +56,11 @@ - /* Oh for a with char32_t and __STDC_UTF_32__ in it... - * ref: ISO/IEC DTR 19769 - */ -+#ifndef __CYGWIN__ - #if WCHAR_MAX < INT32_MAX - #warning Build environment does not support non-BMP characters - #endif -+#endif - - #ifndef HAVE_WCSDUP - wchar_t *wcsdup(const wchar_t *s); --- libedit-20120311-3.0/src/editline/readline.h 2011-02-26 23:42:59.000000000 +0100 +++ libedit-20120311-3.0/src/editline/readline.h 2012-05-03 19:00:49.211244803 +0200 @@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap; @@ -23,3 +9,14 @@ #include #endif #ifndef CTRL + +--- a/src/read.c ++++ b/src/read.c +@@ -51,6 +51,7 @@ __RCSID("$NetBSD: read.c,v 1.109 2025/01/03 00:40:08 rillig Exp $"); + #include + #include + #include ++#include + + #include "el.h" + #include "fcns.h" From a9758d5468726df1503efb49e202136307aebf62 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 5 Dec 2025 15:27:54 -0400 Subject: [PATCH 449/542] libedit: add corngood as maintainer --- pkgs/by-name/li/libedit/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index 6f3caa1f45da..30a316d0074d 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { similar to those found in GNU Readline. ''; license = with lib.licenses; [ bsd3 ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ corngood ]; platforms = lib.platforms.all; }; }) From 7e5a44f95b78bc4c3bf43dd2fc4ea5792feb36a0 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 11 Nov 2025 13:37:23 -0400 Subject: [PATCH 450/542] libev: fix cygwin build --- pkgs/by-name/li/libev/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libev/package.nix b/pkgs/by-name/li/libev/package.nix index cf0f426f96b2..cd26897d382d 100644 --- a/pkgs/by-name/li/libev/package.nix +++ b/pkgs/by-name/li/libev/package.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { configureFlags = lib.optional static "LDFLAGS=-static"; + makeFlags = + # doing this in configureFlags causes configure to fail + lib.optional (!static && stdenv.hostPlatform.isCygwin) "LDFLAGS=-no-undefined"; + meta = { description = "High-performance event loop/event model with lots of features"; maintainers = [ lib.maintainers.raskin ]; From f6214bf7ce4c6ff23c67a9430bb150a03e733d26 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 11 Sep 2025 16:05:54 -0300 Subject: [PATCH 451/542] lowdown: fix cygwin build --- .../by-name/lo/lowdown/fix-cygwin-build.patch | 64 +++++++++++++++++++ pkgs/by-name/lo/lowdown/package.nix | 11 ++++ 2 files changed, 75 insertions(+) create mode 100644 pkgs/by-name/lo/lowdown/fix-cygwin-build.patch diff --git a/pkgs/by-name/lo/lowdown/fix-cygwin-build.patch b/pkgs/by-name/lo/lowdown/fix-cygwin-build.patch new file mode 100644 index 000000000000..411266b13089 --- /dev/null +++ b/pkgs/by-name/lo/lowdown/fix-cygwin-build.patch @@ -0,0 +1,64 @@ +diff --git a/Makefile b/Makefile +index 8877a17..f73fe5f 100644 +--- a/Makefile ++++ b/Makefile +@@ -161,7 +161,7 @@ MAIN_OBJS = $(COMPAT_OBJS) + + # Mac OS X and other Unix systems use different conventions for + # indicating shared library versions. +-.if $(LINKER_SOSUFFIX) == "dylib" ++.if $(LINKER_SOSUFFIX) == "dylib" || $(LINKER_SOSUFFIX) == "dll" + LIB_SOVER = liblowdown.$(LIBVER).$(LINKER_SOSUFFIX) + .else + LIB_SOVER = liblowdown.$(LINKER_SOSUFFIX).$(LIBVER) +@@ -190,7 +190,7 @@ REGRESS_ARGS += "--parse-no-deflists" + REGRESS_ENV = LC_ALL=en_US.UTF-8 + + all: bins lowdown.pc $(LIB_SO) +-bins: lowdown lowdown-diff ++bins: lowdown$(EXESUFFIX) lowdown-diff + + www: all $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512 + +@@ -202,11 +202,11 @@ installwww: www + $(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots + $(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots + +-lowdown: $(LIB_LOWDOWN) $(MAIN_OBJS) main.o ++lowdown$(EXESUFFIX): $(LIB_LOWDOWN) $(MAIN_OBJS) main.o + $(CC) -o $@ main.o $(MAIN_OBJS) $(LIB_LOWDOWN) $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD) + +-lowdown-diff: lowdown +- ln -f lowdown lowdown-diff ++lowdown-diff: lowdown$(EXESUFFIX) ++ ln -f lowdown$(EXESUFFIX) lowdown-diff + + $(LIB_ST): $(OBJS) $(COMPAT_OBJS) + $(AR) rs $@ $(OBJS) $(COMPAT_OBJS) +@@ -240,7 +240,7 @@ install: bins + $(INSTALL_DATA) share/man/* $(DESTDIR)$(SHAREDIR)/lowdown/man + $(INSTALL_DATA) share/ms/* $(DESTDIR)$(SHAREDIR)/lowdown/ms + $(INSTALL_DATA) share/odt/* $(DESTDIR)$(SHAREDIR)/lowdown/odt +- $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR) ++ $(INSTALL_PROGRAM) lowdown$(EXESUFFIX) $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR) + for f in $(MAN1S) $(MAN5S) ; do \ + name=`basename $$f .html` ; \ +@@ -273,7 +273,7 @@ uninstall_shared: uninstall_lib_common + rm -f $(LIBDIR)/$(LIB_SOVER) $(LIBDIR)/$(LIB_SO) + + install_shared: $(LIB_SO) install_lib_common +- $(INSTALL_LIB) $(LIB_SOVER) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_LIB) $(LIB_SOVER) $(IMPLIB) $(DESTDIR)$(LIBDIR) + ( cd $(DESTDIR)$(LIBDIR) && ln -sf $(LIB_SOVER) $(LIB_SO) ) + + uninstall_static: uninstall_lib_common +@@ -406,7 +406,7 @@ main.o: lowdown.h + + clean: + rm -f $(OBJS) $(COMPAT_OBJS) main.o +- rm -f lowdown lowdown-diff lowdown.pc ++ rm -f lowdown$(EXESUFFIX) lowdown-diff lowdown.pc + rm -f $(LIB_ST) $(LIB_SO) $(LIB_SOVER) + rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz + rm -f $(PDFS) $(HTMLS) $(THUMBS) diff --git a/pkgs/by-name/lo/lowdown/package.nix b/pkgs/by-name/lo/lowdown/package.nix index 7ea55e19f137..b144e1a1509f 100644 --- a/pkgs/by-name/lo/lowdown/package.nix +++ b/pkgs/by-name/lo/lowdown/package.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { sha512 = "649a508b7727df6e7e1203abb3853e05f167b64832fd5e1271f142ccf782e600b1de73c72dc02673d7b175effdc54f2c0f60318208a968af9f9763d09cf4f9ef"; }; + # https://github.com/kristapsdz/lowdown/pull/171 + patches = [ ./fix-cygwin-build.patch ]; + nativeBuildInputs = [ which dieHook @@ -60,6 +63,7 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isCygwin "-D_GNU_SOURCE"; # Fix rpath change on darwin to avoid failure like: # error: install_name_tool: changing install names or # rpaths can't be redone for: liblowdown.1.dylib (for architecture @@ -69,6 +73,13 @@ stdenv.mkDerivation rec { makeFlags = [ "bins" # prevents shared object from being built unnecessarily + ] + ++ lib.optionals stdenv.hostPlatform.isCygwin [ + "EXESUFFIX=.exe" + "LINKER_SOSUFFIX=dll" + "LIB_SO=cyglowdown.dll" + "IMPLIB=liblowdown.dll.a" + "LDFLAGS=-Wl,--out-implib,liblowdown.dll.a" ]; installTargets = [ From a0a5a11236cfb7aa3779ddc81c9657d2b950ca40 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Wed, 3 Dec 2025 04:29:04 +0300 Subject: [PATCH 452/542] glpk: fix build with gcc15 - add patch from debian replacing `bool` typedef and `true`/`false` defines with `#include `: https://sources.debian.org/data/main/g/glpk/5.0-2/debian/patches/gcc-15.patch Upstream issue: https://lists.gnu.org/archive/html/bug-glpk/2025-05/msg00000.html (recommends to use `CFLAGS="-ansi"` instead) Fixes build failure with gcc15: ``` In file included from api/minisat1.c:23: ./minisat/minisat.h:37:13: error: 'bool' cannot be defined via 'typedef' 37 | typedef int bool; | ^~~~ ./minisat/minisat.h:37:13: note: 'bool' is a keyword with '-std=c23' onwards ./minisat/minisat.h:37:1: warning: useless type name in empty declaration 37 | typedef int bool; | ^~~~~~~ ``` --- pkgs/by-name/gl/glpk/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/gl/glpk/package.nix b/pkgs/by-name/gl/glpk/package.nix index ab7cae435b80..7a2d8532d6d9 100644 --- a/pkgs/by-name/gl/glpk/package.nix +++ b/pkgs/by-name/gl/glpk/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, fetchpatch, + fetchDebianPatch, libmysqlclient, # Excerpt from glpk's INSTALL file: # This feature allows the exact simplex solver to use the GNU MP @@ -51,6 +52,14 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/sagemath/sage/d3c1f607e32f964bf0cab877a63767c86fd00266/build/pkgs/glpk/patches/error_recovery.patch"; sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA="; }) + + # Fix build with gcc15 + (fetchDebianPatch { + inherit pname version; + debianRevision = "2"; + patch = "gcc-15.patch"; + hash = "sha256-wuWPYqJKIKJAJaeJXW7lhvapu8Fd3zHjLAv7Ve7q8Qw="; + }) ]; postPatch = From 5e87c9556674a6fceac3eb31ec54bdda9f824133 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 3 Dec 2025 21:15:10 +0000 Subject: [PATCH 453/542] libnftnl: 1.3.0 -> 1.3.1, nftables: 1.1.5 -> 1.1.6 Changes: - https://git.netfilter.org/libnftnl/log/?h=libnftnl-1.3.1 - https://www.netfilter.org/projects/nftables/files/changes-nftables-1.1.6.txt --- pkgs/by-name/li/libnftnl/package.nix | 4 ++-- pkgs/os-specific/linux/nftables/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libnftnl/package.nix b/pkgs/by-name/li/libnftnl/package.nix index 21cede656fd1..60b96f08d1e8 100644 --- a/pkgs/by-name/li/libnftnl/package.nix +++ b/pkgs/by-name/li/libnftnl/package.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - hash = "sha256-D0vkeou4t3o1DuWMvUtfrmJgrUhqUncGqxXP4d1Vo8Q="; + hash = "sha256-YH2ijbpm+97M+O8Tld3tkHfo0Z8plfmk1FqcLwvP+6g="; }; configureFlags = lib.optional ( diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 2e8c760fa504..3979c0ac4354 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -27,12 +27,12 @@ }: stdenv.mkDerivation rec { - version = "1.1.5"; + version = "1.1.6"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz"; - hash = "sha256-Ha8Q8yLhT9kKAXU4qvLANNfMHrHMQY3tR0RdcU6haNQ="; + hash = "sha256-NykxvahVazEGNqL5AgrccQ+bq2b0fv4M6Qv/gArCUww="; }; patches = [ From ea27ed76400eaf70745dedbe0f22031425980bd9 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 5 Dec 2025 14:47:39 -0800 Subject: [PATCH 454/542] Revert "libcosmicAppHook: use RUSTFLAGS instead of platform specific flags" This reverts commit d2c62217d3748a3ff8ac8d6c9281cb05f92ae641. This is no longer needed in staging due to the proper fix https://github.com/NixOS/nixpkgs/pull/464707 having been merged --- pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh | 6 +----- pkgs/by-name/li/libcosmicAppHook/package.nix | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh b/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh index 7245d51495c0..e6a523191956 100644 --- a/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh +++ b/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh @@ -15,11 +15,7 @@ libcosmicAppVergenHook() { libcosmicAppLinkerArgsHook() { # Force linking to certain libraries like libEGL, which are always dlopen()ed - # local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS" - - # Temporarily use this simpler solution, it should work for simple cross compilation - # https://github.com/NixOS/nixpkgs/issues/464392 - local flags="RUSTFLAGS" + local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS" export "$flags"="${!flags-} -C link-arg=-Wl,--push-state,--no-as-needed" # shellcheck disable=SC2043 diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix index 150bfd679762..f3042e13ac8e 100644 --- a/pkgs/by-name/li/libcosmicAppHook/package.nix +++ b/pkgs/by-name/li/libcosmicAppHook/package.nix @@ -55,10 +55,7 @@ makeSetupHook { lib.makeSearchPath "share" ( lib.optionals includeSettings [ fallbackThemes ] ++ [ targetPackages.cosmic-icons ] ); - # Temporarily using RUSTFLAGS: https://github.com/NixOS/nixpkgs/issues/464392 - # See ./libcosmic-app-hook.sh - # cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget; - + cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget; # force linking for all libraries that may be dlopen'd by libcosmic/iced apps cargoLinkLibs = lib.escapeShellArgs ( [ From c83a2227bb4c0f768595eaf43b08b848457fe2d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Dec 2025 23:55:33 +0100 Subject: [PATCH 455/542] python313: 3.13.10 -> 3.13.11 https://docs.python.org/release/3.13.11/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index d8fdc04a097f..e46ce4212f89 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "13"; - patch = "10"; + patch = "11"; suffix = ""; }; - hash = "sha256-vGc8BDdaGj8ICMJ7qPBBGrgRrTkKh0AxjMucYPrY/Xc="; + hash = "sha256-Fu3nu3zb+oldEbBkL6DlI/KR5khxlNU89tOzOMOhfqI="; }; }; From 9dde8c194a5608ff938bb2bcb005e3c6f57e3431 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Dec 2025 23:58:59 +0100 Subject: [PATCH 456/542] python314: 3.14.1 -> 3.14.2 https://docs.python.org/release/3.14.2/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index e46ce4212f89..cd0c0a9ffadb 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -91,10 +91,10 @@ sourceVersion = { major = "3"; minor = "14"; - patch = "1"; + patch = "2"; suffix = ""; }; - hash = "sha256-jfoIsZWdnRWDihwtq3fcjY/0pVOh7QRt+svICVxtQvw="; + hash = "sha256-zlQ6uFS8JWthtx6bJ/gx/9G/1gpHnWOfi+f5dXz1c+k="; inherit passthruFun; }; From d7040cdaeea01c906d3fcb91489cd35b71abfaf8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Dec 2025 00:00:47 +0100 Subject: [PATCH 457/542] Revert "cpython: fix gh-142218 on 3.13.10 and 3.14.1" This reverts commit ae4f7fd1e9478b043606132b87c22c13198eb037. Fixed in 3.13.11 and 3.14.2 and as such obsoleted. --- .../python/cpython/3.13/gh-142218.patch | 66 ------------------ .../python/cpython/3.14/gh-142218.patch | 69 ------------------- .../interpreters/python/cpython/default.nix | 4 -- 3 files changed, 139 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/3.13/gh-142218.patch delete mode 100644 pkgs/development/interpreters/python/cpython/3.14/gh-142218.patch diff --git a/pkgs/development/interpreters/python/cpython/3.13/gh-142218.patch b/pkgs/development/interpreters/python/cpython/3.13/gh-142218.patch deleted file mode 100644 index 2a8aaf9aeaa7..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.13/gh-142218.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 1a75c0fb054db6910fc2b74c99911329b80e25b5 Mon Sep 17 00:00:00 2001 -From: Sam Gross -Date: Thu, 4 Dec 2025 02:46:24 -0500 -Subject: [PATCH] [3.13] gh-142218: Fix split table dictionary crash - (gh-142229) (gh-142245) - -This fixes a regression introduced in gh-140558. The interpreter would -crash if we inserted a non `str` key into a split table that matches an -existing key. -(cherry picked from commit 547d8daf780646e2800bec598ed32085817c8606) ---- - Lib/test/test_dict.py | 8 ++++++++ - .../2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst | 2 ++ - Objects/dictobject.c | 10 +++++++--- - 3 files changed, 17 insertions(+), 3 deletions(-) - create mode 100644 Misc/NEWS.d/next/Core and Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst - -diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py -index 5c3889550953dd..c7b6f64b53b42f 100644 ---- a/Lib/test/test_dict.py -+++ b/Lib/test/test_dict.py -@@ -1674,6 +1674,14 @@ def __eq__(self, other): - - self.assertEqual(len(d), 1) - -+ def test_split_table_update_with_str_subclass(self): -+ class MyStr(str): pass -+ class MyClass: pass -+ obj = MyClass() -+ obj.attr = 1 -+ obj.__dict__[MyStr('attr')] = 2 -+ self.assertEqual(obj.attr, 2) -+ - - class CAPITest(unittest.TestCase): - -diff --git a/Misc/NEWS.d/next/Core and Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst b/Misc/NEWS.d/next/Core and Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst -new file mode 100644 -index 00000000000000..a8ce0fc65267d5 ---- /dev/null -+++ b/Misc/NEWS.d/next/Core and Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst -@@ -0,0 +1,2 @@ -+Fix crash when inserting into a split table dictionary with a non -+:class:`str` key that matches an existing key. -diff --git a/Objects/dictobject.c b/Objects/dictobject.c -index 4a88e08d1da52e..c987af31c45dd1 100644 ---- a/Objects/dictobject.c -+++ b/Objects/dictobject.c -@@ -1873,10 +1873,14 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp, - uint64_t new_version = _PyDict_NotifyEvent( - interp, PyDict_EVENT_MODIFIED, mp, key, value); - assert(old_value != NULL); -- assert(!_PyDict_HasSplitTable(mp)); - if (DK_IS_UNICODE(mp->ma_keys)) { -- PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix]; -- STORE_VALUE(ep, value); -+ if (_PyDict_HasSplitTable(mp)) { -+ STORE_SPLIT_VALUE(mp, ix, value); -+ } -+ else { -+ PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix]; -+ STORE_VALUE(ep, value); -+ } - } - else { - PyDictKeyEntry *ep = &DK_ENTRIES(mp->ma_keys)[ix]; diff --git a/pkgs/development/interpreters/python/cpython/3.14/gh-142218.patch b/pkgs/development/interpreters/python/cpython/3.14/gh-142218.patch deleted file mode 100644 index 347ba638c153..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.14/gh-142218.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 319c6a2ae1ea033d5aea09a43acbc8d451764869 Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Thu, 4 Dec 2025 01:03:18 +0100 -Subject: [PATCH] [3.14] gh-142218: Fix split table dictionary crash - (gh-142229) (gh-142244) - -This fixes a regression introduced in gh-140558. The interpreter would -crash if we inserted a non `str` key into a split table that matches an -existing key. -(cherry picked from commit 547d8daf780646e2800bec598ed32085817c8606) - -Co-authored-by: Sam Gross ---- - Lib/test/test_dict.py | 8 ++++++++ - .../2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst | 2 ++ - Objects/dictobject.c | 10 +++++++--- - 3 files changed, 17 insertions(+), 3 deletions(-) - create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst - -diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py -index 2e6c2bbdf19409..665b3e843dd3a5 100644 ---- a/Lib/test/test_dict.py -+++ b/Lib/test/test_dict.py -@@ -1621,6 +1621,14 @@ def __eq__(self, other): - - self.assertEqual(len(d), 1) - -+ def test_split_table_update_with_str_subclass(self): -+ class MyStr(str): pass -+ class MyClass: pass -+ obj = MyClass() -+ obj.attr = 1 -+ obj.__dict__[MyStr('attr')] = 2 -+ self.assertEqual(obj.attr, 2) -+ - - class CAPITest(unittest.TestCase): - -diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst -new file mode 100644 -index 00000000000000..a8ce0fc65267d5 ---- /dev/null -+++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-12-03-11-03-35.gh-issue-142218.44Fq_J.rst -@@ -0,0 +1,2 @@ -+Fix crash when inserting into a split table dictionary with a non -+:class:`str` key that matches an existing key. -diff --git a/Objects/dictobject.c b/Objects/dictobject.c -index 1b4640f9649569..0eb00410cf41eb 100644 ---- a/Objects/dictobject.c -+++ b/Objects/dictobject.c -@@ -1863,10 +1863,14 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp, - if (old_value != value) { - _PyDict_NotifyEvent(interp, PyDict_EVENT_MODIFIED, mp, key, value); - assert(old_value != NULL); -- assert(!_PyDict_HasSplitTable(mp)); - if (DK_IS_UNICODE(mp->ma_keys)) { -- PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix]; -- STORE_VALUE(ep, value); -+ if (_PyDict_HasSplitTable(mp)) { -+ STORE_SPLIT_VALUE(mp, ix, value); -+ } -+ else { -+ PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(mp->ma_keys)[ix]; -+ STORE_VALUE(ep, value); -+ } - } - else { - PyDictKeyEntry *ep = &DK_ENTRIES(mp->ma_keys)[ix]; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 3e8246250b5a..32a636d8a9ff 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -399,10 +399,6 @@ stdenv.mkDerivation (finalAttrs: { # backport fix for https://github.com/python/cpython/issues/95855 ./platform-triplet-detection.patch ] - ++ optionals (version == "3.13.10" || version == "3.14.1") [ - # https://github.com/python/cpython/issues/142218 - ./${lib.versions.majorMinor version}/gh-142218.patch - ] ++ optionals (version == "3.14.1") [ # https://github.com/python/cpython/issues/142214 ./3.14/gh-142214.patch From 7b9787935aeb9c5357aa37d1e8a5bb943e042cef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Dec 2025 00:01:10 +0100 Subject: [PATCH 458/542] Revert "cpython: fix gh-142214 on 3.14.1" This reverts commit 27dcfd3e044aea0bed1fe234a88ebf5d0efeadc6. This was fixed in 3.14.2 and as such this patch application has become obsolete. --- .../python/cpython/3.14/gh-142214.patch | 114 ------------------ .../interpreters/python/cpython/default.nix | 6 +- 2 files changed, 3 insertions(+), 117 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/3.14/gh-142214.patch diff --git a/pkgs/development/interpreters/python/cpython/3.14/gh-142214.patch b/pkgs/development/interpreters/python/cpython/3.14/gh-142214.patch deleted file mode 100644 index d38eaee0c8ba..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.14/gh-142214.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 654e3c7435180d4aec8a2fcb16a16585cea7ab70 Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Fri, 5 Dec 2025 09:08:15 +0100 -Subject: [PATCH] [3.14] gh-142214: Fix two regressions in dataclasses - (GH-142223) (#142277) - -gh-142214: Fix two regressions in dataclasses (GH-142223) -(cherry picked from commit 53ec7c8fc07eb6958869638a0cad70c52ad6fcf5) - -Co-authored-by: Jelle Zijlstra ---- - Lib/dataclasses.py | 14 +++++++--- - Lib/test/test_dataclasses/__init__.py | 28 +++++++++++++++++++ - ...-12-03-06-12-39.gh-issue-142214.appYNZ.rst | 12 ++++++++ - 3 files changed, 50 insertions(+), 4 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2025-12-03-06-12-39.gh-issue-142214.appYNZ.rst - -diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py -index fb7e1701cce0a4..c8dbb247745ab7 100644 ---- a/Lib/dataclasses.py -+++ b/Lib/dataclasses.py -@@ -550,7 +550,12 @@ def __annotate__(format, /): - - new_annotations = {} - for k in annotation_fields: -- new_annotations[k] = cls_annotations[k] -+ # gh-142214: The annotation may be missing in unusual dynamic cases. -+ # If so, just skip it. -+ try: -+ new_annotations[k] = cls_annotations[k] -+ except KeyError: -+ pass - - if return_type is not MISSING: - if format == Format.STRING: -@@ -1398,9 +1403,10 @@ def _add_slots(cls, is_frozen, weakref_slot, defined_fields): - f.type = ann - - # Fix the class reference in the __annotate__ method -- init_annotate = newcls.__init__.__annotate__ -- if getattr(init_annotate, "__generated_by_dataclasses__", False): -- _update_func_cell_for__class__(init_annotate, cls, newcls) -+ init = newcls.__init__ -+ if init_annotate := getattr(init, "__annotate__", None): -+ if getattr(init_annotate, "__generated_by_dataclasses__", False): -+ _update_func_cell_for__class__(init_annotate, cls, newcls) - - return newcls - -diff --git a/Lib/test/test_dataclasses/__init__.py b/Lib/test/test_dataclasses/__init__.py -index 513dd78c4381b4..3b335429b98500 100644 ---- a/Lib/test/test_dataclasses/__init__.py -+++ b/Lib/test/test_dataclasses/__init__.py -@@ -927,6 +927,20 @@ class C: - - validate_class(C) - -+ def test_incomplete_annotations(self): -+ # gh-142214 -+ @dataclass -+ class C: -+ "doc" # needed because otherwise we fetch the annotations at the wrong time -+ x: int -+ -+ C.__annotate__ = lambda _: {} -+ -+ self.assertEqual( -+ annotationlib.get_annotations(C.__init__), -+ {"return": None} -+ ) -+ - def test_missing_default(self): - # Test that MISSING works the same as a default not being - # specified. -@@ -2578,6 +2592,20 @@ def __init__(self, x: int) -> None: - - self.assertFalse(hasattr(E.__init__.__annotate__, "__generated_by_dataclasses__")) - -+ def test_slots_true_init_false(self): -+ # Test that slots=True and init=False work together and -+ # that __annotate__ is not added to __init__. -+ -+ @dataclass(slots=True, init=False) -+ class F: -+ x: int -+ -+ f = F() -+ f.x = 10 -+ self.assertEqual(f.x, 10) -+ -+ self.assertFalse(hasattr(F.__init__, "__annotate__")) -+ - def test_init_false_forwardref(self): - # Test forward references in fields not required for __init__ annotations. - -diff --git a/Misc/NEWS.d/next/Library/2025-12-03-06-12-39.gh-issue-142214.appYNZ.rst b/Misc/NEWS.d/next/Library/2025-12-03-06-12-39.gh-issue-142214.appYNZ.rst -new file mode 100644 -index 00000000000000..b87430ec1a3d65 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2025-12-03-06-12-39.gh-issue-142214.appYNZ.rst -@@ -0,0 +1,12 @@ -+Fix two regressions in :mod:`dataclasses` in Python 3.14.1 related to -+annotations. -+ -+* An exception is no longer raised if ``slots=True`` is used and the -+ ``__init__`` method does not have an ``__annotate__`` attribute -+ (likely because ``init=False`` was used). -+ -+* An exception is no longer raised if annotations are requested on the -+ ``__init__`` method and one of the fields is not present in the class -+ annotations. This can occur in certain dynamic scenarios. -+ -+Patch by Jelle Zijlstra. diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 32a636d8a9ff..e7812913654b 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -399,9 +399,9 @@ stdenv.mkDerivation (finalAttrs: { # backport fix for https://github.com/python/cpython/issues/95855 ./platform-triplet-detection.patch ] - ++ optionals (version == "3.14.1") [ - # https://github.com/python/cpython/issues/142214 - ./3.14/gh-142214.patch + ++ optionals (version == "3.13.10" || version == "3.14.1") [ + # https://github.com/python/cpython/issues/142218 + ./${lib.versions.majorMinor version}/gh-142218.patch ] ++ optionals (stdenv.hostPlatform.isMinGW) ( let From ef4136c4f5235e37e00de265de9351b86e84e315 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 19 Nov 2025 21:48:04 -0800 Subject: [PATCH 459/542] opencv: backport upstream fix for reproducible builds --- pkgs/development/libraries/opencv/4.x.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 9451668a5837..6d88754950c4 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -310,6 +310,13 @@ effectiveStdenv.mkDerivation { url = "https://github.com/opencv/opencv/commit/dbb622b7f59c3f0e5bd3487252ef37cf72dcdcdb.patch"; hash = "sha256-MS9WizZQu0Gxw/daDDFmETxcDJYRTyhSq/xK0X5lAZM="; }) + # Backport upstream fix for reproducible builds + # https://github.com/opencv/opencv/pull/27962 + (fetchpatch { + name = "support-reproducible-builds.patch"; + url = "https://github.com/opencv/opencv/commit/7224bced8bff9d16d5e869d44f90f95ad8fdfe25.patch"; + hash = "sha256-DIlTQaIVWpPgJgPktY+0vd3BWJoS38YZn5aFS7DqsNM="; + }) ] ++ optionals enableCuda [ ./cuda_opt_flow.patch @@ -467,6 +474,7 @@ effectiveStdenv.mkDerivation { OpenBLAS = optionalString withOpenblas openblas_; cmakeFlags = [ + (cmakeBool "BUILD_INFO_SKIP_SYSTEM_VERSION" true) (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true) (cmakeBool "WITH_OPENMP" true) (cmakeBool "BUILD_PROTOBUF" false) From 3aa98d36104c60b0991f5741150409f8ac6cc4cc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 6 Dec 2025 00:13:10 +0000 Subject: [PATCH 460/542] protobuf_33: 33.1 -> 33.2 Diff: https://github.com/protocolbuffers/protobuf/compare/v33.1...v33.2 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v33.2 --- pkgs/development/libraries/protobuf/33.nix | 4 ++-- pkgs/development/python-modules/protobuf/6.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/protobuf/33.nix b/pkgs/development/libraries/protobuf/33.nix index 6365e5fac5a5..dec1aa836ed8 100644 --- a/pkgs/development/libraries/protobuf/33.nix +++ b/pkgs/development/libraries/protobuf/33.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "33.1"; - hash = "sha256-IW6wLkr/NwIZy5N8s+7Fe9CSexXgliW8QSlvmUD+g5Q="; + version = "33.2"; + hash = "sha256-SguWBa9VlE15C+eLzcqqusVLgx9kDyPXwYImSE75HCM="; } // args ) diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix index bba5b5da6dac..16e959977440 100644 --- a/pkgs/development/python-modules/protobuf/6.nix +++ b/pkgs/development/python-modules/protobuf/6.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "6.33.1"; + version = "6.33.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-l/ZXV+jQmHDeb9lzrt25L4VDVgcjXSCy3+2TQF0AyFs="; + hash = "sha256-Vtw3DJH7uKyFvBNYLJ43NWlmiikKouZqWQwqDTXdueQ="; }; build-system = [ setuptools ]; From 42e60769abd8968950c000638c851229f40ba04a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Dec 2025 12:39:41 +0000 Subject: [PATCH 461/542] libxslt: 1.1.43 -> 1.1.45 --- pkgs/by-name/li/libxslt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libxslt/package.nix b/pkgs/by-name/li/libxslt/package.nix index d31337777f26..e2a2e90656a0 100644 --- a/pkgs/by-name/li/libxslt/package.nix +++ b/pkgs/by-name/li/libxslt/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxslt"; - version = "1.1.43"; + version = "1.1.45"; outputs = [ "bin" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libxslt/${lib.versions.majorMinor finalAttrs.version}/libxslt-${finalAttrs.version}.tar.xz"; - hash = "sha256-Wj1rODylr8I1sXERjpD1/2qifp/qMwMGUjGm1APwGDo="; + hash = "sha256-ms/mhBnE0GpFxVAyGzISdi2S9BRlBiyk6hnmMu5dIW4="; }; patches = [ From b80965dc9b88e6d7f889d7f898200ed9bd777be4 Mon Sep 17 00:00:00 2001 From: David Wronek Date: Sat, 6 Dec 2025 12:55:28 +0100 Subject: [PATCH 462/542] sshwifty: use npmHooks instead of buildNpmPackage Since the 0.4.2 update, Sshwifty tries to download Go modules from the internet during the buildNpmPackage phase. Switch to npmHooks so that buildGoModule can download these modules for us instead. Link: https://nixpkgs-update-logs.nix-community.org/sshwifty/2025-12-06.log Signed-off-by: David Wronek --- pkgs/by-name/ss/sshwifty/package.nix | 43 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix index f7a9298884bf..17c9e82c2bdd 100644 --- a/pkgs/by-name/ss/sshwifty/package.nix +++ b/pkgs/by-name/ss/sshwifty/package.nix @@ -1,14 +1,15 @@ { lib, - buildGo125Module, - buildNpmPackage, + buildGoModule, fetchFromGitHub, + fetchNpmDeps, + nodejs, + npmHooks, versionCheckHook, nixosTests, nix-update-script, - go_1_25, }: -buildGo125Module (finalAttrs: { +buildGoModule (finalAttrs: { pname = "sshwifty"; version = "0.4.1-beta-release"; @@ -19,28 +20,28 @@ buildGo125Module (finalAttrs: { hash = "sha256-Kg5aE4lkzSedo+VJgdsfO5XTKupsPU2DhZNdNhEQ/Q4="; }; - sshwifty-ui = buildNpmPackage { - pname = "sshwifty-ui"; - inherit (finalAttrs) version src; + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; - npmDepsHash = "sha256-vX3CtjwjzcxxIPYG6QXsPybyBRow1YdS9pHr961P1HA="; - - npmBuildScript = "generate"; - - postInstall = '' - cp -r application/controller/{static_pages,static_pages.go} \ - $out/lib/node_modules/sshwifty-ui/application/controller - ''; - - nativeBuildInputs = [ go_1_25 ]; + overrideModAttrs = oldAttrs: { + nativeBuildInputs = lib.filter (drv: drv != npmHooks.npmConfigHook) oldAttrs.nativeBuildInputs; + preBuild = null; }; - postPatch = '' - cp -r ${finalAttrs.sshwifty-ui}/lib/node_modules/sshwifty-ui/* . - ''; + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + hash = "sha256-vX3CtjwjzcxxIPYG6QXsPybyBRow1YdS9pHr961P1HA="; + }; vendorHash = "sha256-/SLUC0xM195QfKgX9te8UP1bbzRbKF+Npyugi19JijY="; + preBuild = '' + # Generate static pages + npm run generate + ''; + ldflags = [ "-s" "-X github.com/nirui/sshwifty/application.version=${finalAttrs.version}" @@ -59,8 +60,6 @@ buildGo125Module (finalAttrs: { extraArgs = [ "--version=unstable" "--version-regex=^([0-9.]+(?!.+-prebuild).+$)" - "--subpackage" - "sshwifty-ui" ]; }; }; From 185a1dd25512fd51c5d767071dedd2417d3ea294 Mon Sep 17 00:00:00 2001 From: David Wronek Date: Sat, 6 Dec 2025 14:09:16 +0100 Subject: [PATCH 463/542] sshwifty: 0.4.1-beta-release -> 0.4.2-beta-release --- pkgs/by-name/ss/sshwifty/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix index 17c9e82c2bdd..01e976f35945 100644 --- a/pkgs/by-name/ss/sshwifty/package.nix +++ b/pkgs/by-name/ss/sshwifty/package.nix @@ -11,13 +11,13 @@ }: buildGoModule (finalAttrs: { pname = "sshwifty"; - version = "0.4.1-beta-release"; + version = "0.4.2-beta-release"; src = fetchFromGitHub { owner = "nirui"; repo = "sshwifty"; tag = finalAttrs.version; - hash = "sha256-Kg5aE4lkzSedo+VJgdsfO5XTKupsPU2DhZNdNhEQ/Q4="; + hash = "sha256-nx485HB0JqexcSdwhgbhoAwpK3Cg7tkgDrV3NM93pXk="; }; nativeBuildInputs = [ @@ -32,10 +32,10 @@ buildGoModule (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-vX3CtjwjzcxxIPYG6QXsPybyBRow1YdS9pHr961P1HA="; + hash = "sha256-5Y6hTsHSFOPhgLwEhMNOOCyLYNjp1Q5n8My3Q6lr7hQ="; }; - vendorHash = "sha256-/SLUC0xM195QfKgX9te8UP1bbzRbKF+Npyugi19JijY="; + vendorHash = "sha256-4K0fxBBcv+ZSV0ocsoagjFAXRphA27xGO40pnewaKSU="; preBuild = '' # Generate static pages From 9e51fc9f9211acf5255b2560a50c7d00c7d4474c Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 6 Dec 2025 16:21:02 +0100 Subject: [PATCH 464/542] utf8proc: remove superfluous comment --- pkgs/by-name/ut/utf8proc/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ut/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix index 92657f0a02e0..667657e716b7 100644 --- a/pkgs/by-name/ut/utf8proc/package.nix +++ b/pkgs/by-name/ut/utf8proc/package.nix @@ -7,7 +7,6 @@ tmux, fcft, arrow-cpp, - # build config enableStatic ? stdenv.hostPlatform.isStatic, }: From 62224ff690371cd7a005290021ec41abb56bd7d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Dec 2025 20:11:53 +0100 Subject: [PATCH 465/542] cups: 2.4.15 -> 2.4.16 https://github.com/OpenPrinting/cups/releases/tag/v2.4.16 https://github.com/OpenPrinting/cups/compare/v2.4.15...v2.4.16 --- pkgs/by-name/cu/cups/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cu/cups/package.nix b/pkgs/by-name/cu/cups/package.nix index 4568d7827d33..760cc49ffb17 100644 --- a/pkgs/by-name/cu/cups/package.nix +++ b/pkgs/by-name/cu/cups/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.15"; + version = "2.4.16"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - hash = "sha256-7/C71I/xq8u45G4o6Frvr/o5Gh2cTY3JKrOCKhMAjX8="; + hash = "sha256-AzlYcgS0+UKN0FkuswHewL+epuqNzl2WkNVr5YWrqS0="; }; outputs = [ From 9caed4ef0a3f3760f19126e59cb1544b0aba3b46 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 6 Dec 2025 22:22:30 +0000 Subject: [PATCH 466/542] onetbb: fix static build fixes `nix-build -A pkgsStatic.onetbb` the library itself respects cmake's BUILD_SHARED_LIBS=off, however its test cases do not and hence fail to link. therefore, restrict tests to non-static builds. --- pkgs/by-name/on/onetbb/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix index f820dc7a80ac..e13d3a1bdb51 100644 --- a/pkgs/by-name/on/onetbb/package.nix +++ b/pkgs/by-name/on/onetbb/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { hwloc ]; - doCheck = true; + doCheck = !stdenv.hostPlatform.isStatic; dontUseNinjaCheck = true; @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH" false) + (lib.cmakeBool "TBB_TEST" finalAttrs.finalPackage.doCheck) ]; env = { From e4fbee50a49c59d8df706c657e8c7399f9fe86a5 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Wed, 3 Dec 2025 11:02:34 +0300 Subject: [PATCH 467/542] skktools: fix build with gcc15 - add patch from merged upstream PR: https://www.github.com/skk-dev/skktools/pull/30 https://github.com/skk-dev/skktools/commit/fb6a295607dbe2b5171c2c89f8a2f0b82bee9766 Fixes build failure with gcc15: ``` ./skkdic-expr.c:359:13: error: too many arguments to function 'add_content_line'; expected 0, have 3 359 | if (add_content_line(new, content, NULL)) | ^~~~~~~~~~~~~~~~ ~~~ ./skkdic-expr.c:115:12: note: declared here 115 | static int add_content_line(); | ^~~~~~~~~~~~~~~~ ./skkdic-expr.c:576:9: error: too many arguments to function 'subtract_content_line'; expected 0, have 3 576 | subtract_content_line(new, content, NULL); | ^~~~~~~~~~~~~~~~~~~~~ ~~~ ./skkdic-expr.c:116:13: note: declared here 116 | static void subtract_content_line(); | ^~~~~~~~~~~~~~~~~~~~~ ``` --- pkgs/by-name/sk/skktools/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/sk/skktools/package.nix b/pkgs/by-name/sk/skktools/package.nix index 7fb5f1992a84..816b60adbcfe 100644 --- a/pkgs/by-name/sk/skktools/package.nix +++ b/pkgs/by-name/sk/skktools/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, gdbm, glib, @@ -34,6 +35,16 @@ stdenv.mkDerivation rec { # sha256 = "1k9zxqybl1l5h0a8px2awc920qrdyp1qls50h3kfrj3g65d08aq2"; # }; + patches = [ + # Fix build with gcc15 + # https://github.com/skk-dev/skktools/pull/30 + (fetchpatch { + name = "skktools-fix-function-prototype-empty-arguments-gcc15.patch"; + url = "https://github.com/skk-dev/skktools/commit/fb6a295607dbe2b5171c2c89f8a2f0b82bee9766.patch"; + hash = "sha256-wao2kRsDq5WN4JO/YpXhNirsdnA3vZpsY9GDCTPSJKY="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gdbm From 12b0f1cb8736b9040dd6f0da7b0d9e55162eaa45 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 6 Dec 2025 15:21:38 -0700 Subject: [PATCH 468/542] libev: add patch to fix build for FreeBSD --- pkgs/by-name/li/libev/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/li/libev/package.nix b/pkgs/by-name/li/libev/package.nix index cd26897d382d..86462cc5380f 100644 --- a/pkgs/by-name/li/libev/package.nix +++ b/pkgs/by-name/li/libev/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, updateAutotoolsGnuConfigScriptsHook, # Note: -static hasn’t work on darwin static ? with stdenv.hostPlatform; isStatic && !isDarwin, @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh"; }; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/21a6f0f5829384117dfc1ed11ad67954562ef7d6/devel/libev/files/patch-ev.c"; + hash = "sha256-jaeJuCYM/U2ZNbbyA/7YOKvo0lj7Dc9L3LNJfZwcaw0="; + extraPrefix = ""; + }) + ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; configureFlags = lib.optional static "LDFLAGS=-static"; From 028170b59aefd5a3588b1ca1008bb3548a50455c Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 6 Dec 2025 15:22:08 -0700 Subject: [PATCH 469/542] libfido2: update POSIX_C_SOURCE declaration to fix build on FreeBSD --- pkgs/by-name/li/libfido2/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/li/libfido2/package.nix b/pkgs/by-name/li/libfido2/package.nix index 5821d0b7b1de..e942f8da0dd4 100644 --- a/pkgs/by-name/li/libfido2/package.nix +++ b/pkgs/by-name/li/libfido2/package.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation rec { doInstallCheck = true; + # Required for FreeBSD + # https://github.com/freebsd/freebsd-ports/blob/21a6f0f5829384117dfc1ed11ad67954562ef7d6/security/libfido2/Makefile#L37C27-L37C77 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail "-D_POSIX_C_SOURCE=200809L" "-D_POSIX_C_SOURCE=202405L" + ''; + cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" "-DCMAKE_INSTALL_LIBDIR=lib" From 5ac7640fdb7f2230c39e11b9d4af717e0724707a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Nov 2025 14:33:26 +0000 Subject: [PATCH 470/542] google-cloud-cpp: 2.43.0 -> 2.44.0 Diff: https://github.com/googleapis/google-cloud-cpp/compare/v2.43.0...v2.44.0 --- pkgs/by-name/go/google-cloud-cpp/package.nix | 27 ++++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index c2433ca8ed77..778fe40d0177 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -16,30 +16,30 @@ pkg-config, protobuf, pkgsBuildHost, - # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v2.43.0/cmake/GoogleCloudCppFeatures.cmake#L24 + # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v2.44.0/cmake/GoogleCloudCppFeatures.cmake#L24 apis ? [ "*" ], staticOnly ? stdenv.hostPlatform.isStatic, }: let # defined in cmake/GoogleapisConfig.cmake - googleapisRev = "2193a2bfcecb92b92aad7a4d81baa428cafd7dfd"; + googleapisRev = "8cd3749f4b98f2eeeef511c16431979aeb3a6502"; googleapis = fetchFromGitHub { name = "googleapis-src"; owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256-M+3ywDd1kyo6U/9o7fpsqYIPuulf8fDe3a4mjJKEN2U="; + hash = "sha256-w7jq21qLEiMhuI20C6iUeSskAfZCkZgDCPu5Flr8D48="; }; in stdenv.mkDerivation (finalAttrs: { pname = "google-cloud-cpp"; - version = "2.43.0"; + version = "2.44.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-2OnzObCTmB6E4Ut0blmL7CRAJJ9EKl6eSVdfuPS4B2Y="; + hash = "sha256-vE3oGGT33cITdAd4e5Xnlx9tX5Sz+wIFQXzj5hdcGDI="; }; patches = [ @@ -48,6 +48,19 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # After 30acc3c, the configPhase fails with: + # Target "spanner_database_admin_client_samples" links to: + # google-cloud-cpp::universe_domain + # but the target was not found. + # + # So, we explicitly add `universe_domain` to the list of default features + postPatch = '' + substituteInPlace cmake/GoogleCloudCppFeatures.cmake \ + --replace-fail \ + "bigtable;bigquery;iam;logging;pubsub;spanner;storage" \ + "bigtable;bigquery;iam;logging;pubsub;spanner;storage;universe_domain" \ + ''; + nativeBuildInputs = [ cmake ninja @@ -125,6 +138,10 @@ stdenv.mkDerivation (finalAttrs: { # this adds a good chunk of time to the build (lib.cmakeBool "BUILD_TESTING" true) (lib.cmakeBool "GOOGLE_CLOUD_CPP_ENABLE_EXAMPLES" false) + + # Explicitly set this variable to true as otherwise `universe_domain` will be filtered out + # See https://github.com/googleapis/google-cloud-cpp/pull/15820 for context + (lib.cmakeBool "GOOGLE_CLOUD_CPP_ENABLE_UNIVERSE_DOMAIN" true) ] ++ lib.optionals (apis != [ "*" ]) [ (lib.cmakeFeature "GOOGLE_CLOUD_CPP_ENABLE" (lib.concatStringsSep ";" apis)) From 3785b5ed5ea33519411be3f8d035d0137cccf3c8 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 7 Dec 2025 13:47:39 -0800 Subject: [PATCH 471/542] amd-blis: backport fix for GCC 15 build error Build was failing with error: 'asm' operand has impossible constraints or there are not enough register Upstream issue: https://github.com/amd/blis/issues/34 --- pkgs/by-name/am/amd-blis/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/am/amd-blis/package.nix b/pkgs/by-name/am/amd-blis/package.nix index 0e59a24ed3f6..fae23b5f4b8d 100644 --- a/pkgs/by-name/am/amd-blis/package.nix +++ b/pkgs/by-name/am/amd-blis/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, perl, python3, @@ -36,6 +37,18 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Set the date stamp to $SOURCE_DATE_EPOCH ./build-date.patch + # backporting a fix for a GCC15 build error + # ./frame/include/bli_x86_asm_macros.h:102:21: error: 'asm' operand has impossible constraints or there are not enough registers + (fetchpatch { + name = "amd-blis-gcc-15-fix-1.patch"; + url = "https://github.com/amd/blis/commit/14e46ad83bac5fd82569a43c7cbd3e791a1eacc8.patch"; + hash = "sha256-3vk9NSnhT64J6PUabeP58Gn7p1zheGbPxSRjVEX7WNg="; + }) + (fetchpatch { + name = "amd-blis-gcc-15-fix-2.patch"; + url = "https://github.com/amd/blis/commit/30c42202d78fd5ee5e54d50ad57348e5e541a7d5.patch"; + hash = "sha256-FCMWQzfzQxCQqngULoXfh35BFGaNTu732iu3HctNcFM="; + }) ]; inherit blas64; From 80757542e46207b8b51e2522526e8c1aea4f626a Mon Sep 17 00:00:00 2001 From: Timothy Klim Date: Sat, 8 Nov 2025 13:57:10 +0700 Subject: [PATCH 472/542] llvmPackages_21: 21.1.2 -> 21.1.7 --- pkgs/development/compilers/llvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index c8cd6d4f48ac..9bb0d5440460 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -25,7 +25,7 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; - "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY="; + "21.1.7".officialRelease.sha256 = "sha256-SaRJ7+iZMhhBdcUDuJpMAY4REQVhrvYMqI2aq3Kz08o="; "22.0.0-git".gitRelease = { rev = "492f82fa46065b3afcfed1a4dca9a029d7c5acf1"; rev-version = "22.0.0-unstable-2025-11-02"; From 42e4c0c1c91fff85d6529bd2a08d9edd5263a861 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sat, 25 Oct 2025 23:29:57 +0300 Subject: [PATCH 473/542] rocmPackages.clang: fix errors with gcc15 - add patch from merged upstream llvm PR: https://www.github.com/llvm/llvm-project/pull/136133 (previous attempt) https://www.github.com/llvm/llvm-project/pull/144886 Upstream issue: https://www.github.com/ROCm/composable_kernel/issues/2887 Fixes build failure of `hipblaslt` with gcc15: ``` In file included from /build/source/projects/hipblaslt/clients/common/src/hipblaslt_init_device.cpp:27: In file included from /build/source/projects/hipblaslt/clients/common/include/hipblaslt_datatype2string.hpp:29: In file included from /build/source/projects/hipblaslt/library/src/amd_detail/include/auxiliary.hpp:29: In file included from /build/source/projects/hipblaslt/library/include/hipblaslt/hipblaslt.h:58: In file included from /nix/store/klmhyss10wmwknlcz7j3h2i4cqrcmnqg-clr-6.4.3/include/hip/hip_bfloat16.h:37: In file included from /nix/store/klmhyss10wmwknlcz7j3h2i4cqrcmnqg-clr-6.4.3/include/hip/amd_detail/amd_hip_bfloat16.h:53: In file included from /nix/store/klmhyss10wmwknlcz7j3h2i4cqrcmnqg-clr-6.4.3/include/hip/hip_runtime.h:62: In file included from /nix/store/klmhyss10wmwknlcz7j3h2i4cqrcmnqg-clr-6.4.3/include/hip/amd_detail/amd_hip_runtime.h:114: In file included from /nix/store/klmhyss10wmwknlcz7j3h2i4cqrcmnqg-clr-6.4.3/include/hip/hip_runtime_api.h:578: In file included from /nix/store/klmhyss10wmwknlcz7j3h2i4cqrcmnqg-clr-6.4.3/include/hip/texture_types.h:47: In file included from /nix/store/klmhyss10wmwknlcz7j3h2i4cqrcmnqg-clr-6.4.3/include/hip/channel_descriptor.h:32: In file included from /nix/store/klmhyss10wmwknlcz7j3h2i4cqrcmnqg-clr-6.4.3/include/hip/amd_detail/amd_channel_descriptor.h:29: In file included from /nix/store/klmhyss10wmwknlcz7j3h2i4cqrcmnqg-clr-6.4.3/include/hip/amd_detail/amd_hip_vector_types.h:49: /nix/store/042ckvfbpa2v36v12jd34jnwr274ph5r-gcc-prefix/include/c++/array:219:2: error: reference to __host__ function '__glibcxx_assert_fail' in __host__ __device__ function 219 | __glibcxx_requires_subscript(__n); | ^ /nix/store/042ckvfbpa2v36v12jd34jnwr274ph5r-gcc-prefix/include/c++/debug/assertions.h:39:3: note: expanded from macro '__glibcxx_requires_subscript' 39 | __glibcxx_assert(_N < this->size()) | ^ /nix/store/042ckvfbpa2v36v12jd34jnwr274ph5r-gcc-prefix/include/c++/x86_64-unknown-linux-gnu/bits/c++config.h:658:12: note: expanded from macro '__glibcxx_assert' 658 | std::__glibcxx_assert_fail(); \ | ^ /build/source/projects/hipblaslt/clients/common/src/hipblaslt_init_device.cpp:135:20: note: called by 'operator()' 135 | return rand_nans[pseudo_random_device(idx) % rand_nans.size()]; | ^ /build/source/projects/hipblaslt/clients/common/src/hipblaslt_init_device.cpp:39:27: note: called by 'fill_kernel' 39 | A[idx + offset] = f(idx + offset); | ^ /nix/store/042ckvfbpa2v36v12jd34jnwr274ph5r-gcc-prefix/include/c++/x86_64-unknown-linux-gnu/bits/c++config.h:652:3: note: '__glibcxx_assert_fail' declared here 652 | __glibcxx_assert_fail() | ^ ``` --- pkgs/development/rocm-modules/6/llvm/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix index 63da17d84e4d..c4ee2ce75d10 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/6/llvm/default.nix @@ -359,6 +359,14 @@ overrideLlvmPackagesRocm (s: { url = "https://github.com/llvm/llvm-project/commit/816fde1cbb700ebcc8b3df81fb93d675c04c12cd.patch"; relative = "clang"; }) + (fetchpatch { + # [PATCH] Reapply "[CUDA][HIP] Add a __device__ version of std::__glibcxx_assert_fail()" + # Fix errors with gcc15 + # https://github.com/ROCm/composable_kernel/issues/2887 + hash = "sha256-liowyS6FTsDhH8mJYXsanK7GEIlXFhd68GRDf/7Y6gg="; + url = "https://github.com/llvm/llvm-project/commit/8ec0552a7f1f50986dda6d13eae310d121d7e3ba.patch"; + relative = "clang"; + }) ] ++ old.patches ++ [ From e26b408a3ab55755adb9c843e2e6219c7b959fe1 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 28 Oct 2025 23:28:41 +0300 Subject: [PATCH 474/542] tradcpp: fix build with gcc15 - add "-std=gnu17" to `env.NIX_CFLAGS_COMPILE` Last update from upstream was in 2019. Fixes build failure with gcc15: ``` In file included from main.c:36: bool.h:36:13: error: 'bool' cannot be defined via 'typedef' 36 | typedef int bool; | ^~~~ bool.h:36:13: note: 'bool' is a keyword with '-std=c23' onwards bool.h:36:1: warning: useless type name in empty declaration 36 | typedef int bool; | ^~~~~~~ ``` --- pkgs/by-name/tr/tradcpp/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/tr/tradcpp/package.nix b/pkgs/by-name/tr/tradcpp/package.nix index e7afc2c7675b..352891d3c75d 100644 --- a/pkgs/by-name/tr/tradcpp/package.nix +++ b/pkgs/by-name/tr/tradcpp/package.nix @@ -17,6 +17,9 @@ stdenv.mkDerivation (finalAttrs: { # tradcpp only comes with BSD-make Makefile; the patch adds configure support patches = [ ./tradcpp-configure.patch ]; + # Fix build with gcc15 + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + strictDeps = true; nativeBuildInputs = [ autoreconfHook ]; From fa418d26fc72bdfb4e7f4e515c120b161071e5ae Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 12 Sep 2025 15:16:07 -0300 Subject: [PATCH 475/542] gnugrep: fix cygwin build --- pkgs/tools/text/gnugrep/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index e32a5a867c0f..51a7f2fe21d6 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -79,6 +79,11 @@ stdenv.mkDerivation { export MKDIR_P="mkdir -p" ''; + configureFlags = + # Work around build failure caused by the gnulib workaround for + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870. remove after GCC 15 + lib.optional stdenv.hostPlatform.isCygwin "gl_cv_clean_version_stddef=yes"; + enableParallelBuilding = true; # Fix reference to sh in bootstrap-tools, and invoke grep via @@ -92,7 +97,7 @@ stdenv.mkDerivation { chmod +x $out/bin/egrep $out/bin/fgrep ''; - env = lib.optionalAttrs stdenv.hostPlatform.isMinGW { + env = lib.optionalAttrs (stdenv.hostPlatform.isMinGW || stdenv.hostPlatform.isCygwin) { NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; }; From 582a9425deebb8170e373fb62944952557a523e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Dec 2025 23:50:11 +0100 Subject: [PATCH 476/542] python3Packages.urllib3: 2.5.0 -> 2.6.0 https://github.com/urllib3/urllib3/blob/2.6.0/CHANGES.rst --- pkgs/development/python-modules/urllib3/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index cdb50f45df0d..1ffb969719ba 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -9,10 +9,11 @@ hatch-vcs, # optional-dependencies + backports-zstd, brotli, brotlicffi, + h2, pysocks, - zstandard, # tests pytestCheckHook, @@ -24,12 +25,12 @@ let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-P8R3M8fkGdS8P2s9wrT4kLt0OQajDVa6Slv6S7/5J2A="; + hash = "sha256-y5vO9aSzRdXaXRRdw+MINPWOgBiCjLxyTTC0y31NSfE="; }; build-system = [ @@ -39,13 +40,14 @@ let postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail ', "setuptools-scm>=8,<9"' "" + --replace-fail ', "setuptools-scm>=8,<10"' "" ''; optional-dependencies = { brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; + h2 = [ h2 ]; socks = [ pysocks ]; - zstd = [ zstandard ]; + zstd = [ backports-zstd ]; }; nativeCheckInputs = [ From 6056f229d5d6765b4aec7d6cf840123038002cc0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 7 Dec 2025 01:49:07 +0100 Subject: [PATCH 477/542] python3Packages.quart-trio: init at 0.12.0 --- .../python-modules/quart-trio/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/quart-trio/default.nix diff --git a/pkgs/development/python-modules/quart-trio/default.nix b/pkgs/development/python-modules/quart-trio/default.nix new file mode 100644 index 000000000000..67170265ca70 --- /dev/null +++ b/pkgs/development/python-modules/quart-trio/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + # build-system + pdm-backend, + + # dependencies + exceptiongroup, + hypercorn, + quart, + trio, + + # tests + pytest-cov-stub, + pytest-trio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "quart-trio"; + version = "0.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pgjones"; + repo = "quart-trio"; + tag = version; + hash = "sha256-n41XATex20iw3ZYxud/5cTdx+F6tTQQJmP91TIw2xJo="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + hypercorn + quart + trio + ] + ++ hypercorn.optional-dependencies.trio + ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup + ]; + + pythonImportsCheck = [ + "quart_trio" + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytest-trio + pytestCheckHook + ]; + + meta = { + description = "Quart-Trio is an extension for Quart to support the Trio event loop"; + homepage = "https://github.com/pgjones/quart-trio"; + changelog = "https://github.com/pgjones/quart-trio/blob/${src.tag}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index baef9dcd224c..c96cc3dbdcdd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15929,6 +15929,8 @@ self: super: with self; { quart-schema = callPackage ../development/python-modules/quart-schema { }; + quart-trio = callPackage ../development/python-modules/quart-trio { }; + quaternion = callPackage ../development/python-modules/quaternion { }; qudida = callPackage ../development/python-modules/qudida { }; From de0008bac2c9a48071bcb33765ccaf5f2024d6f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 8 Dec 2025 18:02:58 +0100 Subject: [PATCH 478/542] python3Packages.urllib3: run more tests This gets the tests running again and enables more of them. I still did not manage to fix all of them. --- .../python-modules/urllib3/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 1ffb969719ba..474fcee846ce 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -16,9 +16,15 @@ pysocks, # tests + httpx, + pyopenssl, pytestCheckHook, + pytest-socket, pytest-timeout, + quart, + quart-trio, tornado, + trio, trustme, }: @@ -51,13 +57,23 @@ let }; nativeCheckInputs = [ + httpx + pyopenssl + pytest-socket pytest-timeout pytestCheckHook + quart + quart-trio tornado + trio trustme ] ++ lib.concatAttrValues optional-dependencies; + disabledTestMarks = [ + "requires_network" + ]; + # Tests in urllib3 are mostly timeout-based instead of event-based and # are therefore inherently flaky. On your own machine, the tests will # typically build fine, but on a loaded cluster such as Hydra random From 6205bd5aae9a1d122f9a6f8a2717c3171d937f66 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 11 Sep 2025 16:11:19 -0300 Subject: [PATCH 479/542] editline: fix cygwin build --- pkgs/by-name/ed/editline/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ed/editline/package.nix b/pkgs/by-name/ed/editline/package.nix index 5942578b4896..6eb409dc97f6 100644 --- a/pkgs/by-name/ed/editline/package.nix +++ b/pkgs/by-name/ed/editline/package.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = lib.optional enableTermcap ncurses; + makeFlags = lib.optionals stdenv.hostPlatform.isPE [ + "LDFLAGS=-no-undefined" + ]; + outputs = [ "out" "dev" From 4f41c66aa45ad3e68e6b7952420b108c58320528 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 6 Dec 2025 15:19:57 -0700 Subject: [PATCH 480/542] perl: Fix build with clang >= 21 When cross compiling for FreeBSD, we see this exact error: https://github.com/llvm/llvm-project/issues/152241 As described in that issue, -fno-strict-aliasing is a workaround. --- pkgs/development/interpreters/perl/interpreter.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 8c78a5324736..ee59b10344c5 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -229,6 +229,13 @@ stdenv.mkDerivation ( setupHook = ./setup-hook.sh; + env = { + # https://github.com/llvm/llvm-project/issues/152241 + NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.hasCC && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "21" + ) "-fno-strict-aliasing"; + }; + # copied from python passthru = let From d09a90b701c1a05ea3e590648e50cfe58bfe95f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Dec 2025 19:11:47 -0800 Subject: [PATCH 481/542] imagemagick: 7.1.2-9 -> 7.1.2-10 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.2-9...7.1.2-10 Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8d983f5602a6..99d4951ffa3b 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -85,13 +85,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.2-9"; + version = "7.1.2-10"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; tag = finalAttrs.version; - hash = "sha256-bXVVnjJhtmcbczZI9rsy2JQ3p2oYX5g5vp3YdsQkdrE="; + hash = "sha256-96lhd0B4yV2s/zVazKrqAcDZvn+yIiXxp8fqyKSfxLc="; }; outputs = [ From e65630386777c3f21977611f7b802aeae30b6f2c Mon Sep 17 00:00:00 2001 From: DavHau Date: Thu, 4 Dec 2025 19:32:43 +0700 Subject: [PATCH 482/542] python3Packages.setuptools-rust: fix cross build for all `setuptools-rust` based packages Prior to this change all python packages using `setuptools-rust` were broken when cross compiled as they built binaries for the build platform instead of for the host platform. The setuptoolsRustBuildHook hook would have to be included as a native build input instead of the `setuptools-rust` package, but practically wasn't used anywhere. This change makes it so that `setuptoolsRustBuildHook` becomes unnecessary, and instead `setuptools-rust` propagates a setup-hook directly setting up the build environment, similar to how cmake does it when included via nativeBuildInputs. This change fixes cross on all packages using `setuptools-rust` as a build-system. --- .../ceph/old-python-packages/cryptography.nix | 7 +++++-- .../interpreters/python/hooks/default.nix | 14 ------------- .../setuptools-rust/default.nix | 21 ++++++++++++++++++- .../setuptools-rust}/setuptools-rust-hook.sh | 0 pkgs/top-level/python-aliases.nix | 1 + 5 files changed, 26 insertions(+), 17 deletions(-) rename pkgs/development/{interpreters/python/hooks => python-modules/setuptools-rust}/setuptools-rust-hook.sh (100%) diff --git a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix index f10d285617a7..f6129b7c0554 100644 --- a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix +++ b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix @@ -9,7 +9,7 @@ rustPlatform, cargo, rustc, - setuptoolsRustBuildHook, + setuptools-rust, openssl, Security ? null, isPyPy, @@ -74,9 +74,12 @@ buildPythonPackage rec { cargoRoot = "src/rust"; + build-system = [ + setuptools-rust + ]; + nativeBuildInputs = [ rustPlatform.cargoSetupHook - setuptoolsRustBuildHook cargo rustc pkg-config diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index b3c97de30317..602030cae5e3 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -441,20 +441,6 @@ in } ./setuptools-build-hook.sh ) { }; - setuptoolsRustBuildHook = callPackage ( - { makePythonHook, setuptools-rust }: - makePythonHook { - name = "setuptools-rust-setup-hook"; - propagatedBuildInputs = [ setuptools-rust ]; - substitutions = { - pyLibDir = "${python}/lib/${python.libPrefix}"; - cargoBuildTarget = stdenv.hostPlatform.rust.rustcTargetSpec; - cargoLinkerVar = stdenv.hostPlatform.rust.cargoEnvVarTarget; - targetLinker = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; - }; - } ./setuptools-rust-hook.sh - ) { }; - unittestCheckHook = callPackage ( { makePythonHook }: makePythonHook { diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 087e5026c33b..3e7dd96253f0 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, maturin, @@ -11,8 +12,9 @@ setuptools, setuptools-rust, setuptools-scm, + replaceVars, + targetPackages, }: - buildPythonPackage rec { pname = "setuptools-rust"; version = "1.12.0"; @@ -40,6 +42,23 @@ buildPythonPackage rec { doCheck = false; + # integrate the setup hook to set up the build environment for cross compilation + # this hook is automatically propagated to consumers using setuptools-rust as build-system + # + # Only include the setup hook if targetPackages.python3 is defined. + # targetPackages.python3 is not always available, for example when including + # setuptools-rust via buildInputs instead of nativeBuildInputs or building it directly. + setupHook = + if !(targetPackages ? python3) then + null + else + replaceVars ./setuptools-rust-hook.sh { + pyLibDir = "${targetPackages.python3}/lib/${targetPackages.python3.libPrefix}"; + cargoBuildTarget = stdenv.targetPlatform.rust.rustcTargetSpec; + cargoLinkerVar = stdenv.targetPlatform.rust.cargoEnvVarTarget; + targetLinker = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"; + }; + passthru.tests = { pyo3 = maturin.tests.pyo3.override { format = "setuptools"; diff --git a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh b/pkgs/development/python-modules/setuptools-rust/setuptools-rust-hook.sh similarity index 100% rename from pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh rename to pkgs/development/python-modules/setuptools-rust/setuptools-rust-hook.sh diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 321d01c9ba12..c0afe1d97df4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -437,6 +437,7 @@ mapAliases { sentry-sdk_2 = throw "'sentry-sdk_2' has been renamed to/replaced by 'sentry-sdk'"; # Converted to throw 2025-10-29 setuptools_dso = throw "'setuptools_dso' has been renamed to/replaced by 'setuptools-dso'"; # Converted to throw 2025-10-29 setuptools_scm = throw "'setuptools_scm' has been renamed to/replaced by 'setuptools-scm'"; # Converted to throw 2025-10-29 + setuptoolsRustBuildHook = lib.warn "setuptoolsRustBuildHook is deprecated. Instead, include 'setuptools-rust' via 'build-system'" setuptools-rust; # added 2025-12-07 setuptoolsTrial = throw "'setuptoolsTrial' has been renamed to/replaced by 'setuptools-trial'"; # Converted to throw 2025-10-29 sharkiqpy = throw "'sharkiqpy' has been renamed to/replaced by 'sharkiq'"; # Converted to throw 2025-10-29 shippai = throw "shippai has been removed because the upstream repository was archived in 2023"; # added 2025-07-09 From 42b175c6a7540176054f90c7338bd640bde56fdf Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 9 Dec 2025 11:46:12 +0300 Subject: [PATCH 483/542] perlPackages.Coro: fix build with gcc15 - add patch from fedora: https://src.fedoraproject.org/rpms/perl-Coro/raw/7099f289e10ec5d4d5dbbabe6267257588417693/f/Coro-6.57-c23.patch Upstream issue with that patch included: https://rt.cpan.org/Public/Bug/Display.html?id=158609 Fixes build failure with gcc15: ``` State.xs: In function 'XS_Coro__Util_time': State.xs:4576:18: error: too many arguments to function 'nvtime'; expected 0, have 1 4576 | RETVAL = nvtime (aTHX); | ^~~~~~ ``` --- pkgs/top-level/perl-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e4dc42ba21a..238226461e32 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6438,6 +6438,15 @@ with self; url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.57.tar.gz"; hash = "sha256-GSjkgDNUDhHr9VBpht0QGveNJCHSEPllmSI7FdUXFMY="; }; + patches = [ + # Fix build with gcc15 + # https://rt.cpan.org/Public/Bug/Display.html?id=158609 + (fetchpatch { + name = "perl-coro-c23.patch"; + url = "https://src.fedoraproject.org/rpms/perl-Coro/raw/7099f289e10ec5d4d5dbbabe6267257588417693/f/Coro-6.57-c23.patch"; + hash = "sha256-BnVE+E8taPfmAN+bsKK3AvesVrwi52GWUMa6TFJw3KY="; + }) + ]; propagatedBuildInputs = [ AnyEvent Guard From 29f7e17b012cbb03259ccb694ca5e5727b9ef347 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 9 Dec 2025 11:31:23 +0300 Subject: [PATCH 484/542] qt6.qtbase: use cmake lookup paths by default for finding other Qt bits --- .../libraries/qt-6/modules/qtbase/default.nix | 3 + .../qt-6/modules/qtbase/use-cmake-path.patch | 60 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-path.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index ab35d1906f73..12274295f258 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -215,6 +215,9 @@ stdenv.mkDerivation rec { # allow translations to be found outside of install prefix, as is the case in our split builds ./allow-translations-outside-prefix.patch + # make internal find_package calls between Qt components work with split builds + ./use-cmake-path.patch + # always link to libraries by name in qmake-generated build scripts ./qmake-always-use-libname.patch # always explicitly list includedir in qmake-generated pkg-config files diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-path.patch b/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-path.patch new file mode 100644 index 000000000000..4f5b48f18993 --- /dev/null +++ b/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-path.patch @@ -0,0 +1,60 @@ +diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in +index 93f47570706..b00d398d671 100644 +--- a/cmake/QtConfig.cmake.in ++++ b/cmake/QtConfig.cmake.in +@@ -190,7 +190,6 @@ foreach(module ${__qt_umbrella_find_components}) + ${_qt_additional_packages_prefix_paths} + ${__qt_find_package_host_qt_path} + ${_qt_additional_host_packages_prefix_paths} +- ${__qt_use_no_default_path_for_qt_packages} + ) + endif() + +diff --git a/cmake/QtFindWrapHelper.cmake b/cmake/QtFindWrapHelper.cmake +index c43824b8234..7ef65eb0f36 100644 +--- a/cmake/QtFindWrapHelper.cmake ++++ b/cmake/QtFindWrapHelper.cmake +@@ -79,7 +79,6 @@ macro(qt_find_package_system_or_bundled _unique_prefix) + "${CMAKE_CURRENT_LIST_DIR}/.." + ${_qt_cmake_dir} + ${_qt_additional_packages_prefix_paths} +- ${${_unique_prefix}_qt_use_no_default_path_for_qt_packages} + ) + else() + # For the non-bundled case we will look for FindWrapSystemFoo.cmake module files, +diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in +index e3af0299c57..2bbc06ddec3 100644 +--- a/cmake/QtModuleConfig.cmake.in ++++ b/cmake/QtModuleConfig.cmake.in +@@ -59,7 +59,6 @@ if (@INSTALL_CMAKE_NAMESPACE@@target@_FOUND + "${CMAKE_CURRENT_LIST_DIR}/.." + "${_qt_cmake_dir}" + ${_qt_additional_packages_prefix_paths} +- ${__qt_use_no_default_path_for_qt_packages} + ) + + if(NOT @INSTALL_CMAKE_NAMESPACE@@target_private@_FOUND) +diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in +index 78ada0a7425..74659943a83 100644 +--- a/cmake/QtModuleDependencies.cmake.in ++++ b/cmake/QtModuleDependencies.cmake.in +@@ -23,7 +23,6 @@ if(NOT @INSTALL_CMAKE_NAMESPACE@_FOUND) + "${CMAKE_CURRENT_LIST_DIR}/.." + "${_qt_cmake_dir}" + ${_qt_additional_packages_prefix_paths} +- ${__qt_use_no_default_path_for_qt_packages} + ) + endif() + +diff --git a/cmake/QtPublicDependencyHelpers.cmake b/cmake/QtPublicDependencyHelpers.cmake +index b4a0342ad87..a7de8750485 100644 +--- a/cmake/QtPublicDependencyHelpers.cmake ++++ b/cmake/QtPublicDependencyHelpers.cmake +@@ -144,7 +144,6 @@ macro(_qt_internal_find_qt_dependencies target target_dep_list find_dependency_p + ${QT_BUILD_CMAKE_PREFIX_PATH} + ${${find_dependency_path_list}} + ${_qt_additional_packages_prefix_paths} +- ${__qt_use_no_default_path_for_qt_packages} + ) + if(NOT ${__qt_${target}_pkg}_FOUND) + list(APPEND __qt_${target}_missing_deps "${__qt_${target}_pkg}") From 42074aa75e42dc4ad4892012e50683c1a0dfcb41 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 5 Dec 2025 20:19:21 -0400 Subject: [PATCH 485/542] hwloc: mark broken on cygwin --- pkgs/by-name/hw/hwloc/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/hw/hwloc/package.nix b/pkgs/by-name/hw/hwloc/package.nix index 9681f97f108f..602b0a5d2a5e 100644 --- a/pkgs/by-name/hw/hwloc/package.nix +++ b/pkgs/by-name/hw/hwloc/package.nix @@ -104,5 +104,6 @@ stdenv.mkDerivation (finalAttrs: { markuskowa ]; platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isCygwin; }; }) From f64484c10e840efb82bb2904d5c810ab2f524f30 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 9 Dec 2025 10:16:49 -0400 Subject: [PATCH 486/542] onetbb: remove cygwin from platforms --- pkgs/by-name/on/onetbb/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix index f820dc7a80ac..ef4186a873e1 100644 --- a/pkgs/by-name/on/onetbb/package.nix +++ b/pkgs/by-name/on/onetbb/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { template-based runtime library can help you harness the latent performance of multi-core processors. ''; - platforms = lib.platforms.all; + platforms = lib.subtractLists lib.platforms.cygwin lib.platforms.all; maintainers = with lib.maintainers; [ silvanshade thoughtpolice From 67c58b954466f721057012658e9cbe94c62ec8da Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 9 Dec 2025 23:14:24 +0800 Subject: [PATCH 487/542] spidermonkey_140: 140.5.0 -> 140.6.0 https://github.com/mozilla-firefox/firefox/commits/FIREFOX_140_6_0esr_RELEASE/js/src/build https://github.com/mozilla-firefox/firefox/commits/FIREFOX_140_6_0esr_RELEASE/build --- pkgs/development/interpreters/spidermonkey/140.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/140.nix b/pkgs/development/interpreters/spidermonkey/140.nix index 862aa494d240..8187047403b7 100644 --- a/pkgs/development/interpreters/spidermonkey/140.nix +++ b/pkgs/development/interpreters/spidermonkey/140.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "140.5.0"; - hash = "sha512-QSI2oly+oXG9W9U15Fw7pAlXqU4fjdOrdCQeCqHEB1/LjTlLlhlZnWDOPkVj5xLIJfqL7EQXlPIpNWgC9ysoYQ=="; + version = "140.6.0"; + hash = "sha512-7WZle9Sy2UeRiSJh18DA2VC09jDRKrKKd32TOTQnRRqaoSXloB7hXyrA/zeNC+B0oIWD3P/TVgkRK6Tm+a2nmA=="; } From e43405ce12391859d9e8a7fd52df325a0fb063ea Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 9 Dec 2025 13:29:05 +0100 Subject: [PATCH 488/542] arrow-cpp: enable azure filesystem support --- pkgs/by-name/ar/arrow-cpp/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 869e4946ee24..d5cc2821c61a 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -17,6 +17,7 @@ "transfer" ]; }, + azure-sdk-for-cpp, boost, brotli, bzip2, @@ -59,6 +60,7 @@ enableS3 ? true, # google-cloud-cpp fails to build on RiscV enableGcs ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isRiscV64, + enableAzure ? true, }: let @@ -170,6 +172,11 @@ stdenv.mkDerivation (finalAttrs: { google-cloud-cpp grpc nlohmann_json + ] + ++ lib.optionals enableAzure [ + azure-sdk-for-cpp.identity + azure-sdk-for-cpp.storage-blobs + azure-sdk-for-cpp.storage-files-datalake ]; # apache-orc looks for things in caps @@ -224,6 +231,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ARROW_FLIGHT_TESTING" enableFlight) (lib.cmakeBool "ARROW_S3" enableS3) (lib.cmakeBool "ARROW_GCS" enableGcs) + (lib.cmakeBool "ARROW_AZURE" enableAzure) (lib.cmakeBool "ARROW_ORC" true) # Parquet options: (lib.cmakeBool "ARROW_PARQUET" true) From 8ae30516b638d364cbc121fe307e841a9f22f737 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 9 Dec 2025 21:29:06 +0300 Subject: [PATCH 489/542] qt6.qtdeclarative: cherry-pick patch to fix random Plasma crashes --- .../libraries/qt-6/modules/qtdeclarative/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index 58271c82c9ba..9579af8c3499 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -10,6 +10,7 @@ lib, pkgsBuildBuild, replaceVars, + fetchpatch, }: qtModule { @@ -35,6 +36,13 @@ qtModule { }) # add version specific QML import path ./use-versioned-import-path.patch + + # fix common Plasma crasher + # FIXME: remove in 6.10.2 + (fetchpatch { + url = "https://github.com/qt/qtdeclarative/commit/9c6b2b78e9076f1c2676aa0c41573db9ca480654.diff"; + hash = "sha256-KMFurA9Q84qwuyBraU3ZdoFWs8uO3uoUcinfcfh/ps8="; + }) ]; cmakeFlags = [ From 9b2447713a60445c2f63ef0d5cb7b9cd16fe99b3 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 11 Sep 2025 20:00:12 -0300 Subject: [PATCH 490/542] libblake3: fix cygwin build --- pkgs/by-name/li/libblake3/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index e9aa97718628..6259025537b9 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -6,7 +6,7 @@ fetchpatch, onetbb, - useTBB ? true, + useTBB ? lib.meta.availableOn stdenv.hostPlatform onetbb, }: stdenv.mkDerivation (finalAttrs: { @@ -38,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls="; relative = "c"; }) + # fix cygwin build + (fetchpatch { + url = "https://github.com/BLAKE3-team/BLAKE3/commit/d62babb7ebb01c8ac4aaa580f4b49071a639195e.patch"; + hash = "sha256-qO8HsmBIAkR03rqITooyBiQTorUM6JCJLZOrOc2yss8="; + relative = "c"; + }) ]; sourceRoot = finalAttrs.src.name + "/c"; From cae8c6463e97e29e004389a644215715d6d02db7 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 9 Dec 2025 22:52:22 +0100 Subject: [PATCH 491/542] pipewire: remove dependency on /bin/sh --- pkgs/development/libraries/pipewire/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index bb889da7ea81..44d62f0b9227 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -66,6 +66,7 @@ ffado, libselinux, libebur128, + bashNonInteractive, }: let @@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { lilv ncurses readline + bashNonInteractive ] ++ ( if enableSystemd then From 75d8103edaef02149097ded5639ca99357055cfb Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 9 Dec 2025 17:29:31 +0100 Subject: [PATCH 492/542] arrow-cpp: enable GCS support on darwin --- pkgs/by-name/ar/arrow-cpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index d5cc2821c61a..330eb4d44c74 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -59,7 +59,7 @@ !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isRiscV64, enableS3 ? true, # google-cloud-cpp fails to build on RiscV - enableGcs ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isRiscV64, + enableGcs ? !stdenv.hostPlatform.isRiscV64, enableAzure ? true, }: From c945f494033d4c05f345bc17889137049d840454 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:03:14 +0300 Subject: [PATCH 493/542] glslang: 16.0.0 -> 16.1.0 Diff: https://github.com/KhronosGroup/glslang/compare/16.0.0...16.1.0 --- pkgs/by-name/gl/glslang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix index 51a7e8699a67..e53fa313d4bd 100644 --- a/pkgs/by-name/gl/glslang/package.nix +++ b/pkgs/by-name/gl/glslang/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "16.0.0"; + version = "16.1.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY="; + hash = "sha256-cEREniYgSd62mnvKaQkgs69ETL5pLl5Gyv3hKOtSv3w="; }; outputs = [ From e68c2984985911c5c69e64bf62bec8f764591858 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:03:21 +0300 Subject: [PATCH 494/542] vulkan-headers: 1.4.328.0 -> 1.4.335.0 Diff: https://github.com/KhronosGroup/Vulkan-Headers/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335.0 --- pkgs/by-name/vu/vulkan-headers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-headers/package.nix b/pkgs/by-name/vu/vulkan-headers/package.nix index cd719a2021ce..6175537f2238 100644 --- a/pkgs/by-name/vu/vulkan-headers/package.nix +++ b/pkgs/by-name/vu/vulkan-headers/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.4.328.0"; + version = "1.4.335.0"; # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or # later the build fails as: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU="; + hash = "sha256-DIePLzDoImnaso0WYUv819wSDeA7Zy1I/tYAbsALXKg="; }; passthru.updateScript = ./update.sh; From f12a55378e7089a566209713199ba0ebcdfddb92 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:03:27 +0300 Subject: [PATCH 495/542] vulkan-loader: 1.4.328.0 -> 1.4.335.0 Diff: https://github.com/KhronosGroup/Vulkan-Loader/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335.0 --- pkgs/by-name/vu/vulkan-loader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index 97cfc1168acf..1413a374f3f0 100644 --- a/pkgs/by-name/vu/vulkan-loader/package.nix +++ b/pkgs/by-name/vu/vulkan-loader/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-+cuKdhdCMIL4b+GzIpCNrDBmC7cVX0iX2QW7BQIj9Tc="; + hash = "sha256-1xLT4AynJumzwkYOBS5i0OpCi3EdE8QctctDn+DGrvU="; }; patches = [ ./fix-pkgconfig.patch ]; From fe84f3a9989e6b45d337c106fc8d8b270c2bf19a Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:03:37 +0300 Subject: [PATCH 496/542] vulkan-validation-layers: 1.4.328.0 -> 1.4.335.0 Diff: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335.0 --- pkgs/by-name/vu/vulkan-validation-layers/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix index 9a363aacc58d..3683e27c892e 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, cmake, pkg-config, + python3, jq, glslang, libffi, @@ -25,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-iz6kWvnfVnznn78XNHJqSvIW4TYkp2KgEFT302VAiaY="; + hash = "sha256-FRxr33epHe+HIH/7Y7ms+6E9L0yzaNnFzN3YnswZfRo="; }; strictDeps = true; @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + python3 jq ]; From 05d3af6f7a2376c18264db9cd42d9edb42e20c38 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:03:42 +0300 Subject: [PATCH 497/542] vulkan-tools: 1.4.328.0 -> 1.4.335 Diff: https://github.com/KhronosGroup/Vulkan-Tools/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335 --- pkgs/by-name/vu/vulkan-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix index 122e75d0e40b..9e731a7c20c7 100644 --- a/pkgs/by-name/vu/vulkan-tools/package.nix +++ b/pkgs/by-name/vu/vulkan-tools/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.4.328.0"; + version = "1.4.335"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-QoqlHrhgaV1SRLAxmYUXaKxH1IdbnxqkcJklDy20ORg="; + hash = "sha256-C/wzLLiG7DrLyP3YRKhjawNoEOCCogXkrFeBczeVZR0="; }; patches = [ ./wayland-scanner.patch ]; From b040ec7f04a192c4000e07b3142ca4b24ca2ba68 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:03:46 +0300 Subject: [PATCH 498/542] vulkan-tools-lunarg: 1.4.328.0 -> 1.4.335.0 Diff: https://github.com/LunarG/VulkanTools/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335.0 --- pkgs/by-name/vu/vulkan-tools-lunarg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix index b4ec722ca336..4b1434f9394d 100644 --- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix +++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-kywAcpBYLSlhEbgssXGwMoXQC03QUEz4dwsvI0I8Nh4="; + hash = "sha256-2DUxlGH9Yco64Y74QByVniWXiYYy+e4MfyN4S+E6KKA="; }; nativeBuildInputs = [ From eec4838bb8096d6f146b83cf942ec82d7b3f627e Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:03:50 +0300 Subject: [PATCH 499/542] vulkan-extension-layer: 1.4.328.0 -> 1.4.335.0 Diff: https://github.com/KhronosGroup/Vulkan-ExtensionLayer/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335.0 --- pkgs/by-name/vu/vulkan-extension-layer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix index 057589a9a18c..1f6d88f51665 100644 --- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix +++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-J9l20abn7meSF0WnCh3cepYKQh10ezb0mAKzc0HAo1w="; + hash = "sha256-1Ax/0W882nJFO2hVqXamT89lFu5ncnrytnwDdUIihnk="; }; nativeBuildInputs = [ From aa31a1d9b835ee6844d2b51fdf0f326906a2544f Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:03:54 +0300 Subject: [PATCH 500/542] vulkan-utility-libraries: 1.4.328.0 -> 1.4.335.0 Diff: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335.0 --- pkgs/by-name/vu/vulkan-utility-libraries/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix index 03066b567ef5..b56d5ebe538d 100644 --- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix +++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg="; + hash = "sha256-lDO0B7wEYT6cc/t/ZW5OAxxgRfDORoGd+pF5r5R7yoQ="; }; nativeBuildInputs = [ From ab4bbc2db46ceb23c299b50c3c6eba5b0989e6cb Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:04:00 +0300 Subject: [PATCH 501/542] vulkan-volk: 1.4.328.0 -> 1.4.335.0 Diff: https://github.com/zeux/volk/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335.0 --- pkgs/by-name/vu/vulkan-volk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index 5168ba77f452..e873f65d69d6 100644 --- a/pkgs/by-name/vu/vulkan-volk/package.nix +++ b/pkgs/by-name/vu/vulkan-volk/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-7JhTLhCqdn/zDIYdIb2xJnjJVk57i+6M5OXk0KvfpDk="; + hash = "sha256-qAMMhaeJweHNeW7+5RUpFh65jUnuw0TsYwq3PrKvCkM="; }; nativeBuildInputs = [ cmake ]; From ed62910c22bb622728227d3c1fd79a15317f0627 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:04:12 +0300 Subject: [PATCH 502/542] spirv-headers: 1.4.328.0 -> 1.4.335.0 Diff: https://github.com/KhronosGroup/SPIRV-Headers/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335.0 --- pkgs/by-name/sp/spirv-headers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix index 400c8244a344..c3865d9095f6 100644 --- a/pkgs/by-name/sp/spirv-headers/package.nix +++ b/pkgs/by-name/sp/spirv-headers/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-headers"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08="; + hash = "sha256-HjJjMuqTrYv5LUOWcexzPHb8nhOT4duooDAhDsd44Zo="; }; nativeBuildInputs = [ cmake ]; From 5aa788b5d14439c8ee36def090f08c5b9a2dda89 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:04:20 +0300 Subject: [PATCH 503/542] spirv-cross: 1.4.328.0 -> 1.4.335.0 Diff: https://github.com/KhronosGroup/SPIRV-Cross/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335.0 Changelog: https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/1.4.335.0 --- pkgs/by-name/sp/spirv-cross/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix index 9fde81732aaa..46fe856168ed 100644 --- a/pkgs/by-name/sp/spirv-cross/package.nix +++ b/pkgs/by-name/sp/spirv-cross/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-Fq2Kw8KOlh35hRZy5EnPtWAjazun4vdTk/HyhY76GRM="; + hash = "sha256-BmWHmGh7wu2hkOm04PhHxwTs3e8r8O62tq6SDx6b5xM="; }; nativeBuildInputs = [ From 125ae4d26933edf953d243382d736b77a4aca7df Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Dec 2025 12:04:24 +0300 Subject: [PATCH 504/542] spirv-tools: 1.4.328.0 -> 1.4.335.0 Diff: https://github.com/KhronosGroup/SPIRV-Tools/compare/vulkan-sdk-1.4.328.0...vulkan-sdk-1.4.335.0 --- pkgs/by-name/sp/spirv-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index 03b10d0abcd9..9ed7e14058c3 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-tools"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-NXxC5XLvEEIAlA0sym6l7vWj+g8pJ4trsJI3pmZwRxU="; + hash = "sha256-H+t7ZH4SB+XgWTLj9XaJWZwAWk8M2QeC98Zi5ay8PBc="; }; # The cmake options are sufficient for turning on static building, but not From e43b118a07541bea79ed617a0fe71f8f0acb7e0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Dec 2025 21:12:42 +0100 Subject: [PATCH 505/542] python3Packages.sqlalchemy: 2.0.44 -> 2.0.45 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_45 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 9c55660d9f66..cc4c819b85d7 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.44"; + version = "2.0.45"; pyproject = true; disabled = pythonOlder "3.7"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-XjmSMgFOMYzJ5IR7tDImj37mM7qhiesKsaBerfzxL4g="; + hash = "sha256-ZAiRR456KkSdXkCiy+TXjdeOJwrLlmVxJfl1x8/XHIs="; }; postPatch = '' From 1d3883bdeddab72bc0590d0a52664eeaa8d326fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 11 Dec 2025 01:55:01 +0100 Subject: [PATCH 506/542] python3Packages.hatchling: 1.27.0 -> 1.28.0 https://github.com/pypa/hatch/releases/tag/hatchling-v1.28.0 --- pkgs/development/python-modules/hatchling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index e5826164a6a1..d119bdf1169f 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "hatchling"; - version = "1.27.0"; + version = "1.28.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lxwpbZgZq7OBERL8UsepdRyNOBiY82Uzuxb5eR6UH9Y="; + hash = "sha256-TVCwKuzmiSuM0LPObILLIYWU0+xYNtvedb9BohqwBMg="; }; # listed in backend/pyproject.toml From b5a49822196030726b7ea685513af24cdf28a418 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 15 Nov 2025 19:23:57 -0500 Subject: [PATCH 507/542] Revert "buildMozillaMach: use llvmPackages_20 on aarch64-darwin" This reverts commit 40eea21c1e7baf2ec02fbc5cf0a58805371c3ef4. --- .../build-mozilla-mach/default.nix | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 3f20759e952e..aefd57fbe0b4 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -59,7 +59,9 @@ in pkgsCross, # wasm32 rlbox python3, runCommand, + rustc, rust-cbindgen, + rustPlatform, unzip, which, wrapGAppsHook3, @@ -201,25 +203,9 @@ assert elfhackSupport -> isElfhackPlatform stdenv; let inherit (lib) enableFeature; - rustPackages = - pkgs: - (pkgs.rust.override ( - # aarch64-darwin firefox crashes on loading favicons due to a llvm 21 bug: - # https://github.com/NixOS/nixpkgs/issues/453372 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1995582#c16 - lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { - llvmPackages = pkgs.llvmPackages_20; - } - )).packages.stable; - - toRustC = pkgs: (rustPackages pkgs).rustc; - - rustc = toRustC pkgs; - inherit (rustPackages pkgs) rustPlatform; - # Target the LLVM version that rustc is built with for LTO. llvmPackages0 = rustc.llvmPackages; - llvmPackagesBuildBuild0 = (toRustC pkgsBuildBuild).llvmPackages; + llvmPackagesBuildBuild0 = pkgsBuildBuild.rustc.llvmPackages; # Force the use of lld and other llvm tools for LTO llvmPackages = llvmPackages0.override { @@ -234,7 +220,7 @@ let # LTO requires LLVM bintools including ld.lld and llvm-ar. buildStdenv = overrideCC llvmPackages.stdenv ( llvmPackages.stdenv.cc.override { - bintools = if ltoSupport then (toRustC buildPackages).llvmPackages.bintools else stdenv.cc.bintools; + bintools = if ltoSupport then buildPackages.rustc.llvmPackages.bintools else stdenv.cc.bintools; } ); From 55c48627588220fff38aabdbd8f6f80a41ba2728 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Mon, 24 Nov 2025 13:05:30 -0500 Subject: [PATCH 508/542] cargo-auditable: Refactor to be use a fixed-point builder --- .../compilers/rust/cargo-auditable.nix | 125 ++++++++++-------- 1 file changed, 67 insertions(+), 58 deletions(-) diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix index 2abda28c4d11..e1cf713e819a 100644 --- a/pkgs/development/compilers/rust/cargo-auditable.nix +++ b/pkgs/development/compilers/rust/cargo-auditable.nix @@ -8,41 +8,6 @@ }: let - args = rec { - pname = "cargo-auditable"; - version = "0.6.5"; - - src = fetchFromGitHub { - owner = "rust-secure-code"; - repo = "cargo-auditable"; - rev = "v${version}"; - sha256 = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-oTPGmoGlNfPVZ6qha/oXyPJp94fT2cNlVggbIGHf2bc="; - }; - - checkFlags = [ - # requires wasm32-unknown-unknown target - "--skip=test_wasm" - ]; - - meta = { - description = "Tool to make production Rust binaries auditable"; - mainProgram = "cargo-auditable"; - homepage = "https://github.com/rust-secure-code/cargo-auditable"; - changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md"; - license = with lib.licenses; [ - mit # or - asl20 - ]; - maintainers = with lib.maintainers; [ RossSmyth ]; - broken = stdenv.hostPlatform != stdenv.buildPlatform; - }; - }; - rustPlatform = makeRustPlatform { inherit (buildPackages) rustc; cargo = buildPackages.cargo.override { @@ -50,27 +15,71 @@ let }; }; - bootstrap = rustPlatform.buildRustPackage ( - args - // { - auditable = false; - } - ); + auditableBuilder = lib.extendMkDerivation { + constructDrv = rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; }; + + extendDrvArgs = + finalAttrs: + { + pname ? "cargo-auditable", + auditable ? true, + ... + }: + { + inherit auditable pname; + version = "0.6.5"; + + src = fetchFromGitHub { + owner = "rust-secure-code"; + repo = "cargo-auditable"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8="; + }; + + cargoHash = "sha256-oTPGmoGlNfPVZ6qha/oXyPJp94fT2cNlVggbIGHf2bc="; + + nativeBuildInputs = [ + installShellFiles + ]; + + checkFlags = [ + # requires wasm32-unknown-unknown target + "--skip=test_wasm" + ] + ++ lib.optionals (!auditable) [ + "--skip=test_proc_macro" + "--skip=test_self_hosting" + ]; + + postInstall = '' + installManPage cargo-auditable/cargo-auditable.1 + ''; + + passthru = { + inherit bootstrap; + }; + + meta = { + description = "Tool to make production Rust binaries auditable"; + mainProgram = "cargo-auditable"; + homepage = "https://github.com/rust-secure-code/cargo-auditable"; + changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${finalAttrs.version}/cargo-auditable/CHANGELOG.md"; + license = with lib.licenses; [ + mit # or + asl20 + ]; + maintainers = with lib.maintainers; [ RossSmyth ]; + broken = stdenv.hostPlatform != stdenv.buildPlatform; + }; + }; + }; + + # cargo-auditable cannot be built with cargo-auditable until cargo-auditable is built + bootstrap = auditableBuilder { + pname = "cargo-auditable-bootstrap"; + auditable = false; + }; in - -rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } ( - args - // { - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = '' - installManPage cargo-auditable/cargo-auditable.1 - ''; - - passthru = { - inherit bootstrap; - }; - } -) +auditableBuilder { + auditable = true; +} From ed2d4c551b46d4b836369400690cb92f2e9a2350 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Mon, 24 Nov 2025 13:29:53 -0500 Subject: [PATCH 509/542] cargo-auditable: Move to by-name --- .../ca/cargo-auditable/package.nix} | 4 ++-- pkgs/development/compilers/rust/1_91.nix | 9 ++++++++- pkgs/development/compilers/rust/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 12 insertions(+), 5 deletions(-) rename pkgs/{development/compilers/rust/cargo-auditable.nix => by-name/ca/cargo-auditable/package.nix} (93%) diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/by-name/ca/cargo-auditable/package.nix similarity index 93% rename from pkgs/development/compilers/rust/cargo-auditable.nix rename to pkgs/by-name/ca/cargo-auditable/package.nix index e1cf713e819a..cd1ca12f3a9b 100644 --- a/pkgs/development/compilers/rust/cargo-auditable.nix +++ b/pkgs/by-name/ca/cargo-auditable/package.nix @@ -45,8 +45,8 @@ let checkFlags = [ # requires wasm32-unknown-unknown target "--skip=test_wasm" - ] - ++ lib.optionals (!auditable) [ + # Seems to be a bug in tests of locked vs. semver compatible packages + # https://github.com/rust-secure-code/cargo-auditable/issues/235 "--skip=test_proc_macro" "--skip=test_self_hosting" ]; diff --git a/pkgs/development/compilers/rust/1_91.nix b/pkgs/development/compilers/rust/1_91.nix index a5fee800afa4..c9d31d1899d4 100644 --- a/pkgs/development/compilers/rust/1_91.nix +++ b/pkgs/development/compilers/rust/1_91.nix @@ -8,6 +8,11 @@ # Check the version number in the src/llvm-project git submodule in: # https://github.com/rust-lang/rust/blob//.gitmodules +# Note: The way this is structured is: +# 1. Import default.nix, and apply arguments as needed for the file-defined function +# 2. Implicitly, all arguments to this file are applied to the function that is imported. +# if you want to add an argument to default.nix's top-level function, but not the function +# it instantiates, add it to the `removeAttrs` call below. { stdenv, lib, @@ -22,6 +27,7 @@ wrapRustcWith, llvmPackages, llvm, + cargo-auditable, wrapCCWith, overrideCC, fetchpatch, @@ -51,7 +57,7 @@ import ./default.nix llvmSharedForHost = llvmSharedFor pkgsBuildHost; llvmSharedForTarget = llvmSharedFor pkgsBuildTarget; - inherit llvmPackages; + inherit llvmPackages cargo-auditable; # For use at runtime llvmShared = llvmSharedFor pkgsHostTarget; @@ -93,5 +99,6 @@ import ./default.nix "overrideCC" "pkgsHostTarget" "fetchpatch" + "cargo-auditable" ] ) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 460c99ef5e17..5324a9f84020 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -11,6 +11,7 @@ llvmSharedForHost, llvmSharedForTarget, llvmPackages, # Exposed through rustc for LTO in Firefox + cargo-auditable, }: { stdenv, @@ -125,7 +126,7 @@ in } else self.callPackage ./cargo_cross.nix { }; - cargo-auditable = self.callPackage ./cargo-auditable.nix { }; + inherit cargo-auditable; cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { }; clippy-unwrapped = self.callPackage ./clippy.nix { }; clippy = if !fastCross then self.clippy-unwrapped else self.callPackage ./clippy-wrapper.nix { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e58ef7dbc20f..7dbb20fc9c09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5205,7 +5205,6 @@ with pkgs; inherit (rustPackages) cargo - cargo-auditable cargo-auditable-cargo-wrapper clippy rustc From 78cab60536fc803cd2aecf6df1d54dfb99af3e76 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Mon, 24 Nov 2025 13:37:52 -0500 Subject: [PATCH 510/542] cargo-auditable: Move builder to seperate file --- pkgs/by-name/ca/cargo-auditable/builder.nix | 63 ++++++++++++++++++ pkgs/by-name/ca/cargo-auditable/package.nix | 74 ++++----------------- 2 files changed, 75 insertions(+), 62 deletions(-) create mode 100644 pkgs/by-name/ca/cargo-auditable/builder.nix diff --git a/pkgs/by-name/ca/cargo-auditable/builder.nix b/pkgs/by-name/ca/cargo-auditable/builder.nix new file mode 100644 index 000000000000..348ff29ef61a --- /dev/null +++ b/pkgs/by-name/ca/cargo-auditable/builder.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + auditable-bootstrap, +}: +lib.extendMkDerivation { + constructDrv = rustPlatform.buildRustPackage.override { cargo-auditable = auditable-bootstrap; }; + + extendDrvArgs = + finalAttrs: + { + pname ? "cargo-auditable", + auditable ? true, + hash ? "", + cargoHash ? "", + ... + }: + { + inherit auditable pname; + + src = fetchFromGitHub { + owner = "rust-secure-code"; + repo = "cargo-auditable"; + tag = "v${finalAttrs.version}"; + inherit hash; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + checkFlags = [ + # requires wasm32-unknown-unknown target + "--skip=test_wasm" + # Seems to be a bug in tests of locked vs. semver compatible packages + # https://github.com/rust-secure-code/cargo-auditable/issues/235 + "--skip=test_proc_macro" + "--skip=test_self_hosting" + ]; + + postInstall = '' + installManPage cargo-auditable/cargo-auditable.1 + ''; + + passthru.bootstrap = auditable-bootstrap; + + meta = { + description = "Tool to make production Rust binaries auditable"; + mainProgram = "cargo-auditable"; + homepage = "https://github.com/rust-secure-code/cargo-auditable"; + changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${finalAttrs.version}/cargo-auditable/CHANGELOG.md"; + license = with lib.licenses; [ + mit # or + asl20 + ]; + maintainers = with lib.maintainers; [ RossSmyth ]; + broken = stdenv.hostPlatform != stdenv.buildPlatform; + }; + }; +} diff --git a/pkgs/by-name/ca/cargo-auditable/package.nix b/pkgs/by-name/ca/cargo-auditable/package.nix index cd1ca12f3a9b..7e8e4e0810d4 100644 --- a/pkgs/by-name/ca/cargo-auditable/package.nix +++ b/pkgs/by-name/ca/cargo-auditable/package.nix @@ -1,13 +1,11 @@ { - lib, buildPackages, - fetchFromGitHub, + callPackage, makeRustPlatform, - installShellFiles, - stdenv, }: - let + # Need to use the build platform rustc and Cargo so that + # we don't infrec rustPlatform = makeRustPlatform { inherit (buildPackages) rustc; cargo = buildPackages.cargo.override { @@ -15,71 +13,23 @@ let }; }; - auditableBuilder = lib.extendMkDerivation { - constructDrv = rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; }; - - extendDrvArgs = - finalAttrs: - { - pname ? "cargo-auditable", - auditable ? true, - ... - }: - { - inherit auditable pname; - version = "0.6.5"; - - src = fetchFromGitHub { - owner = "rust-secure-code"; - repo = "cargo-auditable"; - tag = "v${finalAttrs.version}"; - hash = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8="; - }; - - cargoHash = "sha256-oTPGmoGlNfPVZ6qha/oXyPJp94fT2cNlVggbIGHf2bc="; - - nativeBuildInputs = [ - installShellFiles - ]; - - checkFlags = [ - # requires wasm32-unknown-unknown target - "--skip=test_wasm" - # Seems to be a bug in tests of locked vs. semver compatible packages - # https://github.com/rust-secure-code/cargo-auditable/issues/235 - "--skip=test_proc_macro" - "--skip=test_self_hosting" - ]; - - postInstall = '' - installManPage cargo-auditable/cargo-auditable.1 - ''; - - passthru = { - inherit bootstrap; - }; - - meta = { - description = "Tool to make production Rust binaries auditable"; - mainProgram = "cargo-auditable"; - homepage = "https://github.com/rust-secure-code/cargo-auditable"; - changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${finalAttrs.version}/cargo-auditable/CHANGELOG.md"; - license = with lib.licenses; [ - mit # or - asl20 - ]; - maintainers = with lib.maintainers; [ RossSmyth ]; - broken = stdenv.hostPlatform != stdenv.buildPlatform; - }; - }; + auditableBuilder = callPackage ./builder.nix { + inherit rustPlatform; + auditable-bootstrap = bootstrap; }; + hash = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8="; + cargoHash = "sha256-oTPGmoGlNfPVZ6qha/oXyPJp94fT2cNlVggbIGHf2bc="; + version = "0.6.5"; + # cargo-auditable cannot be built with cargo-auditable until cargo-auditable is built bootstrap = auditableBuilder { + inherit version hash cargoHash; pname = "cargo-auditable-bootstrap"; auditable = false; }; in auditableBuilder { + inherit version hash cargoHash; auditable = true; } From 41a36d34dc0ea772d197dcbff0f877f5c8bac384 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Mon, 24 Nov 2025 13:43:55 -0500 Subject: [PATCH 511/542] cargo-auditable: 0.6.5 -> 0.7.2 --- pkgs/by-name/ca/cargo-auditable/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-auditable/package.nix b/pkgs/by-name/ca/cargo-auditable/package.nix index 7e8e4e0810d4..b74e0abbd515 100644 --- a/pkgs/by-name/ca/cargo-auditable/package.nix +++ b/pkgs/by-name/ca/cargo-auditable/package.nix @@ -18,9 +18,9 @@ let auditable-bootstrap = bootstrap; }; - hash = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8="; - cargoHash = "sha256-oTPGmoGlNfPVZ6qha/oXyPJp94fT2cNlVggbIGHf2bc="; - version = "0.6.5"; + version = "0.7.2"; + hash = "sha256-hR6PjTOps8JSM7UbfGlCoZmmwtWExVqYwh4lxDiFWdc="; + cargoHash = "sha256-JEfnUJ9J6Xak3AOCwQCnu+v+3Wl3QbXX20qVFWB6040="; # cargo-auditable cannot be built with cargo-auditable until cargo-auditable is built bootstrap = auditableBuilder { From ee0923ac764941d89e4787a1d5339eaedab00008 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 11 Dec 2025 18:13:43 +0100 Subject: [PATCH 512/542] haskellPackages.http2-tls: fix eval This broke via staging merge. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 83ae6e6f4f54..b62b34ec0807 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3024,7 +3024,7 @@ with haskellLib; http2-tls = lib.warnIf (lib.versionAtLeast self.tls.version "2.1.10") "haskellPackages.http2-tls: tls override can be removed" - (super.http2-tls.override { tls = self.tls_2_1_12; }); + (super.http2-tls.override { tls = self.tls_2_1_13; }); # Relax http2 version bound (5.3.9 -> 5.3.10) # https://github.com/well-typed/grapesy/issues/297 From b8bc22382c9a1d298d6cda468f39a917d0874621 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 11 Dec 2025 23:57:29 -0800 Subject: [PATCH 513/542] libcamera: 0.5.2 -> 0.6.0 Changelog: https://git.libcamera.org/libcamera/libcamera.git/tag/?h=v0.6.0 --- pkgs/by-name/li/libcamera/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index 5633a74ec866..97d3893925eb 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.5.2"; + version = "0.6.0"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-nr1LmnedZMGBWLf2i5uw4E/OMeXObEKgjuO+PUx/GDY="; + hash = "sha256-zGcbzL1Q2hUaj/s9NjBlp7hVjmSFb0GF8CnCoDS82Tw="; }; outputs = [ @@ -112,6 +112,7 @@ stdenv.mkDerivation rec { "-Dv4l2=true" (lib.mesonEnable "tracing" withTracing) (lib.mesonEnable "qcam" withQcam) + "-Dlibunwind=disabled" "-Dlc-compliance=disabled" # tries unconditionally to download gtest when enabled # Avoid blanket -Werror to evade build failures on less # tested compilers. From a1051077e6468fe0b35bdedd277efe3d4c484ba1 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 12 Dec 2025 12:12:57 +0100 Subject: [PATCH 514/542] qt6.qtdeclarative: cherry-pick r-b fixes Already merged upstream, but 6.10.2 is some way off still. Should fix #384761 --- .../libraries/qt-6/modules/qtdeclarative/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index 9579af8c3499..07f95c229028 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -43,6 +43,18 @@ qtModule { url = "https://github.com/qt/qtdeclarative/commit/9c6b2b78e9076f1c2676aa0c41573db9ca480654.diff"; hash = "sha256-KMFurA9Q84qwuyBraU3ZdoFWs8uO3uoUcinfcfh/ps8="; }) + + # https://qt-project.atlassian.net/browse/QTBUG-137440 + (fetchpatch { + name = "rb-dialogs-link-labsfolderlistmodel-into-quickdialogs2quickimpl.patch"; + url = "https://github.com/qt/qtdeclarative/commit/4047fa8c6017d8e214e6ec3ddbed622fd34058e4.patch"; + hash = "sha256-0a7a1AI8N35rqLY4M3aSruXXPBqz9hX2yT65r/xzfhc="; + }) + (fetchpatch { + name = "rb-quickcontrols-fix-controls-styles-linkage.patch"; + url = "https://github.com/qt/qtdeclarative/commit/aa805ed54d55479360e0e95964dcc09a858aeb28.patch"; + hash = "sha256-EDdsXRokHPQ5jflaVucOZP3WSopMjrAM39WZD1Hk/5I="; + }) ]; cmakeFlags = [ From e9444254dc071712cc58609b891cc16019427adb Mon Sep 17 00:00:00 2001 From: ghpzin Date: Fri, 12 Dec 2025 17:16:34 +0300 Subject: [PATCH 515/542] ucx: fix FOD hash - fix FOD hash for `src` with tag `v1.19.1` Upstream seems to have moved `v1.19.1` tag: https://github.com/openucx/ucx/commits/v1.19.1/ and "rereleased" https://github.com/openucx/ucx/releases/tag/v1.19.1 because of: https://www.github.com/openucx/ucx/pull/11039 after update PR was merged in nixpkgs. Now `v1.19.1` tag points to commit: https://github.com/openucx/ucx/commit/7009d7a19b1c2464224a3fe117a4155fb29298f5 instead of commit it pointed to before: https://github.com/openucx/ucx/commit/a702467fd479dde8699f1f3d329733f51d0a9ab9 (confirmed by changing `rev`, it produces previous hash) Fixes build failure: ``` error: hash mismatch in fixed-output derivation '/nix/store/wyy75b1nangzbxsfv80rflv34dvr4irv-source.drv': specified: sha256-goANgYuMO1yColKOrqoBOj+yh68OSW7O8Ppng/pd4b0= got: sha256-54yLejOFdCa2KYstZuo+hZ5lSQR8WTZMa7lS0prc5NY= ``` --- pkgs/by-name/uc/ucx/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/uc/ucx/package.nix b/pkgs/by-name/uc/ucx/package.nix index 6d99bdd2c949..9c984b3913ac 100644 --- a/pkgs/by-name/uc/ucx/package.nix +++ b/pkgs/by-name/uc/ucx/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "openucx"; repo = "ucx"; tag = "v${finalAttrs.version}"; - hash = "sha256-goANgYuMO1yColKOrqoBOj+yh68OSW7O8Ppng/pd4b0="; + hash = "sha256-54yLejOFdCa2KYstZuo+hZ5lSQR8WTZMa7lS0prc5NY="; }; outputs = [ From 4179e19ecd060b1086ef97eb87fe8a98766a9df1 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 00:17:42 +0100 Subject: [PATCH 516/542] fftw: fix structuredAttrs --- pkgs/by-name/ff/fftw/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix index 1e08014e8fce..3d3678210441 100644 --- a/pkgs/by-name/ff/fftw/package.nix +++ b/pkgs/by-name/ff/fftw/package.nix @@ -66,9 +66,15 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (precision != "double") "--enable-${precision}" # https://www.fftw.org/fftw3_doc/SIMD-alignment-and-fftw_005fmalloc.html # FFTW will try to detect at runtime whether the CPU supports these extensions - ++ lib.optional ( - stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double") - ) "--enable-sse2 --enable-avx --enable-avx2 --enable-avx512 --enable-avx128-fma" + ++ + lib.optionals (stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double")) + [ + "--enable-sse2" + "--enable-avx" + "--enable-avx2" + "--enable-avx512" + "--enable-avx128-fma" + ] ++ lib.optionals enableMpi [ "--enable-mpi" # link libfftw3_mpi explicitly with -lmpi @@ -92,6 +98,8 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + __structuredAttrs = true; + meta = { description = "Fastest Fourier Transform in the West library"; homepage = "https://www.fftw.org/"; From c9821405d3762a7212729241bff489e8eb99f661 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 00:18:07 +0100 Subject: [PATCH 517/542] fftw: use 'hash', fix deprecation warning --- pkgs/by-name/ff/fftw/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix index 3d3678210441..1ea58f8fa362 100644 --- a/pkgs/by-name/ff/fftw/package.nix +++ b/pkgs/by-name/ff/fftw/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { "https://fftw.org/fftw-${finalAttrs.version}.tar.gz" "ftp://ftp.fftw.org/pub/fftw/fftw-${finalAttrs.version}.tar.gz" ]; - sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; + hash = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; }; patches = [ @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { # fftw builds with -mtune=native by default postPatch = '' - substituteInPlace configure --replace "-mtune=native" "-mtune=generic" + substituteInPlace configure --replace-fail "-mtune=native" "-mtune=generic" ''; enableParallelBuilding = true; From 2d9e255fd1ac41308eebc0b8272eb1bfabb85039 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 00:18:27 +0100 Subject: [PATCH 518/542] fftw: enable strictDeps --- pkgs/by-name/ff/fftw/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix index 1ea58f8fa362..ae56ad4b321c 100644 --- a/pkgs/by-name/ff/fftw/package.nix +++ b/pkgs/by-name/ff/fftw/package.nix @@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace configure --replace-fail "-mtune=native" "-mtune=generic" ''; + strictDeps = true; enableParallelBuilding = true; nativeCheckInputs = [ perl ]; From aa380949308c50ed44a03073a674e189c6941af0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 13 Dec 2025 10:14:49 +0800 Subject: [PATCH 519/542] =?UTF-8?q?glib:=202.86.2=20=E2=86=92=202.86.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.86.2...2.86.3 CVE-2025-13601: https://gitlab.gnome.org/GNOME/glib/-/issues/3827 CVE-2025-14087: https://gitlab.gnome.org/GNOME/glib/-/issues/3834 CVE-2025-14512: https://gitlab.gnome.org/GNOME/glib/-/issues/3845 --- pkgs/by-name/gl/glib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index fc5a31094957..887d6617d8ef 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.86.2"; + version = "2.86.3"; outputs = [ "bin" @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-inJOlwhVNX6oEB4ncnICOSoP/VQQqYM2rtVOxZET5hE="; + hash = "sha256-syEdjTS5313KBXh+8K1dfKdd7JmLlw4aqwAB0imXfGU="; }; patches = From 690e72201e3b370e355b29fb5482014492fd0636 Mon Sep 17 00:00:00 2001 From: dramforever Date: Sat, 13 Dec 2025 11:20:35 +0800 Subject: [PATCH 520/542] Revert "stdenvBootstrapTools: fix build by fetching pie fix commit" Preparing to move this patch into regular gcc. This reverts commit 200b5eb08af1d01145061e9c45bafa6d6db85f40. --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index d9f968c84300..6a1507df734d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -47,21 +47,10 @@ rec { ''; }; - bootGCC = - (pkgs.gcc.cc.override { - enableLTO = false; - isl = null; - }).overrideAttrs - (old: { - patches = old.patches or [ ] ++ [ - (pkgs.fetchpatch { - # c++tools: Don't check --enable-default-pie. - # --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found - url = "https://github.com/gcc-mirror/gcc/commit/3f1f99ef82a65d66e3aaa429bf4fb746b93da0db.patch"; - hash = "sha256-wKVuwrW22gSN1woYFYxsyVk49oYmbogIN6FWbU8cVds="; - }) - ]; - }); + bootGCC = pkgs.gcc.cc.override { + enableLTO = false; + isl = null; + }; bootBinutils = pkgs.binutils.bintools.override { withAllTargets = false; From 48878a8096a87c0d72f61d5c377a0f1e4d84996c Mon Sep 17 00:00:00 2001 From: dramforever Date: Sat, 13 Dec 2025 11:24:52 +0800 Subject: [PATCH 521/542] gcc{14,15}: Pick c++tools --enable-default-pie patch --- ...+tools-dont-check-enable-default-pie.patch | 80 +++++++++++++++++++ .../compilers/gcc/patches/default.nix | 3 + 2 files changed, 83 insertions(+) create mode 100644 pkgs/development/compilers/gcc/patches/c++tools-dont-check-enable-default-pie.patch diff --git a/pkgs/development/compilers/gcc/patches/c++tools-dont-check-enable-default-pie.patch b/pkgs/development/compilers/gcc/patches/c++tools-dont-check-enable-default-pie.patch new file mode 100644 index 000000000000..572829c45c6a --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/c++tools-dont-check-enable-default-pie.patch @@ -0,0 +1,80 @@ +From 3f1f99ef82a65d66e3aaa429bf4fb746b93da0db Mon Sep 17 00:00:00 2001 +From: Kito Cheng +Date: Tue, 27 May 2025 10:10:15 +0800 +Subject: [PATCH] c++tools: Don't check --enable-default-pie. + +`--enable-default-pie` is an option to specify whether to enable +position-independent executables by default for `target`. + +However c++tools is build for `host`, so it should just follow +`--enable-host-pie` option to determine whether to build with +position-independent executables or not. + +NOTE: + +I checked PR 98324 and build with same configure option +(`--enable-default-pie` and lto bootstrap) on x86-64 linux to make sure +it won't cause same problem. + +c++tools/ChangeLog: + + * configure.ac: Don't check `--enable-default-pie`. + * configure: Regen. +--- + c++tools/configure | 11 ----------- + c++tools/configure.ac | 6 ------ + 2 files changed, 17 deletions(-) + +diff --git a/c++tools/configure b/c++tools/configure +index 1353479becaf4..6df4a2f0dfaed 100755 +--- a/c++tools/configure ++++ b/c++tools/configure +@@ -700,7 +700,6 @@ enable_option_checking + enable_c___tools + enable_maintainer_mode + enable_checking +-enable_default_pie + enable_host_pie + enable_host_bind_now + with_gcc_major_version_only +@@ -1335,7 +1334,6 @@ Optional Features: + enable expensive run-time checks. With LIST, enable + only specific categories of checks. Categories are: + yes,no,all,none,release. +- --enable-default-pie enable Position Independent Executable as default + --enable-host-pie build host code as PIE + --enable-host-bind-now link host code as BIND_NOW + +@@ -2946,15 +2944,6 @@ $as_echo "#define ENABLE_ASSERT_CHECKING 1" >>confdefs.h + + fi + +-# Check whether --enable-default-pie was given. +-# Check whether --enable-default-pie was given. +-if test "${enable_default_pie+set}" = set; then : +- enableval=$enable_default_pie; PICFLAG=-fPIE +-else +- PICFLAG= +-fi +- +- + # Enable --enable-host-pie + # Check whether --enable-host-pie was given. + if test "${enable_host_pie+set}" = set; then : +diff --git a/c++tools/configure.ac b/c++tools/configure.ac +index db34ee678e033..8c4b72a8023a8 100644 +--- a/c++tools/configure.ac ++++ b/c++tools/configure.ac +@@ -97,12 +97,6 @@ if test x$ac_assert_checking != x ; then + [Define if you want assertions enabled. This is a cheap check.]) + fi + +-# Check whether --enable-default-pie was given. +-AC_ARG_ENABLE(default-pie, +-[AS_HELP_STRING([--enable-default-pie], +- [enable Position Independent Executable as default])], +-[PICFLAG=-fPIE], [PICFLAG=]) +- + # Enable --enable-host-pie + AC_ARG_ENABLE(host-pie, + [AS_HELP_STRING([--enable-host-pie], diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 81b022a62ce4..8151bf561bf3 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -97,6 +97,9 @@ optionals noSysDirs ( # See https://github.com/NixOS/nixpkgs/pull/354107/commits/2de1b4b14e17f42ba8b4bf43a29347c91511e008 ++ optional (!atLeast14) ./cfi_startproc-reorder-label-09-1.diff ++ optional (atLeast14 && !canApplyIainsDarwinPatches) ./cfi_startproc-reorder-label-14-1.diff +# c++tools: Don't check --enable-default-pie. +# --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found +++ optional atLeast14 ./c++tools-dont-check-enable-default-pie.patch ## 2. Patches relevant on specific platforms #################################### From 2eb6fff2bf98634207f26ff95d36665bcf6eb9a6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 12:45:50 +0100 Subject: [PATCH 522/542] hspell: fix build with structuredAttrs --- pkgs/development/libraries/hspell/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 8ec391c601c9..d63620734862 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "1.4"; }; - PERL_USE_UNSAFE_INC = "1"; + env.PERL_USE_UNSAFE_INC = "1"; src = fetchurl { url = "${meta.homepage}${name}.tar.gz"; @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { ]; strictDeps = true; + __structuredAttrs = true; meta = { description = "Hebrew spell checker"; From d968f1be326bac4374c0e553958ba6511731ea3e Mon Sep 17 00:00:00 2001 From: Daudi Wampamba Date: Sat, 13 Dec 2025 16:30:34 +0000 Subject: [PATCH 523/542] folly: inline patch due errors fetching from AUR --- pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch | 18 ++++++++++++++++++ pkgs/by-name/fo/folly/package.nix | 7 +------ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch diff --git a/pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch b/pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch new file mode 100644 index 000000000000..4f03cf1541da --- /dev/null +++ b/pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch @@ -0,0 +1,18 @@ +diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake +index c72273a73..d0408f2b3 100644 +--- a/CMake/folly-deps.cmake ++++ b/CMake/folly-deps.cmake +@@ -61,10 +61,9 @@ if(LIBGFLAGS_FOUND) + set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR}) + endif() + +-find_package(Glog MODULE) +-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND}) +-list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY}) +-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR}) ++find_package(Glog CONFIG REQUIRED) ++set(FOLLY_HAVE_LIBGLOG True) ++list(APPEND FOLLY_LINK_LIBRARIES glog::glog) + + find_package(LibEvent MODULE REQUIRED) + list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB}) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 2e6584d32482..eca0493cc2f0 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, - fetchpatch, cmake, ninja, @@ -139,11 +138,7 @@ stdenv.mkDerivation (finalAttrs: { ./char_traits.patch # - (fetchpatch { - name = "folly-fix-glog-0.7.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-cmake-find-glog.patch?h=folly&id=4b68f47338d4b20111e3ffa1291433120bb899f0"; - hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE="; - }) + ./folly-fix-glog-0.7.patch # Fix a GCC‐incompatible use of a private trait. # From 38b7d078e6c742994d1d67fa1ff772140cf4b612 Mon Sep 17 00:00:00 2001 From: Daudi Wampamba Date: Sat, 13 Dec 2025 19:28:51 +0000 Subject: [PATCH 524/542] w3m: inline patch due to errors fetching from AUR --- pkgs/by-name/w3/w3m/https.patch | 19 +++++++++++++++++++ pkgs/by-name/w3/w3m/package.nix | 7 +------ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/w3/w3m/https.patch diff --git a/pkgs/by-name/w3/w3m/https.patch b/pkgs/by-name/w3/w3m/https.patch new file mode 100644 index 000000000000..31286a70d5ae --- /dev/null +++ b/pkgs/by-name/w3/w3m/https.patch @@ -0,0 +1,19 @@ +Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 + +--- old/url.c 2011-01-04 14:52:24.000000000 +0530 ++++ new/url.c 2011-09-02 18:25:43.305652690 +0530 +@@ -82,11 +82,11 @@ + {"ftp", SCM_FTP}, + {"local", SCM_LOCAL}, + {"file", SCM_LOCAL}, +- /* {"exec", SCM_EXEC}, */ ++ {"exec", SCM_EXEC}, + {"nntp", SCM_NNTP}, +- /* {"nntp", SCM_NNTP_GROUP}, */ ++ {"nntp", SCM_NNTP_GROUP}, + {"news", SCM_NEWS}, +- /* {"news", SCM_NEWS_GROUP}, */ ++ {"news", SCM_NEWS_GROUP}, + {"data", SCM_DATA}, + #ifndef USE_W3MMAILER + {"mailto", SCM_MAILTO}, diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix index c9d00588502a..73e82859bf63 100644 --- a/pkgs/by-name/w3/w3m/package.nix +++ b/pkgs/by-name/w3/w3m/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromSourcehut, - fetchpatch, ncurses, boehmgc, gettext, @@ -66,11 +65,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./RAND_egd.libressl.patch - (fetchpatch { - name = "https.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/https.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03"; - sha256 = "08skvaha1hjyapsh8zw5dgfy433mw2hk7qy9yy9avn8rjqj7kjxk"; - }) + ./https.patch ]; postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' From 3de301bf14c2172b93bbe9e7ce711b16a3ba3926 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Dec 2025 00:04:42 +0100 Subject: [PATCH 525/542] libtirpc: fix build with structuredAttrs --- pkgs/by-name/li/libtirpc/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libtirpc/package.nix b/pkgs/by-name/li/libtirpc/package.nix index b0296afa746f..292659aa3e34 100644 --- a/pkgs/by-name/li/libtirpc/package.nix +++ b/pkgs/by-name/li/libtirpc/package.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { "dev" ]; - KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; + env.KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libkrb5 ]; strictDeps = true; @@ -44,6 +45,8 @@ stdenv.mkDerivation rec { doCheck = true; + __structuredAttrs = true; + meta = { homepage = "https://sourceforge.net/projects/libtirpc/"; description = "Transport-independent Sun RPC implementation (TI-RPC)"; From a58a3e6b746910b056e0f48c573d33a8f82951a6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Dec 2025 00:05:25 +0100 Subject: [PATCH 526/542] libtirpc: use finalAttrs --- pkgs/by-name/li/libtirpc/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libtirpc/package.nix b/pkgs/by-name/li/libtirpc/package.nix index 292659aa3e34..11acc1076428 100644 --- a/pkgs/by-name/li/libtirpc/package.nix +++ b/pkgs/by-name/li/libtirpc/package.nix @@ -6,16 +6,16 @@ libkrb5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtirpc"; version = "1.3.7"; src = fetchurl { url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${ - lib.replaceStrings [ "." ] [ "-" ] version + lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version };sf=tgz"; hash = "sha256-VGftEr3xzCp8O3oqCjIZozlq599gxN5IsHBRaG37GP4="; - name = "${pname}-${version}.tar.gz"; + name = "${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; }; outputs = [ @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { been ported to replace the SunRPC of the glibc. ''; }; -} +}) From 8db82491fbc9aa7f7002fffda619e487c6cb71c9 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 13 Dec 2025 20:23:07 -0700 Subject: [PATCH 527/542] treewide: replace ftp references to invisible-island.net with https --- pkgs/by-name/by/byacc/package.nix | 2 +- pkgs/by-name/cp/cproto/package.nix | 2 +- pkgs/by-name/di/diffstat/package.nix | 2 +- pkgs/by-name/ly/lynx/package.nix | 2 +- pkgs/by-name/ma/mawk/package.nix | 2 +- pkgs/by-name/vt/vttest/package.nix | 2 +- pkgs/by-name/xt/xterm/package.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/by/byacc/package.nix b/pkgs/by-name/by/byacc/package.nix index efb7dc07077d..8da6559f602b 100644 --- a/pkgs/by-name/by/byacc/package.nix +++ b/pkgs/by-name/by/byacc/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { urls = [ "https://invisible-mirror.net/archives/byacc/byacc-${finalAttrs.version}.tgz" - "ftp://ftp.invisible-island.net/byacc/byacc-${finalAttrs.version}.tgz" + "https://invisible-island.net/archives/byacc/byacc-${finalAttrs.version}.tgz" ]; hash = "sha256-GSwvrgSNTn9RS6RRYn+cTmEnZQmfgZwZGR+f3j5glnM="; }; diff --git a/pkgs/by-name/cp/cproto/package.nix b/pkgs/by-name/cp/cproto/package.nix index 257bba7420d5..4dc9a1c1d364 100644 --- a/pkgs/by-name/cp/cproto/package.nix +++ b/pkgs/by-name/cp/cproto/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { urls = [ "mirror://debian/pool/main/c/cproto/cproto_${version}.orig.tar.gz" # No version listings and apparently no versioned tarball over http(s). - "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" + "https://invisible-island.net/archives/cproto/cproto-${version}.tgz" ]; sha256 = "sha256-C9HYvo/wpMpD+Uf5V1DTT2TtqTyeLKeRAP1gFAt8YzE="; }; diff --git a/pkgs/by-name/di/diffstat/package.nix b/pkgs/by-name/di/diffstat/package.nix index 3744d3da2a2e..7aa1b6e3ed81 100644 --- a/pkgs/by-name/di/diffstat/package.nix +++ b/pkgs/by-name/di/diffstat/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz" + "https://invisible-island.net/archives/diffstat/diffstat-${version}.tgz" "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" ]; hash = "sha256-ifkpSorHT8728bmsQI9D6+340gjj7+C5m0rMFtxlgsc="; diff --git a/pkgs/by-name/ly/lynx/package.nix b/pkgs/by-name/ly/lynx/package.nix index d4b6bd227292..2ec3cab0c39d 100644 --- a/pkgs/by-name/ly/lynx/package.nix +++ b/pkgs/by-name/ly/lynx/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" + "https://invisible-island.net/archives/lynx/tarballs/lynx${version}.tar.bz2" "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" ]; hash = "sha256-c3S4mTbZkWaeEB9Ol/LJWSA24ejNqnuvwlmnerb7B84="; diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix index 020435e7a420..7de0684d118c 100644 --- a/pkgs/by-name/ma/mawk/package.nix +++ b/pkgs/by-name/ma/mawk/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { urls = [ "https://invisible-mirror.net/archives/mawk/mawk-${finalAttrs.version}.tgz" - "ftp://ftp.invisible-island.net/mawk/mawk-${finalAttrs.version}.tgz" + "https://invisible-island.net/archives/mawk/mawk-${finalAttrs.version}.tgz" ]; hash = "sha256-bh/ejuetilwVOCMWhj/WtMbSP6t4HdWrAXf/o+6arlw="; }; diff --git a/pkgs/by-name/vt/vttest/package.nix b/pkgs/by-name/vt/vttest/package.nix index ae713db4afe2..ac4ce1c4e4a8 100644 --- a/pkgs/by-name/vt/vttest/package.nix +++ b/pkgs/by-name/vt/vttest/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "https://invisible-mirror.net/archives/vttest/vttest-${version}.tgz" - "ftp://ftp.invisible-island.net/vttest/vttest-${version}.tgz" + "https://invisible-island.net/archives/vttest/vttest-${version}.tgz" ]; sha256 = "sha256-j+47rH6H1KpKIXvSs4q5kQw7jPmmBbRQx2zMCtKmUZ0="; }; diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index 739467e30cc4..1503f2432788 100644 --- a/pkgs/by-name/xt/xterm/package.nix +++ b/pkgs/by-name/xt/xterm/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" + "https://invisible-island.net/archives/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; hash = "sha256-YzMvkhwie6WeWJ+gff2tFZnBCshZ6ibHKsHdSkG1ZaQ="; From aa40b766861b9fc2a94e42cc90e4bc7163e1868a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Dec 2025 12:19:27 +0100 Subject: [PATCH 528/542] python3Packages.decorator: fix build with structuredAttrs --- pkgs/development/python-modules/decorator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index 87aac6af1762..b0d90c7a5cdc 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - enabledTestPaths = [ "tests/test.py " ]; + enabledTestPaths = [ "tests/test.py" ]; meta = { changelog = "https://github.com/micheles/decorator/blob/${src.tag}/CHANGES.md"; From 8d8fb3ca580f954094705ad0e61b3ba4c4b0b3c8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Dec 2025 12:56:44 +0100 Subject: [PATCH 529/542] python3Packages.pystemmer: fix build with structuredAttrs --- pkgs/development/python-modules/pystemmer/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 64a793ae4a12..39c0cfa07056 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -40,9 +40,10 @@ buildPythonPackage rec { export PYSTEMMER_SYSTEM_LIBSTEMMER="${lib.getDev libstemmer}/include" ''; - env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev libstemmer}/include" ]; - - NIX_CFLAGS_LINK = [ "-L${libstemmer}/lib" ]; + env = { + NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev libstemmer}/include" ]; + NIX_CFLAGS_LINK = toString [ "-L${libstemmer}/lib" ]; + }; pythonImportsCheck = [ "Stemmer" ]; @@ -52,6 +53,8 @@ buildPythonPackage rec { runHook postCheck ''; + __structuredAttrs = true; + meta = { description = "Snowball stemming algorithms, for information retrieval"; downloadPage = "https://github.com/snowballstem/pystemmer"; From 67d0a225c18342ca397ad12f02169fcb77f70a70 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Dec 2025 14:20:33 +0100 Subject: [PATCH 530/542] addDriverRunpath: fix for structuredAttrs --- pkgs/by-name/ad/addDriverRunpath/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ad/addDriverRunpath/package.nix b/pkgs/by-name/ad/addDriverRunpath/package.nix index 56026b1fc908..7e31a396b463 100644 --- a/pkgs/by-name/ad/addDriverRunpath/package.nix +++ b/pkgs/by-name/ad/addDriverRunpath/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { # Named "opengl-driver" for legacy reasons, but it is the path to # hardware drivers installed by NixOS - driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; + env.driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; buildCommand = '' mkdir -p $out/nix-support From c16e8406a025108f7b6f1206619d9d271deae571 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Dec 2025 12:25:27 +0100 Subject: [PATCH 531/542] resholve: fix build with structuredAttrs --- pkgs/development/misc/resholve/resholve.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index eccb1c7cf7d3..16c9924510e3 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -42,7 +42,10 @@ python27.pkgs.buildPythonApplication { ]; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ gawk ]}" + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ gawk ]) ]; postPatch = '' @@ -78,6 +81,8 @@ python27.pkgs.buildPythonApplication { }; }; + __structuredAttrs = true; + meta = { description = "Resolve external shell-script dependencies"; homepage = "https://github.com/abathur/resholve"; From 2cb85634454cbbcf7ad155f0d8540d026d7a8432 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Dec 2025 17:20:18 +0100 Subject: [PATCH 532/542] addDriverRunpath: rewrite using makeSetupHook --- pkgs/by-name/ad/addDriverRunpath/package.nix | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ad/addDriverRunpath/package.nix b/pkgs/by-name/ad/addDriverRunpath/package.nix index 7e31a396b463..29832b303ad6 100644 --- a/pkgs/by-name/ad/addDriverRunpath/package.nix +++ b/pkgs/by-name/ad/addDriverRunpath/package.nix @@ -1,14 +1,14 @@ -{ lib, stdenv }: +{ + lib, + stdenv, + makeSetupHook, +}: +makeSetupHook { + name = "add-driver-runpath-hook"; -stdenv.mkDerivation { - name = "add-driver-runpath"; - - # Named "opengl-driver" for legacy reasons, but it is the path to - # hardware drivers installed by NixOS - env.driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; - - buildCommand = '' - mkdir -p $out/nix-support - substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook - ''; -} + substitutions = { + # Named "opengl-driver" for legacy reasons, but it is the path to + # hardware drivers installed by NixOS + driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; + }; +} ./setup-hook.sh From a43b8f328558cfef833b633fe35104057c50aefc Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 13:44:13 +0100 Subject: [PATCH 533/542] haskell.compiler.ghc*Binary: fix build with structuredAttrs --- pkgs/development/compilers/ghc/9.0.2-binary.nix | 2 +- pkgs/development/compilers/ghc/9.8.4-binary.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix index 4239212f2879..cc3eb43b8ac0 100644 --- a/pkgs/development/compilers/ghc/9.0.2-binary.nix +++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix @@ -250,7 +250,7 @@ stdenv.mkDerivation { # of the bindist installer can find the libraries they expect. # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location. - ${libEnvVar} = libPath; + env.${libEnvVar} = libPath; postUnpack = # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix index 35f692d41eb5..c19b35a51a61 100644 --- a/pkgs/development/compilers/ghc/9.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix @@ -232,7 +232,7 @@ stdenv.mkDerivation { # of the bindist installer can find the libraries they expect. # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location. - ${libEnvVar} = libPath; + env.${libEnvVar} = libPath; postUnpack = # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, From 58beef4ba49d85a4e01063b592c7d66691a7e47e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 24 Sep 2025 17:26:20 -0300 Subject: [PATCH 534/542] nghttp2: fix cygwin build --- pkgs/by-name/ng/nghttp2/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index a3a62ffa0e5c..161a32206c79 100644 --- a/pkgs/by-name/ng/nghttp2/package.nix +++ b/pkgs/by-name/ng/nghttp2/package.nix @@ -6,7 +6,7 @@ pkg-config, # Optional dependencies - enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic, + enableApp ? with stdenv.hostPlatform; !(isWindows || isCygwin) && !isStatic, c-aresMinimal, libev, openssl, From 4166a4e4f81d974d51db5feab770198fbd1385b9 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 11 Nov 2025 14:41:45 -0400 Subject: [PATCH 535/542] ngtcp2: fix cygwin build --- pkgs/development/libraries/ngtcp2/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index d5adaf38f797..efc54fd6fca0 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -39,8 +39,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # The examples try to link against `ngtcp2_crypto_ossl` and `ngtcp2` libraries. # This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`. - # Also, the examples depend on Linux-specific APIs, so we avoid them on FreeBSD too. - (lib.cmakeBool "ENABLE_LIB_ONLY" (stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isFreeBSD)) + # Also, the examples depend on Linux-specific APIs, so we avoid them on FreeBSD/Cygwin too. + (lib.cmakeBool "ENABLE_LIB_ONLY" ( + stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isCygwin + )) (lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic) ]; From 7ae99ed59b3c980bfbb8430030a0b3085ba6684e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 14 Dec 2025 22:25:26 -0400 Subject: [PATCH 536/542] cocom-tool-set: fix build on staging --- pkgs/by-name/co/cocom-tool-set/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/co/cocom-tool-set/package.nix b/pkgs/by-name/co/cocom-tool-set/package.nix index f4d2b2358d43..9ab545e01c4f 100644 --- a/pkgs/by-name/co/cocom-tool-set/package.nix +++ b/pkgs/by-name/co/cocom-tool-set/package.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-int" "-Wno-error=implicit-function-declaration" + "-std=gnu17" ]; }; From f8062ac096b268957e41ddfc25fb4eada4d30440 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sun, 16 Nov 2025 17:53:19 -0500 Subject: [PATCH 537/542] =?UTF-8?q?nodejs{,-slim}:=2022=20LTS=20=E2=86=92?= =?UTF-8?q?=2024=20LTS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NodeJS 24 is LTS since 24.11.0, released on 2025-10-28. https://nodejs.org/en/blog/release/v24.11.0 --- doc/release-notes/rl-2605.section.md | 3 +++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 5cba123c5ba0..3c4263482a30 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -6,6 +6,9 @@ - GCC has been updated from GCC 14 to GCC 15. This introduces some backwards incompatible changes; Refer to the [upstream porting guide](https://gcc.gnu.org/gcc-15/porting_to.html) for details. +- Node.js default version has been updated from 22 LTS to 24 LTS. + This introduces some breaking changes; Refer to the [upstream migration article](https://nodejs.org/en/blog/migrations/v22-to-v24) for details. + ## Backward Incompatibilities {#sec-nixpkgs-release-26.05-incompatibilities} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40ade79b8bca..68d6b7f13bb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3100,8 +3100,8 @@ with pkgs; nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; - nodejs = nodejs_22; - nodejs-slim = nodejs-slim_22; + nodejs = nodejs_24; + nodejs-slim = nodejs-slim_24; nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; }; From df5c650e3fea41787b0f94b8e84d58641851eefe Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 15 Dec 2025 11:58:06 +0100 Subject: [PATCH 538/542] boost: fix patches for 1.87.0 with structuredAttrs This properly flattens the patches array again - otherwise all patches are dropped when structuredAttrs are enabled. The build will finish, but downstream users of the library will not be able to link to it properly (e.g. folly). --- pkgs/development/libraries/boost/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index baa3ee8353a7..2684e429b472 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -226,7 +226,7 @@ stdenv.mkDerivation { hash = "sha256-0IHK55JSujYcwEVOuLkwOa/iPEkdAKQlwVWR42p/X2U="; }) ] - ++ lib.optional (version == "1.87.0") [ + ++ lib.optionals (version == "1.87.0") [ # Fix operator<< for shared_ptr and intrusive_ptr # https://github.com/boostorg/smart_ptr/issues/115 (fetchpatch { @@ -402,4 +402,6 @@ stdenv.mkDerivation { "dev" ]; setOutputFlags = false; + + __structuredAttrs = true; } From 9db703830331c6b71dd5cde909180abcb8285996 Mon Sep 17 00:00:00 2001 From: Artem Leshchev Date: Mon, 15 Dec 2025 11:04:03 -0600 Subject: [PATCH 539/542] python3Packages.xarray: fix src hash It looks like GitHub has updated the archive, and the old one is not on cache.nixos.org, so users cannot get it. --- pkgs/development/python-modules/xarray/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index c437b89e54b0..3eb8f37d3bca 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; tag = "v${version}"; - hash = "sha256-Yk1nZkCsb54Rynlr4x1BEjT4ldZXUA96w31MzULB+Yo="; + hash = "sha256-s69BMjglj8mSW4N1QlT6go4o7MEjk6Xs9s6wAc8hCBA="; }; postPatch = '' From 3ecb49c6af7923b0730f0a228c6e3c6abdfd69e8 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Mon, 15 Dec 2025 15:59:27 -0500 Subject: [PATCH 540/542] typstPackages: Fix typstPackages attribute set structure Accidentally made it nested. --- pkgs/by-name/ty/typst/typst-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix index 7f9673f5fc44..056c6e344fcd 100644 --- a/pkgs/by-name/ty/typst/typst-packages.nix +++ b/pkgs/by-name/ty/typst/typst-packages.nix @@ -34,16 +34,13 @@ lib.makeScope newScope ( # 1. Create a list of versioned packages # Only recurse 2 levels deep because the leaf attrs are the pkgspec attrs (lib.mapAttrsToListRecursiveCond (path: _: (lib.length path) < 2) ( - path: packageSpec: + path: let # Path is always [ path version ] pname = lib.head path; version = lib.last path; in - { - name = toPackageName pname version; - value = makeVersionedPackage pname version packageSpec; - } + makeVersionedPackage pname version )) # 2. Transform the list into a flat attrset lib.listToAttrs From 38d1bd5c9455c653f7f6b9d989b3306220661ad4 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Mon, 15 Dec 2025 16:11:12 -0500 Subject: [PATCH 541/542] typstPackages: Fix homepage inheritance --- pkgs/by-name/ty/typst/typst-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix index 056c6e344fcd..a32f92cc95a0 100644 --- a/pkgs/by-name/ty/typst/typst-packages.nix +++ b/pkgs/by-name/ty/typst/typst-packages.nix @@ -17,13 +17,13 @@ lib.makeScope newScope ( name = toPackageName pname version; value = buildUniversePackage { + homepage = packageSpec.homepage or null; inherit pname version; inherit (packageSpec) hash description license typstDeps - homepage ; }; }; From 95dbcf76c09443cca0fad14e61eb2e442b0cc4e8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 16 Dec 2025 10:25:44 +0200 Subject: [PATCH 542/542] python3.pkgs.xarray: 2025.10.1 -> 2025.12.0 Diff: https://github.com/pydata/xarray/compare/v2025.10.1...v2025.12.0 Changelog: https://github.com/pydata/xarray/blob/v2025.12.0/doc/whats-new.rst --- pkgs/development/python-modules/xarray/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 3eb8f37d3bca..37488c13856c 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "xarray"; - version = "2025.10.1"; + version = "2025.12.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; tag = "v${version}"; - hash = "sha256-s69BMjglj8mSW4N1QlT6go4o7MEjk6Xs9s6wAc8hCBA="; + hash = "sha256-7MTZ/0BbJb3mg2FHvtsV+v4TsgoxD0Tpco7J4DgT/hY="; }; postPatch = '' @@ -101,11 +101,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlags = [ - # [2025.10.0] ChainedAssignmentError: behaviour will change in pandas 3.0! - "-Wignore::FutureWarning" - ]; - pythonImportsCheck = [ "xarray" ]; meta = {