From 846094802d003a34a9b4a5fc19fed2e0848cddcc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jan 2026 07:38:20 +0000 Subject: [PATCH 01/86] alsa-utils: 1.2.14 -> 1.2.15.2 --- pkgs/by-name/al/alsa-utils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix index d046b2d6ea85..ff627a73cc83 100644 --- a/pkgs/by-name/al/alsa-utils/package.nix +++ b/pkgs/by-name/al/alsa-utils/package.nix @@ -32,11 +32,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "alsa-utils"; - version = "1.2.14"; + version = "1.2.15.2"; src = fetchurl { url = "mirror://alsa/utils/alsa-utils-${finalAttrs.version}.tar.bz2"; - hash = "sha256-B5THTTP+2UPnxQYJwTCJ5AkxK2xAPWromE/EKcCWB0E="; + hash = "sha256-eqqvv7AZQhE+wMMeUfcFkQ6BB5IFCIyi+PE3o4aeGjo="; }; nativeBuildInputs = [ From 2de559be250544f8ad8f86e71f0e5eed49c3454f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Feb 2026 08:47:44 +0000 Subject: [PATCH 02/86] abiword: 3.0.7 -> 3.0.8 --- pkgs/by-name/ab/abiword/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ab/abiword/package.nix b/pkgs/by-name/ab/abiword/package.nix index 1b2cf142e0e5..9445ae56c946 100644 --- a/pkgs/by-name/ab/abiword/package.nix +++ b/pkgs/by-name/ab/abiword/package.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "abiword"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "AbiWord"; tag = "release-${finalAttrs.version}"; - hash = "sha256-dYbJ726Zuxs7+VTTCWHYQLsVZ/86hRUBQRac6toO4UI="; + hash = "sha256-TjOHixfCXDQlUUbD1L5wcGe4Nl0+1UqZw4EF+1/eZ4w="; }; nativeBuildInputs = [ From b8046618a193b1f694990ac217bf1d3f07da6821 Mon Sep 17 00:00:00 2001 From: chillcicada <2210227279@qq.com> Date: Mon, 23 Mar 2026 09:39:31 +0800 Subject: [PATCH 03/86] wpsoffice-cn: remove absolute Exec path --- pkgs/by-name/wp/wpsoffice-cn/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix index ddd5d48aab28..f2508c920bc6 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/package.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix @@ -189,7 +189,7 @@ else for i in $out/share/applications/*; do substituteInPlace $i \ - --replace-fail /usr/bin $out/bin + --replace-fail /usr/bin/ "" done runHook postInstall From fb9550b0be4b51bd2265254d629e3f7aa95e7ab9 Mon Sep 17 00:00:00 2001 From: chillcicada <2210227279@qq.com> Date: Mon, 23 Mar 2026 09:40:13 +0800 Subject: [PATCH 04/86] wpsoffice-cn: remove unused deps --- pkgs/by-name/wp/wpsoffice-cn/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix index f2508c920bc6..824e7fa7ee74 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/package.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix @@ -13,7 +13,6 @@ libjpeg, libtool, libxkbcommon, - nss, nspr, udev, gtk3, From 501f1dba59453f1763da6f068bb189e0321e522b Mon Sep 17 00:00:00 2001 From: chillcicada <2210227279@qq.com> Date: Mon, 23 Mar 2026 09:49:08 +0800 Subject: [PATCH 05/86] wpsoffice-cn: remove unused templates --- pkgs/by-name/wp/wpsoffice-cn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix index 824e7fa7ee74..1310cca0300f 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/package.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix @@ -167,9 +167,9 @@ else tar -xf data.tar.xz # Remove unneeded files - rm -rf usr/share/{fonts,locale} + rm -rf usr/share/{fonts,locale,templates} rm -f usr/bin/misc - rm -rf opt/kingsoft/wps-office/{desktops,INSTALL} + rm -rf opt/kingsoft/wps-office/{desktops,INSTALL,templates} rm -f opt/kingsoft/wps-office/office6/lib{peony-wpsprint-menu-plugin,bz2,jpeg,stdc++,gcc_s,odbc*,dbus-1}.so* ''; From 4d8b678ec6dd6d642cbec5bb10a70099b592638e Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sun, 3 May 2026 14:25:18 -0700 Subject: [PATCH 06/86] perlPackages.SessionToken: fix build with gcc15 --- 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 7a721c264822..20ca4dea4f54 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -30638,6 +30638,13 @@ with self; url = "https://github.com/hoytech/Session-Token/commit/cd64e7b69986054bb715755290811308159b7959.patch"; hash = "sha256-nMQmdvVQW8cQYO0+bLJcdVfSOLVIsongk+71fQ7fQdU="; }) + (fetchDebianPatch { + version = "1.503"; + pname = "libsession-token-perl"; + debianRevision = "3"; + patch = "fix-gcc15-build.patch"; + hash = "sha256-b6Yr5w++3lQcaI8JilthLykq4D4nEczz0h+r6LJ8hGI="; + }) ]; meta = { description = "Secure, efficient, simple random session token generation"; From 94eb7e93f2925f5a955653323660db08e5388de0 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Mon, 4 May 2026 01:06:00 -0700 Subject: [PATCH 07/86] mini-httpd: fix build with boost 1.89 --- pkgs/by-name/mi/mini-httpd/package.nix | 7 +++++++ .../by-name/mi/mini-httpd/remove-boost-system.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/by-name/mi/mini-httpd/remove-boost-system.patch diff --git a/pkgs/by-name/mi/mini-httpd/package.nix b/pkgs/by-name/mi/mini-httpd/package.nix index 7e11a2d32cba..421a434459a5 100644 --- a/pkgs/by-name/mi/mini-httpd/package.nix +++ b/pkgs/by-name/mi/mini-httpd/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + autoreconfHook, boost, }: @@ -14,6 +15,12 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "0jggmlaywjfbdljzv5hyiz49plnxh0har2bnc9dq4xmj1pmjgs49"; }; + patches = [ + ./remove-boost-system.patch + ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ boost ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/mi/mini-httpd/remove-boost-system.patch b/pkgs/by-name/mi/mini-httpd/remove-boost-system.patch new file mode 100644 index 000000000000..89b1f24f2bb9 --- /dev/null +++ b/pkgs/by-name/mi/mini-httpd/remove-boost-system.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index fd06d1a..337178c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,8 +14,6 @@ AC_PROG_RANLIB + AC_LANG([C++]) + AC_CHECK_HEADER(boost/spirit.hpp, :, + AC_MSG_ERROR([Cannot find the Boost library headers! See the README for details.])) +-AC_CHECK_LIB([boost_system], [main], [LIBS="-lboost_system"], +- [AC_MSG_ERROR([cannot link required boost.system library])]) + gl_INIT + AC_SYS_LARGEFILE + From 7a0d58a094f48fda68506d4b5c91028833b58138 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 8 May 2026 23:14:46 -0600 Subject: [PATCH 08/86] ddhx: add meta.mainProgram --- pkgs/by-name/dd/ddhx/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/dd/ddhx/package.nix b/pkgs/by-name/dd/ddhx/package.nix index cae4b6a32653..efdeef33c25e 100644 --- a/pkgs/by-name/dd/ddhx/package.nix +++ b/pkgs/by-name/dd/ddhx/package.nix @@ -31,5 +31,6 @@ buildDubPackage (finalAttrs: { license = lib.licenses.mit; maintainers = [ lib.maintainers.ryand56 ]; platforms = lib.platforms.unix; + mainProgram = "ddhx"; }; }) From ec5e8f914cdfdd721020e09578b5ac344bc140cc Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 10 May 2026 04:56:27 -0600 Subject: [PATCH 09/86] maintainers: remove ciil --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/science/logic/abella/default.nix | 5 +---- pkgs/by-name/gn/gnushogi/package.nix | 2 +- pkgs/by-name/gs/gshogi/package.nix | 2 +- pkgs/by-name/lb/lbreakout2/package.nix | 4 +--- pkgs/by-name/rs/rstudio/package.nix | 5 +---- 6 files changed, 5 insertions(+), 19 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8d804af54824..4ab2cf99f4fe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5038,12 +5038,6 @@ github = "cigrainger"; githubId = 3984794; }; - ciil = { - email = "simon@lackerbauer.com"; - github = "ciil"; - githubId = 3956062; - name = "Simon Lackerbauer"; - }; cilki = { github = "cilki"; githubId = 10459406; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 9e3592b44445..210211a6b948 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -54,10 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://abella-prover.org"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ - bcdarwin - ciil - ]; + maintainers = [ lib.maintainers.bcdarwin ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/gn/gnushogi/package.nix b/pkgs/by-name/gn/gnushogi/package.nix index 0f9ddb583676..a3e01f9cc128 100644 --- a/pkgs/by-name/gn/gnushogi/package.nix +++ b/pkgs/by-name/gn/gnushogi/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "gnushogi"; homepage = "https://www.gnu.org/software/gnushogi/"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.ciil ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/gs/gshogi/package.nix b/pkgs/by-name/gs/gshogi/package.nix index 797d73a663c3..81c7d0f55490 100644 --- a/pkgs/by-name/gs/gshogi/package.nix +++ b/pkgs/by-name/gs/gshogi/package.nix @@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "gshogi"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.ciil ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/lb/lbreakout2/package.nix b/pkgs/by-name/lb/lbreakout2/package.nix index 8e219590d13d..22f4500376a9 100644 --- a/pkgs/by-name/lb/lbreakout2/package.nix +++ b/pkgs/by-name/lb/lbreakout2/package.nix @@ -48,9 +48,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Breakout clone from the LGames series"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "lbreakout2"; - maintainers = with lib.maintainers; [ - ciil - ]; + maintainers = [ ]; platforms = lib.platforms.unix; hydraPlatforms = lib.platforms.linux; # build hangs on both Darwin platforms, needs investigation }; diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index 58d2d4ebbeda..5deaf278aee4 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -367,10 +367,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Set of integrated tools for the R language"; homepage = "https://www.rstudio.com/"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ - ciil - tomasajt - ]; + maintainers = [ lib.maintainers.tomasajt ]; mainProgram = "rstudio" + lib.optionalString server "-server"; # rstudio-server on darwin is only partially supported by upstream platforms = lib.platforms.linux ++ lib.optionals (!server) lib.platforms.darwin; From 435f8d720c430a14462588245ee7a3b26d369888 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 11 May 2026 00:36:52 +0700 Subject: [PATCH 10/86] python3Packages.irc: fix tests on python 3.14 --- .../python-modules/irc/default.nix | 5 +++ .../irc/python-3.14-event-loop.patch | 33 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/irc/python-3.14-event-loop.patch diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 4143c073e823..658bc2c28660 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -24,6 +24,11 @@ buildPythonPackage (finalAttrs: { hash = "sha256-jdv9GfcSBM7Ount8cnJLFbP6h7q16B5Fp1vvc2oaPHY="; }; + patches = [ + # https://github.com/jaraco/irc/pull/236 + ./python-3.14-event-loop.patch + ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/irc/python-3.14-event-loop.patch b/pkgs/development/python-modules/irc/python-3.14-event-loop.patch new file mode 100644 index 000000000000..806d2b1926ae --- /dev/null +++ b/pkgs/development/python-modules/irc/python-3.14-event-loop.patch @@ -0,0 +1,33 @@ +--- a/irc/tests/test_client_aio.py ++++ b/irc/tests/test_client_aio.py +@@ -1,6 +1,4 @@ + import asyncio +-import contextlib +-import warnings + from unittest.mock import MagicMock + + from irc import client_aio +@@ -13,21 +11,14 @@ async def mock_create_connection(*args, **kwargs): + return mock_create_connection + + +-@contextlib.contextmanager +-def suppress_issue_197(): +- with warnings.catch_warnings(): +- warnings.filterwarnings('ignore', 'There is no current event loop') +- yield +- +- + def test_privmsg_sends_msg(): + # create dummy transport, protocol + mock_transport = MagicMock() + mock_protocol = MagicMock() + + # connect to dummy server +- with suppress_issue_197(): +- loop = asyncio.get_event_loop() ++ loop = asyncio.new_event_loop() ++ asyncio.set_event_loop(loop) + loop.create_connection = make_mocked_create_connection( + mock_transport, mock_protocol + ) From ac828aaf0fefb95efa879bcf5fec0964657a5641 Mon Sep 17 00:00:00 2001 From: Harinn Date: Tue, 12 May 2026 13:03:48 +0700 Subject: [PATCH 11/86] python3Packages.bezier: fix executable stack import error --- pkgs/development/python-modules/bezier/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/bezier/default.nix b/pkgs/development/python-modules/bezier/default.nix index b1ec0befc93b..e7c3990db4cb 100644 --- a/pkgs/development/python-modules/bezier/default.nix +++ b/pkgs/development/python-modules/bezier/default.nix @@ -49,6 +49,8 @@ buildPythonPackage rec { cmake gfortran ]; + + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-z,noexecstack"; }; NIX_CFLAGS_COMPILE = toString [ "-Wno-error=incompatible-pointer-types" From 1bb8e5da7c1ee426696402290c34ec19bf4b297b Mon Sep 17 00:00:00 2001 From: Harinn Date: Tue, 12 May 2026 13:50:48 +0700 Subject: [PATCH 12/86] python3Packages.aiotarfile: skip tests on python 3.14 --- pkgs/development/python-modules/aiotarfile/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/aiotarfile/default.nix b/pkgs/development/python-modules/aiotarfile/default.nix index 84068164ee63..6234535a9836 100644 --- a/pkgs/development/python-modules/aiotarfile/default.nix +++ b/pkgs/development/python-modules/aiotarfile/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, buildPythonPackage, + pythonOlder, unittestCheckHook, cargo, rustc, @@ -36,6 +37,9 @@ buildPythonPackage rec { unittestFlagsArray = [ "tests/" ]; # Not sure why it isn't autodiscovered + # pyo3-asyncio 0.20 segfaults on the python 3.14 interpreter state. + doCheck = pythonOlder "3.14"; + pythonImportsCheck = [ "aiotarfile" ]; meta = { From d33227928db61fd8513d523830966b2796e16ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 8 May 2026 23:50:52 +0200 Subject: [PATCH 13/86] llama-cpp: Use runtime instruction dispatch for massive speedups Before I added this, I made below benchmark to figure if it's worth it: llama-cpp with AVX-512 for faster inference and --quiet patch. This is MUCH faster than nixpkgs's default x86_64 build, e.g. reducing the time for a 1024x768 screenshot (on an AMD Ryzen 7 7700X 8-Core, `llama-cpp` version 8983, with `gemma-4-E2B-it-Q4_0.gguf` + `mmproj-gemma-4-E2B-it-F16.gguf`): default AVX2 AVX-512 speedup (AVX2 / AVX-512) 1 thread: CPU 360s 30s 27s 12x / 13x wall 293s 22s 19s 13x / 15x 8 threads: CPU 405s 31s 28s 13x / 14x wall 51s 6s 6s 8x / 9x where "AVX2" refers to: -DGGML_AVX=ON -DGGML_AVX2=ON -DGGML_FMA=ON -DGGML_F16C=ON -DGGML_AVX512=ON and "AVX512" refers to additionally: -DGGML_AVX512_VBMI=ON -DGGML_AVX512_VNNI=ON -DGGML_AVX512_BF16=ON AVX2 is available for CPUs from 2013 (Intel) / 2015 (AMD), while AVX512 is available for CPUs from 2017 (Intel) / 2022 (AMD). --- pkgs/by-name/ll/llama-cpp/package.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 57dc752361c1..a1e57c030fca 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -15,6 +15,8 @@ rocmPackages ? { }, rocmGpuTargets ? rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets, + cpuArchDynamicDispatch ? true, + openclSupport ? false, clblast, @@ -139,8 +141,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - # -march=native is non-deterministic; override with platform-specific flags if needed - (cmakeBool "GGML_NATIVE" false) + (cmakeBool "GGML_NATIVE" false) # -march=native would make builds non-deterministic (cmakeBool "LLAMA_BUILD_EXAMPLES" false) (cmakeBool "LLAMA_BUILD_SERVER" true) (cmakeBool "LLAMA_BUILD_TESTS" (finalAttrs.finalPackage.doCheck or false)) @@ -155,6 +156,18 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeBool "GGML_VULKAN" vulkanSupport) (cmakeFeature "LLAMA_BUILD_NUMBER" finalAttrs.version) ] + ++ optionals cpuArchDynamicDispatch [ + # Build all CPU backend variants for runtime dynamic dispatch. + # This avoids illegal instructions on older CPUs and gives optimal performance + # on newer ones without needing separate builds. + # Enabling AVX2 can make CPU inference 13x faster compared to NixOS's x86_64 defaults. + # Note it is not a bug that the CPU variant .so files are placed in `bin/` + # (as opposed to `lib/`) alongside the executables by upstream's `CMakeLists.txt` design: + # * https://github.com/ggml-org/llama.cpp/blob/b46812de78f8fbcb6cf0154947e8633ebc78d9ac/ggml/src/CMakeLists.txt#L249-L252 + # * https://github.com/ggml-org/llama.cpp/blob/b46812de78f8fbcb6cf0154947e8633ebc78d9ac/ggml/src/ggml-backend-reg.cpp#L480-L486 + (cmakeBool "GGML_CPU_ALL_VARIANTS" true) + (cmakeBool "GGML_BACKEND_DL" true) + ] ++ optionals cudaSupport [ (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) ] From 91aac5dc9169fa98ee934984de14c64bd2d0f59f Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Sat, 16 May 2026 16:58:30 +0200 Subject: [PATCH 14/86] age-plugin-fido2prf: fix darwin build by patching hardcoded Homebrew paths --- .../ag/age-plugin-fido2prf/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/ag/age-plugin-fido2prf/package.nix b/pkgs/by-name/ag/age-plugin-fido2prf/package.nix index a12a382240b9..0665af9265d1 100644 --- a/pkgs/by-name/ag/age-plugin-fido2prf/package.nix +++ b/pkgs/by-name/ag/age-plugin-fido2prf/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, libfido2, @@ -26,6 +27,24 @@ buildGoModule (finalAttrs: { buildInputs = [ libfido2 ]; + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' + chmod -R +w vendor/github.com/keys-pub/go-libfido2 + substituteInPlace vendor/github.com/keys-pub/go-libfido2/fido2_static_arm64.go \ + --replace-fail \ + '/opt/homebrew/opt/libfido2/lib/libfido2.a /opt/homebrew/opt/openssl@3/lib/libcrypto.a ''${SRCDIR}/darwin/arm64/lib/libcbor.a' \ + '-lfido2' \ + --replace-fail \ + '-I/opt/homebrew/opt/libfido2/include -I/opt/homebrew/opt/openssl@3/include' \ + '-I${libfido2.dev}/include' + substituteInPlace vendor/github.com/keys-pub/go-libfido2/fido2_static_amd64.go \ + --replace-fail \ + '/usr/local/lib/libfido2.a /usr/local/opt/openssl@3/lib/libcrypto.a ''${SRCDIR}/darwin/amd64/lib/libcbor.a' \ + '-lfido2' \ + --replace-fail \ + '-I/usr/local/opt/libfido2/include -I/usr/local/opt/openssl@3/include' \ + '-I${libfido2.dev}/include' + ''; + meta = { description = "Age plugin to encrypt files with FIDO2 tokens in a way compatible to typage"; homepage = "https://github.com/FiloSottile/typage/"; From 6e7e69cc2551a3d0de311e4a90f8660caa020bd1 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Sat, 16 May 2026 18:37:47 +0200 Subject: [PATCH 15/86] akkoma-admin-fe: use cctools libtool on darwin to fix node-sass build --- pkgs/by-name/ak/akkoma-admin-fe/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ak/akkoma-admin-fe/package.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix index c5f04681b40d..33660009e70b 100644 --- a/pkgs/by-name/ak/akkoma-admin-fe/package.nix +++ b/pkgs/by-name/ak/akkoma-admin-fe/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitea, + cctools, yarn-berry_3, nodejs, python311, @@ -42,7 +43,10 @@ stdenv.mkDerivation (finalAttrs: { python311 libsass ] - ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xcbuild + cctools.libtool + ]; buildPhase = '' runHook preBuild From 538fb9d3df98c4514e3562cda5b49e0b9c83623e Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Sat, 16 May 2026 18:52:54 +0200 Subject: [PATCH 16/86] armTrustedFirmwareTools: include dtc and gcc in nativeBuildInputs to fix darwin build --- pkgs/misc/arm-trusted-firmware/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 0ad2f8c3acb7..29b946e54a1c 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitHub, + dtc, + gcc, openssl, pkgsCross, buildPackages, @@ -61,6 +63,10 @@ let nativeBuildInputs = [ pkgsCross.arm-embedded.stdenv.cc # For Cortex-M0 firmware in RK3399 openssl # For fiptool + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + dtc + gcc ]; # Make the new toolchain guessing (from 2.14+) happy From 15ee3931529ea5385708b514de21b11a61b24b28 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 17 May 2026 23:40:37 -0600 Subject: [PATCH 17/86] maintainers: remove dsferruzza --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/ve/veracrypt/package.nix | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4fd3e84b498e..36d50ece969d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7370,12 +7370,6 @@ github = "DSeeLP"; githubId = 46624152; }; - dsferruzza = { - email = "david.sferruzza@gmail.com"; - github = "dsferruzza"; - githubId = 1931963; - name = "David Sferruzza"; - }; dsluijk = { name = "Dany Sluijk"; email = "nix@dany.dev"; diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index d55219ecf251..dc19606ebea4 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -74,10 +74,7 @@ stdenv.mkDerivation (finalAttrs: { asl20 # and unfree # TrueCrypt License version 3.0 ]; - maintainers = with lib.maintainers; [ - dsferruzza - ryand56 - ]; + maintainers = [ lib.maintainers.ryand56 ]; platforms = lib.platforms.linux; }; }) From c514b3f9d128c64677a3e00f2f29085a9a649425 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 18 May 2026 19:43:54 +0700 Subject: [PATCH 18/86] python3Packages.pytest-pylint: fix tests with newer pytest --- .../python-modules/pytest-pylint/default.nix | 12 ++++++++++++ .../python-modules/pytest-pylint/pytest-9.patch | 13 +++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-pylint/pytest-9.patch diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 93e5f6cab127..f24ce58efcee 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch2, setuptools, pylint, pytest, @@ -19,6 +20,17 @@ buildPythonPackage rec { hash = "sha256-iHZLjh1c+hiAkkjgzML8BQNfCMNfCwIi3c/qHDxOVT4="; }; + patches = [ + # Use pathlib.Path in plugin hooks for pytest 8.1+ compatibility. + (fetchpatch2 { + url = "https://github.com/carsongee/pytest-pylint/commit/62457e8013df106116fb2a62c7c44870103ff393.patch?full_index=1"; + hash = "sha256-EnlHEe5uZkvrWO8B33xkQ3LCQ7Bj5/oLES//NP8vkwE="; + }) + # Handle test output difference in pytest 9. + # https://github.com/carsongee/pytest-pylint/pull/196 + ./pytest-9.patch + ]; + postPatch = '' substituteInPlace setup.py \ --replace-fail "pytest-runner" "" diff --git a/pkgs/development/python-modules/pytest-pylint/pytest-9.patch b/pkgs/development/python-modules/pytest-pylint/pytest-9.patch new file mode 100644 index 000000000000..fcfd449561c5 --- /dev/null +++ b/pkgs/development/python-modules/pytest-pylint/pytest-9.patch @@ -0,0 +1,13 @@ +diff --git a/pytest_pylint/tests/test_pytest_pylint.py b/pytest_pylint/tests/test_pytest_pylint.py +index 4c87ac336690defb2f2d472b389945c91fae5d31..f6478c018f5974acb2fdd95f1d461ca71e1302ba 100644 +--- a/pytest_pylint/tests/test_pytest_pylint.py ++++ b/pytest_pylint/tests/test_pytest_pylint.py +@@ -38,7 +38,7 @@ def test_nodeid_no_dupepath(testdir): + testdir.makepyfile(app="import sys") + result = testdir.runpytest("--pylint", "--verbose") + assert re.search( +- r"^FAILED\s+app\.py::PYLINT$", result.stdout.str(), flags=re.MULTILINE ++ r"^FAILED\s+app\.py::PYLINT( |$)", result.stdout.str(), flags=re.MULTILINE + ) + + From 46f49d39136daa7717c79dfc57521fdd282723b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 May 2026 11:15:21 +0000 Subject: [PATCH 19/86] vuetorrent: 2.33.0 -> 2.34.0 --- pkgs/by-name/vu/vuetorrent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix index 79e2db2c5f98..c1f3e2349fd7 100644 --- a/pkgs/by-name/vu/vuetorrent/package.nix +++ b/pkgs/by-name/vu/vuetorrent/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "vuetorrent"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "VueTorrent"; repo = "VueTorrent"; tag = "v${version}"; - hash = "sha256-7jr7spoJBt4YqOgTmIC2bNjygrSlUgF1AuDPzCe+YuU="; + hash = "sha256-Zz7ZFtxT26/4HCkM/HHVyLXxbmDvhTRFaJpiXA08JPY="; }; - npmDepsHash = "sha256-l8b/WazCUKWwxlv+b8OnLLYslhGezdoWIGsRExIsZyU="; + npmDepsHash = "sha256-PxTe/anj3VgdEaSdv37XuBYD8N3gs9wc+idCboX8Bic="; installPhase = '' runHook preInstall From b18549bca1d941d5c551366bd40ecee9d0c9db9d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 May 2026 13:02:55 +0200 Subject: [PATCH 20/86] python3Packages.twilio: 9.10.5 -> 9.10.9 Diff: https://github.com/twilio/twilio-python/compare/9.10.5...9.10.9 Changelog: https://github.com/twilio/twilio-python/blob/9.10.9/CHANGES.md --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 3a1ab16d7216..55f883a1e659 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "twilio"; - version = "9.10.5"; + version = "9.10.9"; pyproject = true; src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; tag = finalAttrs.version; - hash = "sha256-WLgx8kAHfLf7BHhu4A7b4gI3pB7WODb/CPV1qw7oNXM="; + hash = "sha256-CQWP8QujDvV5+Z5JDUcWhQ4mJZqaXnxpScS9sBxIX4Q="; }; build-system = [ setuptools ]; From 7a33dc20af90417dc0d055c3e53c837112f3e5b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 May 2026 22:26:19 +0000 Subject: [PATCH 21/86] spire: 1.14.6 -> 1.15.0 --- pkgs/by-name/sp/spire/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix index 879ec20d4d30..61622afeb917 100644 --- a/pkgs/by-name/sp/spire/package.nix +++ b/pkgs/by-name/sp/spire/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "spire"; - version = "1.14.6"; + version = "1.15.0"; outputs = [ "out" @@ -21,12 +21,12 @@ buildGoModule (finalAttrs: { owner = "spiffe"; repo = "spire"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-3NboIbLRxs4yPjQUKdK7B+Rhl08SxEDPuj5N8lWd1gA="; + sha256 = "sha256-mOYPVvumMIXgfJGQeStU62DlBOIwI0Sav5cQonU28r0="; }; # Needed for github.co/google/go-tpm-tools/simulator which contains non-go files that `go mod vendor` strips proxyVendor = true; - vendorHash = "sha256-Ajoxxpf6oWW6jioMTgeyaIszVhp4j7E2+msE0nhfKpk="; + vendorHash = "sha256-F9M7Tvo/yF1QVnjB7Gp3mbZc7159Dx7wgttjstkA/1w="; buildInputs = [ openssl ]; From c5f1d81ef53e0b4c5195d9ee8166ced627d072d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mladen=20Brankovi=C4=87?= Date: Thu, 21 May 2026 00:17:34 +0200 Subject: [PATCH 22/86] hyperglot: 0.7.3 -> 0.8.1 --- .../python-modules/hyperglot/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/hyperglot/default.nix b/pkgs/development/python-modules/hyperglot/default.nix index 1722f06a28ce..549eaacf324b 100644 --- a/pkgs/development/python-modules/hyperglot/default.nix +++ b/pkgs/development/python-modules/hyperglot/default.nix @@ -1,23 +1,27 @@ { lib, nix-update-script, - fetchPypi, + fetchFromGitHub, buildPythonApplication, setuptools, + pytestCheckHook, click, fonttools, uharfbuzz, pyyaml, colorlog, + packaging, }: buildPythonApplication rec { pname = "hyperglot"; - version = "0.7.3"; + version = "0.8.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-Pd9Yxmv9a1T2xV03q2U1m1laHE3WifHwmnGBfTTCSxM="; + src = fetchFromGitHub { + owner = "rosettatype"; + repo = "hyperglot"; + tag = version; + hash = "sha256-fiiDYggMBwd7nTHeQLWnSc3BNDyU+JUgAIk8pHLntUY="; }; dependencies = [ @@ -26,10 +30,12 @@ buildPythonApplication rec { uharfbuzz pyyaml colorlog + packaging ]; build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "hyperglot" ]; passthru.updateScript = nix-update-script { }; @@ -38,7 +44,7 @@ buildPythonApplication rec { description = "Database and tools for detecting language support in fonts"; homepage = "https://hyperglot.rosettatype.com"; changelog = "https://github.com/rosettatype/hyperglot/blob/${version}/CHANGELOG.md"; - license = lib.licenses.gpl3Only; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ imatpot ]; mainProgram = "hyperglot"; }; From b2c4b23bcec610c09e88b85ca0800ed8b479350f Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 12 May 2026 09:49:51 +0200 Subject: [PATCH 23/86] vg: init at 1.74.1 --- ...rerequisite-for-making-sure-dirs-exi.patch | 68 ++++++ pkgs/by-name/vg/vg/package.nix | 208 ++++++++++++++++++ 2 files changed, 276 insertions(+) create mode 100644 pkgs/by-name/vg/vg/0001-Use-order-only-prerequisite-for-making-sure-dirs-exi.patch create mode 100644 pkgs/by-name/vg/vg/package.nix diff --git a/pkgs/by-name/vg/vg/0001-Use-order-only-prerequisite-for-making-sure-dirs-exi.patch b/pkgs/by-name/vg/vg/0001-Use-order-only-prerequisite-for-making-sure-dirs-exi.patch new file mode 100644 index 000000000000..6ab121dadf68 --- /dev/null +++ b/pkgs/by-name/vg/vg/0001-Use-order-only-prerequisite-for-making-sure-dirs-exi.patch @@ -0,0 +1,68 @@ +From 27023ebb5e5b0fef98682c179889c3a9a799d2ae Mon Sep 17 00:00:00 2001 +From: eljamm +Date: Tue, 12 May 2026 18:02:52 +0200 +Subject: [PATCH] Use order-only prerequisite for making sure dirs exist + +instead of using `.pre-build` with `-include`, which could cause a +failure if targets start executing before it finishes. +--- + Makefile | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 4436f14..8e66c66 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,20 +47,21 @@ test: all $(BIN_DIR)/test_libbdsg + docs: + cd $(DOC_DIR) && $(MAKE) html + +-.pre-build: +- @if [ ! -d $(LIB_DIR) ]; then mkdir -p $(LIB_DIR); fi +- @if [ ! -d $(OBJ_DIR) ]; then mkdir -p $(OBJ_DIR); fi +- @if [ ! -d $(BIN_DIR) ]; then mkdir -p $(BIN_DIR); fi +- +-# run .pre-build before we make anything at all. +--include .pre-build +- + # Make sure to pull in dependency files + include $(wildcard $(OBJ_DIR)/*.d) + + # Use a fake rule to build .d files, so we don't complain if they don't exist. + $(OBJ_DIR)/%.d: ; + ++$(OBJ_DIR): ++ mkdir -p $(OBJ_DIR) ++ ++$(LIB_DIR): ++ mkdir -p $(LIB_DIR) ++ ++$(BIN_DIR): ++ mkdir -p $(BIN_DIR) ++ + # Don't delete them. + .PRECIOUS: $(OBJ_DIR)/%.d + +@@ -69,16 +70,16 @@ $(OBJ_DIR)/%.d: ; + # Make sure to touch the .o file after the compiler finishes so it is always newer than the .d file + # Use static pattern rules so the dependency files will not be ignored if the output exists + # See +-$(OBJS): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.cpp $(OBJ_DIR)/%.d ++$(OBJS): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.cpp $(OBJ_DIR)/%.d | $(OBJ_DIR) + $(CXX) $(LDFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ + @touch $@ + + +-$(LIB_DIR)/libbdsg.a: $(OBJS) ++$(LIB_DIR)/libbdsg.a: $(OBJS) | $(LIB_DIR) + rm -f $@ + ar rs $@ $(OBJS) + +-$(BIN_DIR)/test_libbdsg: $(LIB_DIR)/libbdsg.a $(SRC_DIR)/test_libbdsg.cpp ++$(BIN_DIR)/test_libbdsg: $(LIB_DIR)/libbdsg.a $(SRC_DIR)/test_libbdsg.cpp | $(BIN_DIR) + mkdir -p $(BIN_DIR) + $(CXX) $(LDFLAGS) $(CPPFLAGS) $(CXXFLAGS) -L $(LIB_DIR) $(SRC_DIR)/test_libbdsg.cpp -o $(BIN_DIR)/test_libbdsg $(LIB_FLAGS) + chmod +x $(BIN_DIR)/test_libbdsg +-- +2.51.2 + diff --git a/pkgs/by-name/vg/vg/package.nix b/pkgs/by-name/vg/vg/package.nix new file mode 100644 index 000000000000..816af95965f1 --- /dev/null +++ b/pkgs/by-name/vg/vg/package.nix @@ -0,0 +1,208 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + runCommand, + + # build-time + autoconf, + automake, + bison, + cmake, + flex, + gettext, + hostname, + libtool, + perl, + pkg-config, + python3, + util-linux, + which, + whoami, + + # run-time + boost, + bzip2, + cairo, + curl, + expat, + jansson, + libxdmcp, + ncurses, + openssl, + protobuf, + xz, + zlib, + zstd, + + # test + graphviz, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vg"; + version = "1.74.1"; + + src = fetchFromGitHub { + owner = "vgteam"; + repo = "vg"; + tag = "v${finalAttrs.version}"; + hash = "sha256-CY4nUtVetdmoex/sRnoncEbvuQloV0WMZXtQpPksO1s="; + fetchSubmodules = true; + }; + + postPatch = '' + substituteInPlace \ + Makefile \ + --replace-fail "/bin/bash" "${stdenv.shell}" \ + --replace-fail "\$(shell arch)" "${stdenv.hostPlatform.uname.processor}" \ + --replace-fail "vg_git_version.hpp]" "vg_git_version.hpp ]" + + substituteInPlace \ + deps/libbdsg/bdsg/deps/pybind11/tests/CMakeLists.txt \ + deps/vcflib/CMakeLists.txt \ + --replace-fail \ + "find_package(pybind11 " \ + "set(PYBIND11_FINDPYTHON ON) + find_package(pybind11 " + + patchShebangs ./ + patchShebangs deps/ + + patch -p1 -d deps/libbdsg -i ${./0001-Use-order-only-prerequisite-for-making-sure-dirs-exi.patch} + + pushd deps/htslib + PACKAGE_VERSION=$(./version.sh) + echo '#define HTSCODECS_VERSION_TEXT "$PACKAGE_VERSION"' > ./htscodecs/htscodecs/version.h + popd + ''; + + dontUseCmake = true; # cmake needed for deps, but not main package + dontConfigure = true; + enableParallelBuilding = true; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ + autoconf + automake + bison + cmake + finalAttrs.passthru.customPython + flex + gettext + hostname + libtool + perl + pkg-config + which + whoami + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + util-linux # rev, and possibly others + ]; + + buildInputs = [ + boost + bzip2 + cairo + curl + expat + jansson + ncurses + openssl + protobuf + xz + zlib + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libxdmcp + ]; + + passthru.customPython = python3.withPackages ( + ps: with ps; [ + pybind11 + ] + ); + + # needed, else build fails + env.VG_GIT_VERSION = finalAttrs.src.tag; + + # deps/elfutils + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=stringop-overflow" + "-Wno-error=unterminated-string-initialization" + ]; + + makeFlags = [ + # don't build statically + "START_STATIC=" + "END_STATIC=" + ]; + + preBuild = '' + # Install directories may not exist when parallel builds complete their + # output steps, so we create them here to prevent build failures. + mkdir -p lib include obj/{pic/algorithms,algorithms,config,io,subcommand,unittest/support} + ''; + + # no install target + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + + cp bin/* $out/bin/ + cp -R lib/lib{handlegraph,vgio,hts,deflate}.so* $out/lib/ + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + + for bin in $out/bin/* ; do + patchelf --allowed-rpath-prefixes /nix/store --shrink-rpath $bin + patchelf --set-rpath "$out/lib:$(patchelf --print-rpath $bin)" $bin + done + + # remove debugging symbols that make the binary bloated in size + strip -d $out/bin/vg + + runHook postFixup + ''; + + passthru = { + updateScript = nix-update-script { }; + tests = runCommand "test-vg-basic" { } '' + HOME=$(mktemp -d) # fontconfig cache + + cp -R ${finalAttrs.src}/test . + + # build graph + ${finalAttrs.finalPackage}/bin/vg construct \ + -r test/tiny/tiny.fa \ + -v test/tiny/tiny.vcf.gz \ + >x.vg + + # convert graph to image + ${finalAttrs.finalPackage}/bin/vg view -d x.vg >x.dot + ${graphviz}/bin/dot -Tpng x.dot -o $out + ''; + }; + + meta = { + description = "Tools for working with genome variation graphs"; + homepage = "https://github.com/vgteam/vg"; + changelog = "https://github.com/vgteam/vg/releases/tag/${finalAttrs.src.tag}"; + mainProgram = "vg"; + license = lib.licenses.mit; + # TODO: build on darwin + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ eljamm ]; + teams = with lib.teams; [ ngi ]; + }; +}) From 0a3aaad7438d00ab907f3c0e83ee50565fab8097 Mon Sep 17 00:00:00 2001 From: gquetel Date: Sun, 10 May 2026 22:34:07 +0200 Subject: [PATCH 24/86] python3Packages.mlflow: build from PyPI wheel, fix server subprocess --- .../python-modules/mlflow/default.nix | 39 +++++++++++-------- .../mlflow/subprocess-pythonpath.patch | 14 +++++++ 2 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/mlflow/subprocess-pythonpath.patch diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 8f3d77ca8b50..6804cae7e86a 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -1,10 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, + fetchPypi, # dependencies aiohttp, @@ -31,26 +28,32 @@ buildPythonPackage (finalAttrs: { pname = "mlflow"; version = "3.12.0"; - pyproject = true; + format = "wheel"; __structuredAttrs = true; - src = fetchFromGitHub { - owner = "mlflow"; - repo = "mlflow"; - tag = "v${finalAttrs.version}"; - hash = "sha256-OxhM+KCem0sb9cwtyzrUD/MGfoiiCfgU47qipYRDaFk="; + # We build from the PyPI wheel rather than fetchFromGitHub, because the mlflow-server + # JS UI is absent from GitHub but provided in the wheel. + src = fetchPypi { + pname = "mlflow"; + inherit (finalAttrs) version; + format = "wheel"; + dist = "py3"; + python = "py3"; + hash = "sha256-4cKO1MSFV8xSx2bxfxylgmdT3fJB1D8w+ZxF9+prPOA="; }; - # ppyproject.release.toml is the one shipped in the Pypi package, so we use it too. - postPatch = '' - mv pyproject.release.toml pyproject.toml + # Nix-wrapped python populates sys.path via NIX_PYTHONPATH/site hooks, + # but PYTHONPATH stays unset in os.environ. mlflow spawns the server + # in a subprocess with a curated env, so without this patch the child + # interpreter cannot import uvicorn / mlflow itself. + postInstall = '' + patch -p1 -d "$out/lib/python"*/site-packages < ${./subprocess-pythonpath.patch} ''; - build-system = [ setuptools ]; - pythonRelaxDeps = [ "cryptography" ]; + dependencies = [ aiohttp alembic @@ -85,8 +88,12 @@ buildPythonPackage (finalAttrs: { description = "Open source platform for the machine learning lifecycle"; mainProgram = "mlflow"; homepage = "https://github.com/mlflow/mlflow"; - changelog = "https://github.com/mlflow/mlflow/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + changelog = "https://github.com/mlflow/mlflow/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; + # Build from wheel which contains pure Python and pre-built JS bundle. + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + ]; maintainers = with lib.maintainers; [ GaetanLepage ]; diff --git a/pkgs/development/python-modules/mlflow/subprocess-pythonpath.patch b/pkgs/development/python-modules/mlflow/subprocess-pythonpath.patch new file mode 100644 index 000000000000..9e97218fdf92 --- /dev/null +++ b/pkgs/development/python-modules/mlflow/subprocess-pythonpath.patch @@ -0,0 +1,14 @@ +--- a/mlflow/server/__init__.py ++++ b/mlflow/server/__init__.py +@@ -471,6 +471,11 @@ + else tempfile.mkdtemp() + ) ++ # In Nix-packaged environments sys.path is populated by wrappers but ++ # PYTHONPATH is never set in os.environ, so subprocesses (uvicorn, ++ # gunicorn) cannot find packages. Propagate it when not already set. ++ if "PYTHONPATH" not in os.environ: ++ env_map.setdefault("PYTHONPATH", os.pathsep.join(p for p in sys.path if p)) + + server_proc = _exec_cmd( + full_command, + extra_env=env_map, From f19dc29153e60ae94a2338ad4a13a314fcd8329c Mon Sep 17 00:00:00 2001 From: gquetel Date: Mon, 11 May 2026 17:06:44 +0200 Subject: [PATCH 25/86] mlflow-server: drop broken gunicorn shim --- pkgs/by-name/ml/mlflow-server/package.nix | 39 ++++------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/ml/mlflow-server/package.nix b/pkgs/by-name/ml/mlflow-server/package.nix index 8155f9b5c0c5..5f9a71fdf047 100644 --- a/pkgs/by-name/ml/mlflow-server/package.nix +++ b/pkgs/by-name/ml/mlflow-server/package.nix @@ -1,37 +1,10 @@ -{ python3Packages, writers }: +{ python3Packages }: -let - py = python3Packages; - - gunicornScript = writers.writePython3 "gunicornMlflow" { } '' - import re - import sys - from gunicorn.app.wsgiapp import run - if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', ''', sys.argv[0]) - sys.exit(run()) - ''; -in -py.toPythonApplication ( - py.mlflow.overridePythonAttrs (old: { - - propagatedBuildInputs = old.dependencies ++ [ - py.boto3 - py.mysqlclient +python3Packages.toPythonApplication ( + python3Packages.mlflow.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ + python3Packages.boto3 + python3Packages.mysqlclient ]; - - postPatch = (old.postPatch or "") + '' - cat mlflow/utils/process.py - - substituteInPlace mlflow/utils/process.py --replace-fail \ - "process = subprocess.Popen(" \ - "cmd[0]='${gunicornScript}'; process = subprocess.Popen(" - ''; - - postInstall = '' - gpath=$out/bin/gunicornMlflow - cp ${gunicornScript} $gpath - chmod 555 $gpath - ''; }) ) From 5fb68dfd6aef0825065c14dae561124c87eae2ec Mon Sep 17 00:00:00 2001 From: gquetel Date: Tue, 19 May 2026 16:11:35 +0200 Subject: [PATCH 26/86] python3Packages.mlflow-{skinny,tracing}: move to PyPI wheel build --- .../python-modules/mlflow-skinny/default.nix | 12 ++++++++++- .../python-modules/mlflow-tracing/default.nix | 20 +++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/mlflow-skinny/default.nix b/pkgs/development/python-modules/mlflow-skinny/default.nix index 7683c7c045fb..9f5a818c7a82 100644 --- a/pkgs/development/python-modules/mlflow-skinny/default.nix +++ b/pkgs/development/python-modules/mlflow-skinny/default.nix @@ -1,5 +1,7 @@ { + lib, buildPythonPackage, + fetchFromGitHub, mlflow, # build-system @@ -30,10 +32,17 @@ buildPythonPackage (finalAttrs: { pname = "mlflow-skinny"; - inherit (mlflow) version src; + inherit (mlflow) version; pyproject = true; __structuredAttrs = true; + src = fetchFromGitHub { + owner = "mlflow"; + repo = "mlflow"; + rev = "v${finalAttrs.version}"; + hash = "sha256-OxhM+KCem0sb9cwtyzrUD/MGfoiiCfgU47qipYRDaFk="; + }; + sourceRoot = "${finalAttrs.src.name}/libs/skinny"; build-system = [ setuptools ]; @@ -69,5 +78,6 @@ buildPythonPackage (finalAttrs: { meta = mlflow.meta // { description = "Lightweight version of MLflow that is designed to minimize package size"; homepage = "https://github.com/mlflow/mlflow/tree/master/libs/skinny"; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; }; }) diff --git a/pkgs/development/python-modules/mlflow-tracing/default.nix b/pkgs/development/python-modules/mlflow-tracing/default.nix index ca76c7112bad..9f78d2dcaa32 100644 --- a/pkgs/development/python-modules/mlflow-tracing/default.nix +++ b/pkgs/development/python-modules/mlflow-tracing/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchFromGitHub, mlflow, # build-system @@ -15,9 +16,6 @@ packaging, protobuf, pydantic, - - # tests - pytestCheckHook, }: buildPythonPackage (finalAttrs: { pname = "mlflow-tracing"; @@ -25,13 +23,16 @@ buildPythonPackage (finalAttrs: { pyproject = true; __structuredAttrs = true; - inherit (mlflow) src; + src = fetchFromGitHub { + owner = "mlflow"; + repo = "mlflow"; + rev = "v${finalAttrs.version}"; + hash = "sha256-OxhM+KCem0sb9cwtyzrUD/MGfoiiCfgU47qipYRDaFk="; + }; sourceRoot = "${finalAttrs.src.name}/libs/tracing"; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ cachetools @@ -53,6 +54,9 @@ buildPythonPackage (finalAttrs: { description = "Open-Source SDK for observability and monitoring GenAI applications"; homepage = "https://github.com/mlflow/mlflow/tree/master/libs/tracing"; inherit (mlflow.meta) license; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + GaetanLepage + gquetel + ]; }; }) From 95b95bf7b9ac134dda195f143fefeb60e23d7ee6 Mon Sep 17 00:00:00 2001 From: gquetel Date: Tue, 19 May 2026 16:18:14 +0200 Subject: [PATCH 27/86] maintainers: add gquetel --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e37ff00cb911..3db521f6fd07 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10136,6 +10136,12 @@ githubId = 6893840; name = "Yacine Hmito"; }; + gquetel = { + email = "gregor.quetel@telecom-paris.fr"; + github = "gquetel"; + githubId = 48437427; + name = "Grégor Quetel"; + }; gracicot = { email = "dev@gracicot.com"; matrix = "@gracicot-59e8f173d73408ce4f7ac803:gitter.im"; From cb52e5fc59df44845f9620eed9aed8fc2c8e0ced Mon Sep 17 00:00:00 2001 From: gquetel Date: Tue, 19 May 2026 16:20:36 +0200 Subject: [PATCH 28/86] python3Packages.mlflow: add gquetel to maintainers --- pkgs/development/python-modules/mlflow/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 6804cae7e86a..65baefc85c0f 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -96,6 +96,7 @@ buildPythonPackage (finalAttrs: { ]; maintainers = with lib.maintainers; [ GaetanLepage + gquetel ]; }; }) From b8e272c896f9bc197c34b569bf37dda0c80d30ef Mon Sep 17 00:00:00 2001 From: Lisanna Dettwyler Date: Fri, 6 Mar 2026 13:54:13 -0500 Subject: [PATCH 29/86] mpir: change src location to GitHub The official website appears to be a virus site now. Signed-off-by: Lisanna Dettwyler --- pkgs/by-name/mp/mpir/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mp/mpir/package.nix b/pkgs/by-name/mp/mpir/package.nix index a1412ca3a592..d27c0a71aaf7 100644 --- a/pkgs/by-name/mp/mpir/package.nix +++ b/pkgs/by-name/mp/mpir/package.nix @@ -1,10 +1,11 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, m4, which, yasm, + texinfo, autoreconfHook, fetchpatch, buildPackages, @@ -20,12 +21,15 @@ stdenv.mkDerivation (finalAttrs: { m4 which yasm + texinfo autoreconfHook ]; - src = fetchurl { - url = "https://mpir.org/mpir-${finalAttrs.version}.tar.bz2"; - sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj"; + src = fetchFromGitHub { + owner = "wbhart"; + repo = "mpir"; + tag = "mpir-${finalAttrs.version}"; + hash = "sha256-Q5P3N2w6NX+s5Fu3obTDOg+tEAWnAMDgbRlzFTpolmg="; }; patches = [ From e21bc831c20a27c77d363d41765845ec3db643a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 May 2026 15:58:16 +0000 Subject: [PATCH 30/86] sev-snp-measure: 0.0.12 -> 0.0.13 --- pkgs/development/python-modules/sev-snp-measure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sev-snp-measure/default.nix b/pkgs/development/python-modules/sev-snp-measure/default.nix index 360ae863accc..9154d2d49eca 100644 --- a/pkgs/development/python-modules/sev-snp-measure/default.nix +++ b/pkgs/development/python-modules/sev-snp-measure/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sev-snp-measure"; - version = "0.0.12"; + version = "0.0.13"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "virtee"; repo = "sev-snp-measure"; tag = "v${version}"; - hash = "sha256-UcXU6rNjcRN1T+iWUNrqeJCkSa02WU1/pBwLqHVPRyw="; + hash = "sha256-euAmKIdLJiA+iRlsPJCxPuquE9eznwd937LVWO4DKpc="; }; nativeBuildInputs = [ From 640d575efac4496e3e7639e2cd8923e8200674b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 May 2026 19:30:13 +0000 Subject: [PATCH 31/86] tombi: 0.10.4 -> 0.11.6 --- pkgs/by-name/to/tombi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index ab919e7c9498..95aa91872287 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.10.4"; + version = "0.11.6"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-Hs274ROPzyhVyvcvA7pDZ6+EELj4uUZylz94BoZNe6M="; + hash = "sha256-m9ppr3P4HIzIzNYbLukbcCoYwRdcTWIpMmcmteIfo84="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-i7OeWuGLrDFjBhFjuygIZ35LbzENM39+cCwHJ98ECyQ="; + cargoHash = "sha256-f67OkZEB98KCtvkjszrcPLoC2QWl/5rd/qvb8jmonxc="; postPatch = '' substituteInPlace Cargo.toml \ From 24369903290dbb007b21e187ee5f4007ee51207b Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Fri, 22 May 2026 16:59:09 -0400 Subject: [PATCH 32/86] python3Packages.libarcus: drop Assisted-by: Codex:gpt-5.5 Assisted-by: Claude:opus-4.7 --- pkgs/applications/misc/cura/plugins.nix | 84 ----------------- pkgs/applications/misc/curaengine/default.nix | 49 ---------- pkgs/by-name/cu/cura/package.nix | 93 ------------------- .../python-modules/libarcus/default.nix | 59 ------------ .../python-modules/uranium/default.nix | 61 ------------ pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 7 -- pkgs/top-level/python-aliases.nix | 2 + pkgs/top-level/python-packages.nix | 4 - 9 files changed, 5 insertions(+), 357 deletions(-) delete mode 100644 pkgs/applications/misc/cura/plugins.nix delete mode 100644 pkgs/applications/misc/curaengine/default.nix delete mode 100644 pkgs/by-name/cu/cura/package.nix delete mode 100644 pkgs/development/python-modules/libarcus/default.nix delete mode 100644 pkgs/development/python-modules/uranium/default.nix diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix deleted file mode 100644 index 122ab49b24bc..000000000000 --- a/pkgs/applications/misc/cura/plugins.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - python3Packages, - libspnav, - jq, -}: - -let - - self = { - - octoprint = stdenv.mkDerivation { - pname = "Cura-OctoPrintPlugin"; - version = "3.5.18"; - - src = fetchFromGitHub { - owner = "fieldOfView"; - repo = "Cura-OctoPrintPlugin"; - rev = "7bd73946fbf22d18337dc900a81a011ece26bee0"; - sha256 = "057b2f5f49p96lkh2wsr9w6yh2003x4a85irqsgbzp6igmk8imdn"; - }; - - propagatedBuildInputs = with python3Packages; [ - netifaces - ]; - - installPhase = '' - mkdir -p $out/lib/cura/plugins/OctoPrintPlugin - cp -rv . $out/lib/cura/plugins/OctoPrintPlugin/ - ''; - - meta = { - description = "Enables printing directly to OctoPrint and monitoring the process"; - homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin"; - license = lib.licenses.agpl3Plus; - maintainers = [ ]; - }; - }; - - rawmouse = stdenv.mkDerivation rec { - pname = "RawMouse"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "smartavionics"; - repo = "RawMouse"; - rev = version; - sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw"; - }; - - nativeBuildInputs = [ jq ]; - - propagatedBuildInputs = with python3Packages; [ - hidapi - ]; - - buildPhase = '' - jq 'del(.devices) | .libspnav="${libspnav}/lib/libspnav.so"' \ - RawMouse/config.json.new - mv RawMouse/config.json.new RawMouse/config.json - - # remove prebuilt binaries - rm -r RawMouse/hidapi - ''; - - installPhase = '' - mkdir -p $out/lib/cura/plugins/RawMouse - cp -rv . $out/lib/cura/plugins/RawMouse/ - ''; - - meta = { - description = "Cura plugin for HID mice such as 3Dconnexion spacemouse"; - homepage = "https://github.com/smartavionics/RawMouse"; - license = lib.licenses.agpl3Plus; - maintainers = [ ]; - }; - }; - - }; - -in -self diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix deleted file mode 100644 index 975aec5576ac..000000000000 --- a/pkgs/applications/misc/curaengine/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - libarcus, - stb, - protobuf, - fetchpatch, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "curaengine"; - version = "4.13.1"; - - src = fetchFromGitHub { - owner = "Ultimaker"; - repo = "CuraEngine"; - rev = finalAttrs.version; - sha256 = "sha256-dx0Q6cuA66lG4nwR7quW5Tvs9sdxjdV4gtpxXirI4nY="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - libarcus - stb - protobuf - ]; - - cmakeFlags = [ "-DCURA_ENGINE_VERSION=${finalAttrs.version}" ]; - - # TODO already fixed in master, remove in next release - patches = [ - (fetchpatch { - url = "https://github.com/Ultimaker/CuraEngine/commit/de60e86a6ea11cb7d121471b5dd192e5deac0f3d.patch"; - hash = "sha256-/gT9yErIDDYAXvZ6vX5TGlwljy31K563+sqkm1UGljQ="; - includes = [ "src/utils/math.h" ]; - }) - ]; - - meta = { - description = "Powerful, fast and robust engine for processing 3D models into 3D printing instruction"; - homepage = "https://github.com/Ultimaker/CuraEngine"; - license = lib.licenses.agpl3Only; - platforms = lib.platforms.linux; - maintainers = [ ]; - mainProgram = "CuraEngine"; - }; -}) diff --git a/pkgs/by-name/cu/cura/package.nix b/pkgs/by-name/cu/cura/package.nix deleted file mode 100644 index bce9ab2fb375..000000000000 --- a/pkgs/by-name/cu/cura/package.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - python3, - libsForQt5, - curaengine, - plugins ? [ ], -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cura"; - version = "4.13.1"; - - src = fetchFromGitHub { - owner = "Ultimaker"; - repo = "Cura"; - rev = finalAttrs.version; - sha256 = "sha256-R88SdAxx3tkQCDInrFTKad1tPSDTSYaVAPUVmdk94Xk="; - }; - - materials = fetchFromGitHub { - owner = "Ultimaker"; - repo = "fdm_materials"; - rev = "4.13.2"; - sha256 = "sha256-7y4OcbeQHv+loJ4cMgPU0e818Zsv90EwARdztNWS8zM="; - }; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtquickcontrols2 - libsForQt5.qtgraphicaleffects - ]; - propagatedBuildInputs = - with python3.pkgs; - [ - libsavitar - numpy-stl - pyserial - requests - uranium - zeroconf - pynest2d - sentry-sdk - trimesh - keyring - ] - ++ plugins; - nativeBuildInputs = [ - cmake - python3.pkgs.wrapPython - libsForQt5.wrapQtAppsHook - ]; - - cmakeFlags = [ - "-DURANIUM_DIR=${python3.pkgs.uranium.src}" - "-DCURA_VERSION=${finalAttrs.version}" - ]; - - makeWrapperArgs = [ - # hacky workaround for https://github.com/NixOS/nixpkgs/issues/59901 - "--set OMP_NUM_THREADS 1" - ]; - - postPatch = '' - sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt - sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py - ''; - - postInstall = '' - mkdir -p $out/share/cura/resources/materials - cp ${finalAttrs.materials}/*.fdm_material $out/share/cura/resources/materials/ - mkdir -p $out/lib/cura/plugins - for plugin in ${toString plugins}; do - ln -s $plugin/lib/cura/plugins/* $out/lib/cura/plugins - done - ''; - - postFixup = '' - wrapPythonPrograms - wrapQtApp $out/bin/cura - ''; - - meta = { - description = "3D printer / slicing GUI built on top of the Uranium framework"; - mainProgram = "cura"; - homepage = "https://github.com/Ultimaker/Cura"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -}) diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix deleted file mode 100644 index 7ce870199361..000000000000 --- a/pkgs/development/python-modules/libarcus/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - buildPythonPackage, - python, - fetchFromGitHub, - fetchpatch, - cmake, - sip4, - protobuf, - distutils, -}: - -buildPythonPackage rec { - pname = "libarcus"; - version = "4.12.0"; - pyproject = false; - - src = fetchFromGitHub { - owner = "Ultimaker"; - repo = "libArcus"; - rev = version; - hash = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w="; - }; - - patches = [ - # Fix build against protobuf 3.18+ - # https://github.com/Ultimaker/libArcus/issues/121 - (fetchpatch { - url = "https://raw.githubusercontent.com/coryan/vcpkg/f69b85aa403b04e7d442c90db3418d484e44024f/ports/arcus/0001-fix-protobuf-deprecated.patch"; - sha256 = "0bqj7pxzpwsamknd6gadj419x6mwx8wnlfzg4zqn6cax3cmasjb2"; - }) - ]; - - propagatedBuildInputs = [ - sip4 - distutils - ]; - - nativeBuildInputs = [ - cmake - sip4 - ]; - - buildInputs = [ protobuf ]; - - strictDeps = true; - - postPatch = '' - sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake - ''; - - meta = { - description = "Communication library between internal components for Ultimaker software"; - homepage = "https://github.com/Ultimaker/libArcus"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix deleted file mode 100644 index 91bd77e10dc2..000000000000 --- a/pkgs/development/python-modules/uranium/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - python, - cmake, - pyqt5, - numpy, - scipy, - shapely, - libarcus, - cryptography, - doxygen, - gettext, -}: - -buildPythonPackage rec { - version = "4.12.0"; - pname = "uranium"; - pyproject = false; - - src = fetchFromGitHub { - owner = "Ultimaker"; - repo = "Uranium"; - rev = version; - hash = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk="; - }; - - buildInputs = [ - python - gettext - ]; - propagatedBuildInputs = [ - pyqt5 - numpy - scipy - shapely - libarcus - cryptography - ]; - nativeBuildInputs = [ - cmake - doxygen - ]; - - postPatch = '' - sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt - sed -i \ - -e "s,Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,Resources.addSearchPath(\"$out/share/uranium/resources\")," \ - -e "s,self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,self._plugin_registry.addPluginLocation(\"$out/lib/uranium/plugins\")," \ - UM/Application.py - ''; - - meta = { - description = "Python framework for building Desktop applications"; - homepage = "https://github.com/Ultimaker/Uranium"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ada49dcfecda..cf0f54bb3937 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -585,6 +585,9 @@ mapAliases { cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 cups-kyodialog3 = throw "'cups-kyodialog3' has been renamed to/replaced by 'cups-kyodialog'"; # Converted to throw 2025-10-27 + cura = throw "'cura' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22 + curaengine = throw "'curaengine' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22 + curaPlugins = throw "'curaPlugins' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22 curl-impersonate-chrome = warnAlias "curl-impersonate-chrome has been renamed to curl-impersonate" curl-impersonate; # Added 2025-11-02 curl-impersonate-ff = throw "curl-impersonate-ff has been removed because it is unmaintained upstream and has vulnerable dependencies. Use curl-impersonate instead."; # Added 2025-11-02 curlHTTP3 = warnAlias "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd02ed8d386e..f5f2866b26b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10008,13 +10008,6 @@ with pkgs; curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; - curaengine = callPackage ../applications/misc/curaengine { - inherit (python3.pkgs) libarcus; - protobuf = protobuf_21; - }; - - curaPlugins = recurseIntoAttrs (callPackage ../applications/misc/cura/plugins.nix { }); - super-slicer-beta = super-slicer.beta; super-slicer-latest = super-slicer.latest; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a7520ae5352d..5060ef0fb18b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -303,6 +303,7 @@ mapAliases { lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29 ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29 ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29 + libarcus = throw "'libarcus' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22 libgpiod = gpiod; # added 2026-03-30 libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03 line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29 @@ -617,6 +618,7 @@ mapAliases { unicode-slugify = throw "'unicode-slugify' has been removed becaues it was broken and unmaintained. Consider using 'python-slugify' instead."; # added 2025-10-05 unifi = throw "'unifi' has been removed as upstream was archived in 2017"; # Added 2025-08-25 update_checker = throw "'update_checker' has been renamed to/replaced by 'update-checker'"; # Converted to throw 2025-10-29 + uranium = throw "'uranium' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22 vcver = throw "vcver has been removed, since it was an unused leaf package"; # added 2025-08-25 vega_datasets = throw "'vega_datasets' has been renamed to/replaced by 'vega-datasets'"; # Converted to throw 2025-10-29 ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc55a388cec7..d98092c4aec7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8777,8 +8777,6 @@ self: super: with self; { inherit (pkgs) libarchive; }; - libarcus = callPackage ../development/python-modules/libarcus { protobuf = pkgs.protobuf_21; }; - libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; }; libbs = callPackage ../development/python-modules/libbs { }; @@ -20894,8 +20892,6 @@ self: super: with self; { uqbar = callPackage ../development/python-modules/uqbar { }; - uranium = callPackage ../development/python-modules/uranium { }; - uri-template = callPackage ../development/python-modules/uri-template { }; uritemplate = callPackage ../development/python-modules/uritemplate { }; From 6caca57e47ee85f7643a3dcd5faa56d4bbecfb69 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 22 May 2026 22:18:14 +0200 Subject: [PATCH 33/86] python3Packages.qtile: 0.35.0 -> 0.36.0 --- .../python-modules/qtile/default.nix | 18 ++---- .../python-modules/qtile/fix-test-net.patch | 63 ------------------- 2 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 pkgs/development/python-modules/qtile/fix-test-net.patch diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index aff452f93978..debd651e5785 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -20,7 +20,6 @@ psutil, pulsectl-asyncio, pygobject3, - pytz, pyxdg, xcffib, extraPackages ? [ ], @@ -70,7 +69,7 @@ buildPythonPackage (finalAttrs: { pname = "qtile"; - version = "0.35.0"; + version = "0.36.0"; # nixpkgs-update: no auto update # should be updated alongside with `qtile-extras` @@ -80,14 +79,9 @@ buildPythonPackage (finalAttrs: { owner = "qtile"; repo = "qtile"; tag = "v${finalAttrs.version}"; - hash = "sha256-5XHzlS/Knw/VmVtnM7wToJ/F12GAa2lwdWuXBJHXnZM="; + hash = "sha256-yFh9h3djV52zdZjPYwOWaMzN9ZNhFdZYyxFJreoJBCk="; }; - patches = [ - # https://github.com/qtile/qtile/pull/5889 - ./fix-test-net.patch - ]; - build-system = [ setuptools setuptools-scm @@ -108,6 +102,7 @@ buildPythonPackage (finalAttrs: { pypaBuildFlags = [ "--config-setting=backend=wayland" + "--config-setting=FONTCONFIG=${lib.getLib fontconfig}/lib/libfontconfig.so" "--config-setting=GOBJECT=${lib.getLib glib}/lib/libgobject-2.0.so" "--config-setting=PANGO=${lib.getLib pango}/lib/libpango-1.0.so" "--config-setting=PANGOCAIRO=${lib.getLib pango}/lib/libpangocairo-1.0.so" @@ -125,7 +120,6 @@ buildPythonPackage (finalAttrs: { psutil pulsectl-asyncio pygobject3 - pytz pyxdg xcffib ]; @@ -154,10 +148,10 @@ buildPythonPackage (finalAttrs: { pytestCheckHook pytest-asyncio pytest-httpbin + pytest-rerunfailures pytest-xdist writableTmpDirAsHomeHook anyio - fontconfig gdk-pixbuf gobject-introspection isort @@ -172,10 +166,6 @@ buildPythonPackage (finalAttrs: { ''; disabledTests = [ - # ModuleNotFoundError: No module named 'libqtile' - # known issue upstream: https://github.com/qtile/qtile/issues/5883 - "test_identify_output" - # caused by dbus-fast trying to read '/var/lib/dbus/machine-id' "test_defaults" "test_device_actions" diff --git a/pkgs/development/python-modules/qtile/fix-test-net.patch b/pkgs/development/python-modules/qtile/fix-test-net.patch deleted file mode 100644 index 6230f22c665d..000000000000 --- a/pkgs/development/python-modules/qtile/fix-test-net.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 71c70072524ee2fb2f4683861236894e51c50d6e Mon Sep 17 00:00:00 2001 -From: elParaguayo -Date: Tue, 24 Mar 2026 20:38:18 +0000 -Subject: [PATCH] Fix test_net.py - -The test uses a fake psutil module to get net statistics. However, -values are increased between tests and so will fail if tests are run in -a different order. We fix this by resetting stats between tests. ---- - test/widgets/test_net.py | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/test/widgets/test_net.py b/test/widgets/test_net.py -index dcb0966c50..ea6a849a3a 100644 ---- a/test/widgets/test_net.py -+++ b/test/widgets/test_net.py -@@ -34,6 +34,8 @@ def __init__(self, up, down): - @pytest.fixture - def patch_net(fake_qtile, monkeypatch, fake_window): - def build_widget(**kwargs): -+ MockPsutil.up = 0 -+ MockPsutil.down = 0 - monkeypatch.setitem(sys.modules, "psutil", MockPsutil("psutil")) - from libqtile.widget import net - -@@ -62,15 +64,15 @@ def test_net_defaults(patch_net): - def test_net_single_interface(patch_net): - """Display single named interface""" - net2 = patch_net(interface="wlp58s0") -- assert net2.poll() == "wlp58s0: U 40.0kB 160.0kB D 1.2MB 4.8MB T 1.24MB 4.96MB" -+ assert net2.poll() == "wlp58s0: U 40.0kB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB" - - - def test_net_list_interface(patch_net): - """Display multiple named interfaces""" - net2 = patch_net(interface=["wlp58s0", "lo"]) - assert net2.poll() == ( -- "wlp58s0: U 40.0kB 240.0kB D 1.2MB 7.2MB T 1.24MB 7.44MB lo: U 40.0kB " -- "240.0kB D 1.2MB 7.2MB T 1.24MB 7.44MB" -+ "wlp58s0: U 40.0kB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB " -+ "lo: U 40.0kB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB" - ) - - -@@ -83,7 +85,7 @@ def test_net_invalid_interface(patch_net): - def test_net_use_bits(patch_net): - """Display all interfaces in bits rather than bytes""" - net4 = patch_net(use_bits=True) -- assert net4.poll() == "all: U 320.0kb 2.56Mb D 9.6Mb 76.8Mb T 9.92Mb 79.36Mb" -+ assert net4.poll() == "all: U 320.0kb 640.0kb D 9.6Mb 19.2Mb T 9.92Mb 19.84Mb" - - - def test_net_convert_zero_b(patch_net): -@@ -95,7 +97,7 @@ def test_net_convert_zero_b(patch_net): - def test_net_use_prefix(patch_net): - """Tests `prefix` configurable option""" - net6 = patch_net(prefix="M") -- assert net6.poll() == "all: U 0.04MB 440.0kB D 1.2MB 13.2MB T 1.24MB 13.64MB" -+ assert net6.poll() == "all: U 0.04MB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB" - - - def test_net_missing_interface(patch_net): - From 1be44dd38889ff705531203bffd30153be5806cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 May 2026 02:49:32 +0000 Subject: [PATCH 34/86] versatiles: 4.1.0 -> 4.1.2 --- pkgs/by-name/ve/versatiles/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index 34519c00bb94..bddbb7144cdc 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "versatiles"; - version = "4.1.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-U83jh74h1GKb6JKO62mDfDa8monknUqQ33oXlC6E6Q0="; + hash = "sha256-kWUosTubAD/qk6xEGKUiLrw4mrAaOwwuQ3r+UeLsEJU="; }; - cargoHash = "sha256-yD4oBrk8GaI9E7Lq1Z45yqFTpRnLgNXq6CyzzV7Z/0Q="; + cargoHash = "sha256-rTVk8c00b94x6wEIDLvwadCQ/DXSFOPWcKYFSI9YI64="; nativeBuildInputs = [ pkg-config From 4b9ac442e4ce9550095edaebf8ed1178f1856230 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 22 May 2026 22:53:18 -0700 Subject: [PATCH 35/86] tpm2-pkcs11: 1.9.2 -> 1.10.0 --- pkgs/by-name/tp/tpm2-pkcs11/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix index 1bbe78d978b5..08cb74052dce 100644 --- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix +++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix @@ -46,13 +46,13 @@ let in chosenStdenv.mkDerivation (finalAttrs: { pname = "tpm2-pkcs11"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = "tpm2-pkcs11"; tag = finalAttrs.version; - hash = "sha256-o0a5MiFqLH7SuHG/BEtPVGOaDoV+kCu2l1MCHt5rWFc="; + hash = "sha256-89lChdkheSEC0JKMKNXN11BqjeJgt1Hdk+QxjLPY72M="; }; # Disable Java‐based tests because of missing dependencies From 4ae5f1586af13918c959646fede1a5e7234735e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 May 2026 11:30:07 +0000 Subject: [PATCH 36/86] lint-staged: 17.0.4 -> 17.0.5 --- pkgs/by-name/li/lint-staged/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 0ef2d8a853b1..495ecff0c54e 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "17.0.4"; + version = "17.0.5"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-E0qShnB3zVz7oL+qPzPzLhEJ9PQDlMc4+L4vpD2enI8="; + hash = "sha256-W9OW4ylRhgeUq7AlJlSkfN0IKv8Us6IEhmfE08UXzH8="; }; - npmDepsHash = "sha256-KYltk2z/1nTnaLroTErIu6eTyofvWp/wC1awEf0Ryg0="; + npmDepsHash = "sha256-ifz75kaLfDq42cdnN7eel/HtG6Fmr+1BFbD0b1vcjCA="; dontNpmBuild = true; From 39c9142f837a4393ec8954fd4a0a0d5fb0da08b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 May 2026 12:00:07 +0000 Subject: [PATCH 37/86] kimai: 2.56.0 -> 2.57.0 --- pkgs/by-name/ki/kimai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index 3bdeb4c32106..7ea0e7599521 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject2 (finalAttrs: { pname = "kimai"; - version = "2.56.0"; + version = "2.57.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; tag = finalAttrs.version; - hash = "sha256-rax67E/Zr50ejSAjA4Aa1NDsAbJYuAAE4k8hji5UhOg="; + hash = "sha256-WbZivDI5xU/pM52yFvG6vMK3LaCjbLoJGNFP3Exb8qc="; }; php = php.buildEnv { @@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { ''; }; - vendorHash = "sha256-XHicbYXOfCPFIMKrhyBpchd89anj6kG1/7prpER7aCo="; + vendorHash = "sha256-6WthU0w8V69sDlBjtz2MIavkmyYXWQ+5NflZLGQCLJs="; composerNoPlugins = false; postInstall = '' From 64c67590d91cc2cc59b621d5da0c5c7bfb6fa0e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 May 2026 13:58:36 +0000 Subject: [PATCH 38/86] protols: 0.13.4 -> 0.14.0 --- pkgs/by-name/pr/protols/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix index fc9a7ba7a902..1fa282298bbc 100644 --- a/pkgs/by-name/pr/protols/package.nix +++ b/pkgs/by-name/pr/protols/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "protols"; - version = "0.13.4"; + version = "0.14.0"; src = fetchFromGitHub { owner = "coder3101"; repo = "protols"; tag = finalAttrs.version; - hash = "sha256-OREJDG0RycYhULTbqx2dXaXlIYexebUFdCiJbBN3cXE="; + hash = "sha256-VB7Zs1Zo+hn+M4vhBmOZNod3Q9dbwcMNwRvTIIP+Gk4="; }; - cargoHash = "sha256-uero/p1ATagY6k8t6QCdfPRLeZreVrvshe3dE/M9dkg="; + cargoHash = "sha256-qfNWZmJYVKDKZ8/JIXtSWYnq4pZXmU7rXQDV117j/a0="; env.FALLBACK_INCLUDE_PATH = "${protobuf}/include"; From fab38f96a88a01b591d63a4f0d2a3c244efa725b Mon Sep 17 00:00:00 2001 From: Conor Date: Thu, 14 May 2026 20:46:40 +0100 Subject: [PATCH 39/86] python3Packages.braintree: 4.41.0 -> 4.43.0 --- .../python-modules/braintree/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 13b06a77544e..8f35bed97761 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -7,16 +7,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "braintree"; - version = "4.41.0"; + version = "4.43.0"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "braintree"; repo = "braintree_python"; - rev = version; - hash = "sha256-5rTYRzlx/XueL6vF0/kM73bgN/QjvM55ZSLIWNI8YiQ="; + tag = finalAttrs.version; + hash = "sha256-4qLi6MplXaIT8+Us3Yb9fTph74XntagBNzyS//4K5Fk="; }; build-system = [ setuptools ]; @@ -27,9 +29,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "braintree" ]; + # Most integration tests require a running Braintree gateway. enabledTestPaths = [ - "tests/" - "tests/fixtures" "tests/unit" "tests/integration/test_credentials_parser.py" ]; @@ -40,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From 0ffb7f99ba7ea607a3e31d6ccedbb59c3192ecfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 00:19:04 +0000 Subject: [PATCH 40/86] emacsPackages.ghostel: 0-unstable-2026-05-06 -> 0-unstable-2026-05-23 --- .../elisp-packages/manual-packages/ghostel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix index 1593b5d22f04..cb5454ebe303 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix @@ -13,13 +13,13 @@ let pname = "ghostel"; - version = "0-unstable-2026-05-06"; + version = "0-unstable-2026-05-23"; src = fetchFromGitHub { owner = "dakra"; repo = "ghostel"; - rev = "5bce751687f3b33978a4244a1611648bbedb7124"; - hash = "sha256-MAV3iQeriZhE9SGwVEnKs2rwebbEnPP1LiHuCAjlGE8="; + rev = "cd32af7bd6b9c827701a62ed8f0c3bc705800f13"; + hash = "sha256-5XmHI+lkzLFW8VNVC3eyc+msi6y+Qh6q6WsBZpHNEf4="; }; module = stdenv.mkDerivation (finalAttrs: { From 70c3e2179fe5c0f660dd04c5d4f9183cffd379bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 10:32:15 +0000 Subject: [PATCH 41/86] vscode-extensions.saoudrizwan.claude-dev: 3.83.0 -> 3.84.0 --- .../vscode/extensions/saoudrizwan.claude-dev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 054acad39eb7..e1b4fc361ec3 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.83.0"; - hash = "sha256-d9b8mXi/PI87T9J67yzI2yID7hhd6OPdM2+Na3I5Wg8="; + version = "3.84.0"; + hash = "sha256-j+EnHm4ucqzMgB0u5J4ki1x3YhMPWFj3/p/C95sbQH0="; }; meta = { From f5bcef8a5f8adabdc918cad576633aebfea02ace Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 12:43:06 +0000 Subject: [PATCH 42/86] inputplumber: 0.77.1 -> 0.77.2 --- pkgs/by-name/in/inputplumber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index 1025921944de..9c41fb24822c 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inputplumber"; - version = "0.77.1"; + version = "0.77.2"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-S3fyhgCNJFx9w64E/BfNh8i4nIBEFwoVLTcTFb8Escw="; + hash = "sha256-QxGDmuRTZLHBqZ+S73CtNKdLg/XumutGSpTSz4sGFYQ="; }; - cargoHash = "sha256-mnWjVM5nWkYMeRRKLsak0SZUUsVg9odjy7KFa/sldC8="; + cargoHash = "sha256-EtCK/zYRW2LdZhPSrO6ydBXBQwIrkqaJmH+3XfwERTw="; nativeBuildInputs = [ pkg-config From 8dbd5a662833bfa39bfa8355103ba9910d5d53f8 Mon Sep 17 00:00:00 2001 From: Lisanna Dettwyler Date: Sun, 24 May 2026 10:37:32 -0400 Subject: [PATCH 43/86] mpir: rearrange attrs Signed-off-by: Lisanna Dettwyler --- pkgs/by-name/mp/mpir/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mp/mpir/package.nix b/pkgs/by-name/mp/mpir/package.nix index d27c0a71aaf7..9f03e1a652c7 100644 --- a/pkgs/by-name/mp/mpir/package.nix +++ b/pkgs/by-name/mp/mpir/package.nix @@ -15,16 +15,6 @@ stdenv.mkDerivation (finalAttrs: { pname = "mpir"; version = "3.0.0"; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = [ - m4 - which - yasm - texinfo - autoreconfHook - ]; - src = fetchFromGitHub { owner = "wbhart"; repo = "mpir"; @@ -51,6 +41,16 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ + m4 + which + yasm + texinfo + autoreconfHook + ]; + configureFlags = [ "--enable-cxx" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-fat" ]; meta = { From e25a46d54dfb7f69e824f7a3be3b0607a63c5873 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 22 May 2026 22:52:01 +0200 Subject: [PATCH 44/86] python3Packages.qtile: add pytest-rerunfailures --- pkgs/development/python-modules/qtile/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index debd651e5785..cc1c02378a29 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -51,6 +51,7 @@ pytestCheckHook, pytest-asyncio, pytest-httpbin, + pytest-rerunfailures, pytest-xdist, writableTmpDirAsHomeHook, anyio, @@ -161,6 +162,11 @@ buildPythonPackage (finalAttrs: { xvfb ]; + pytestFlags = [ + "--reruns 3" + "--reruns-delay 5" + ]; + preCheck = '' export PATH=$PATH:$out/bin ''; @@ -186,12 +192,6 @@ buildPythonPackage (finalAttrs: { # Probably won't work in the Nix sandbox due to `xcffib.ConnectionException` "test_urgent_hook_fire" - - # flaky: race between force_update() executor task and widget.info() read - "test_threadpolltext_force_update" - - # flaky: race between repl server bind and client connect - "test_repl_server_executes_code" ]; passthru = { From 83b8ff5ad36094db6f339a8151cade8f01caaa0d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 22 May 2026 23:12:25 +0200 Subject: [PATCH 45/86] python3Packages.qtile: add meta.changelog --- pkgs/development/python-modules/qtile/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index cc1c02378a29..aa4f2776b5a9 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -208,6 +208,7 @@ buildPythonPackage (finalAttrs: { homepage = "http://www.qtile.org/"; license = lib.licenses.mit; description = "Small, flexible, scriptable tiling window manager written in Python"; + changelog = "https://github.com/qtile/qtile/blob/v${finalAttrs.version}/CHANGELOG"; mainProgram = "qtile"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ From f69ebe0945b17888b521aaf8abe6e704c1dac002 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 22 May 2026 23:20:41 +0200 Subject: [PATCH 46/86] python3Packages.qtile-extras: 0.35.0 -> 0.36.0 --- .../python-modules/qtile-extras/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 41646062a4c6..af7da608945f 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage (finalAttrs: { pname = "qtile-extras"; - version = "0.35.0"; + version = "0.36.0"; # nixpkgs-update: no auto update # should be updated alongside with `qtile` pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: { owner = "elParaguayo"; repo = "qtile-extras"; tag = "v${finalAttrs.version}"; - hash = "sha256-xZ1pxe1EUnnjqz+46R4R9DWKi7M2j1pgvY4uy1dBak8="; + hash = "sha256-H2A5Y+ukTkUqjQB5eQVuOMYpf7T8RgQlNlQ25wlWwr8="; }; build-system = [ setuptools-scm ]; @@ -72,8 +72,6 @@ buildPythonPackage (finalAttrs: { # AttributeError: 'NoneType' object has no attribute 'theta' "test_image_size_horizontal" "test_image_size_vertical" - # flaky, timing sensitive - "test_visualiser" ]; disabledTestPaths = [ @@ -84,6 +82,11 @@ buildPythonPackage (finalAttrs: { "test/widget/test_strava.py" ]; + pytestFlags = [ + "--reruns 3" + "--reruns-delay 5" + ]; + preCheck = '' export HOME=$(mktemp -d) export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache From 8f044283d48ab7ca8b363c1ce31670dbdd1f97eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 16:27:33 +0000 Subject: [PATCH 47/86] models-dev: 0-unstable-2026-05-19 -> 0-unstable-2026-05-23 --- pkgs/by-name/mo/models-dev/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 916eeea0a340..d8b9b9d7da57 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -8,12 +8,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2026-05-19"; + version = "0-unstable-2026-05-23"; src = fetchFromGitHub { owner = "anomalyco"; repo = "models.dev"; - rev = "db0a7cf6113f380b15e8ab21944e5de18bb30feb"; - hash = "sha256-kFskkQ5YrK7ler8s+vC5ONEjmNmOpiIKAZqoiCk97Qk="; + rev = "d497a446eb9335623904006cbe5f4ac7308a7a80"; + hash = "sha256-gS90dc6NGNJnuvQ7CAcM5DhGWqjrp0Ox59tHzQPj9R0="; }; node_modules = stdenvNoCC.mkDerivation { From fe5cea9c90b5cfbc35eb75d8e29db8ac93521f3a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 24 May 2026 18:42:21 +0200 Subject: [PATCH 48/86] workflows/periodic-merge: allow testing in forks Manually dispatching in your fork should still trigger the workflow to test. --- .github/workflows/periodic-merge-24h.yml | 2 +- .github/workflows/periodic-merge-6h.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 0455c9f5a5e1..fcd3b7ca1e6b 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -22,7 +22,7 @@ defaults: jobs: periodic-merge: - if: github.repository_owner == 'NixOS' + if: github.repository_owner == 'NixOS' || github.event_name == 'workflow_dispatch' strategy: # don't fail fast, so that all pairs are tried fail-fast: false diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index edd4cb0b2df6..ad81eb6c9a3b 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -22,7 +22,7 @@ defaults: jobs: periodic-merge: - if: github.repository_owner == 'NixOS' + if: github.repository_owner == 'NixOS' || github.event_name == 'workflow_dispatch' strategy: # don't fail fast, so that all pairs are tried fail-fast: false From 6cf2462ea8af0b0ca8478b93ee74d86d97cd6cea Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 24 May 2026 20:10:54 +0200 Subject: [PATCH 49/86] python3Packages.adax: migrate to pyproject --- pkgs/development/python-modules/adax/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adax/default.nix b/pkgs/development/python-modules/adax/default.nix index 9ba1fb50181a..34d18e08af2b 100644 --- a/pkgs/development/python-modules/adax/default.nix +++ b/pkgs/development/python-modules/adax/default.nix @@ -4,12 +4,13 @@ async-timeout, buildPythonPackage, fetchFromGitHub, + setuptools, }: buildPythonPackage rec { pname = "adax"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; @@ -18,7 +19,9 @@ buildPythonPackage rec { hash = "sha256-wmcZtiML02i1XfqpFzni2WDrxutTvP5laVvTAGtNg0Y="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp async-timeout ]; From b7cc9fe261df4d188de79e887469ca5685ebf6e7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 24 May 2026 20:11:20 +0200 Subject: [PATCH 50/86] python3Packages.adax: use finalAttrs --- pkgs/development/python-modules/adax/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/adax/default.nix b/pkgs/development/python-modules/adax/default.nix index 34d18e08af2b..f49ba99fd73f 100644 --- a/pkgs/development/python-modules/adax/default.nix +++ b/pkgs/development/python-modules/adax/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "adax"; version = "0.4.0"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyadax"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wmcZtiML02i1XfqpFzni2WDrxutTvP5laVvTAGtNg0Y="; }; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Python module to communicate with Adax"; homepage = "https://github.com/Danielhiversen/pyAdax"; - changelog = "https://github.com/Danielhiversen/pyAdax/releases/tag/${version}"; + changelog = "https://github.com/Danielhiversen/pyAdax/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From c3f5cdce56a557b6949164178635b12adfc92d23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 18:52:53 +0000 Subject: [PATCH 51/86] dotenvx: 1.66.0 -> 1.68.0 --- pkgs/by-name/do/dotenvx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index 1fa120250a5a..880bfbbab67e 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "dotenvx"; - version = "1.66.0"; + version = "1.68.0"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${finalAttrs.version}"; - hash = "sha256-dW/7dD24zCyGwKf6QDtT6WRglHJwJwI+peiPdmdxoOQ="; + hash = "sha256-w2AljviPNkXC+f4x3QEuR9FSkg0Dy+zYqVPrSWjbrDU="; }; - npmDepsHash = "sha256-jDqlcRMU2nzL4l1N/cFhYFpXOur9+RH4JFb7Sgdd7wU="; + npmDepsHash = "sha256-l9nRDYg7mrgF2GAYbQgoes0VzpTGAn9TMHrmWjvZnMY="; dontNpmBuild = true; From f8a361aa03318eef717f5b3cd4eedd2e12b9bcdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 19:20:17 +0000 Subject: [PATCH 52/86] proxelar: 0.4.4 -> 0.4.5 --- pkgs/by-name/pr/proxelar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/proxelar/package.nix b/pkgs/by-name/pr/proxelar/package.nix index 96548c6c3c08..8e88bee7ae56 100644 --- a/pkgs/by-name/pr/proxelar/package.nix +++ b/pkgs/by-name/pr/proxelar/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "proxelar"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "emanuele-em"; repo = "proxelar"; tag = "v${finalAttrs.version}"; - hash = "sha256-dUz20mk9ghUyCRuxkEpjjibhDMk7kAezZxGPadQhhM0="; + hash = "sha256-/uRvk0bUkDtxpNEKLOgh8J1V2+xaTxAHZdrXTnLApFM="; }; - cargoHash = "sha256-Jc6NExi2BUs1Hoia4MyDouj/LUO9tCRN0Pu2/32uG7c="; + cargoHash = "sha256-j94fVzAJa/4B4et98LowZmbKwAy9eZ/qhfKjZ9p/9NI="; __structuredAttrs = true; From dd2a2c38633954e0a60ae7c48b08bc5f126070a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 20:36:52 +0000 Subject: [PATCH 53/86] pkgsite: 0-unstable-2026-05-14 -> 0-unstable-2026-05-22 --- pkgs/by-name/pk/pkgsite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 92c658dfed26..03a9e753c225 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2026-05-14"; + version = "0-unstable-2026-05-22"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "a5fcada8aa006fec3698037f4702e66122994e6c"; - hash = "sha256-kY3uXHsXDYRml4mZAZaFK95BDju92cmMZ4XoSNoNquo="; + rev = "866fa310855a76cf898838dac1cc56850e15cca6"; + hash = "sha256-zhBJ7sYXyzK9Rs2qA9CziIG50cCZ88a/msKzqIQIlJM="; }; vendorHash = "sha256-A5gfYxgbq+5WG4W642fhRHw78oWGOrI+OyJ66W/gl00="; From 5b18b0edf249ce42162a668842c295b371b57eec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 May 2026 22:55:51 +0200 Subject: [PATCH 54/86] python3Packages.aiovodafone: 3.2.0 -> 3.3.0 Diff: https://github.com/chemelli74/aiovodafone/compare/v3.2.0...v3.3.0 Changelog: https://github.com/chemelli74/aiovodafone/blob/v3.3.0/CHANGELOG.md --- .../development/python-modules/aiovodafone/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index cb4b5a5beffc..d2484c3b03b6 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -3,35 +3,33 @@ aiohttp, beautifulsoup4, buildPythonPackage, - colorlog, cryptography, fetchFromGitHub, orjson, - poetry-core, pycryptodome, pytest-cov-stub, pytestCheckHook, segno, + setuptools, }: buildPythonPackage (finalAttrs: { pname = "aiovodafone"; - version = "3.2.0"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "chemelli74"; repo = "aiovodafone"; tag = "v${finalAttrs.version}"; - hash = "sha256-CZz/rRRgZwP7gowYORkt8j99mU0CMgOX+M1JExvFNDI="; + hash = "sha256-KKd8dOabm/6YksBG6+51zYUsgiA4wFW6dGe2tiX3fQA="; }; - build-system = [ poetry-core ]; + build-system = [ setuptools ]; dependencies = [ aiohttp beautifulsoup4 - colorlog cryptography orjson pycryptodome From 7b9d80ef9581c6870cdd4b398ac3ea3683dcfc1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 21:04:55 +0000 Subject: [PATCH 55/86] seconlay: 0-unstable-2026-04-30 -> 0-unstable-2026-05-21 --- pkgs/by-name/se/seconlay/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/seconlay/package.nix b/pkgs/by-name/se/seconlay/package.nix index 96f91cf3e929..405a92cad0f3 100644 --- a/pkgs/by-name/se/seconlay/package.nix +++ b/pkgs/by-name/se/seconlay/package.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "seconlay"; - version = "0-unstable-2026-04-30"; + version = "0-unstable-2026-05-21"; src = fetchFromGitLab { group = "alasca.cloud"; owner = "scl"; repo = "scl-management"; - rev = "a2020efbbc950d037e17a3ae8d628e3205a80447"; - hash = "sha256-/m2HUdyT/euFVvWPZAHjPGsBH9XeUMuNGlfJFfH/A8Y="; + rev = "3ebeeda26e919750790c24899320ac1f6ba82904"; + hash = "sha256-+erlSKH8FBG2Ncpn6D61itTiB2IhbMefgO7EZ7NgZa8="; }; cargoHash = "sha256-pb9xqdgWrf8Lc10jSkkDb/1n0e15fMQ3AcKNPw6/vi8="; From d50bf01a684e92a24388ded29a572374cbf9add4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 21:24:10 +0000 Subject: [PATCH 56/86] python3Packages.agent-client-protocol: 0.10.0 -> 0.10.1 --- .../python-modules/agent-client-protocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agent-client-protocol/default.nix b/pkgs/development/python-modules/agent-client-protocol/default.nix index 043585007409..a4c117d13d6a 100644 --- a/pkgs/development/python-modules/agent-client-protocol/default.nix +++ b/pkgs/development/python-modules/agent-client-protocol/default.nix @@ -19,7 +19,7 @@ buildPythonPackage (finalAttrs: { pname = "agent-client-protocol"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; __structuredAttrs = true; @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { owner = "agentclientprotocol"; repo = "python-sdk"; tag = finalAttrs.version; - hash = "sha256-JndUYT3oimoDs6WDA4ixhNCZnswUAZA4nab5DT1xpbQ="; + hash = "sha256-iVmNzAx/YlvFXXVPjS1SmjDqGAr9aRDdSW93Nw2ayAY="; }; build-system = [ From 86664a0f9d2e9d1bea083563a5fe0e15a38df82f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 21:59:04 +0000 Subject: [PATCH 57/86] androidStudioPackages.canary: 2026.1.1.5 -> 2026.1.2.2 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 6ca61b10e027..992d0e3a410a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -26,9 +26,9 @@ let url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.5/android-studio-panda4-rc1-linux.tar.gz"; }; latestVersion = { - version = "2026.1.1.5"; # "Android Studio Quail 1 | 2026.1.1 Canary 5" - sha256Hash = "sha256-k4rM0MyTh0wnpsK8m6Hs1nSdwYpqUiQ+z7oiO6hn9YQ="; - url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.5/android-studio-quail1-canary5-linux.tar.gz"; + version = "2026.1.2.2"; # "Android Studio Quail 2 | 2026.1.2 Canary 2" + sha256Hash = "sha256-+FmW72k48GF71yzCdpIAl//qi6w26Qg8gZUW5/Nuh58="; + url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.2/android-studio-quail2-canary2-linux.tar.gz"; }; in { From 543917695099481eb55573957591114d619e3547 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 22 May 2026 23:45:53 +0200 Subject: [PATCH 58/86] workflows/periodic-merge: update haskell-updates PR's base branch This gives us better UI in the PR by hiding the commits that are already on the base branch (mostly staging) after the periodic merge. Without this, the PR has 100s of commits listed after a few days. --- .github/workflows/periodic-merge-24h.yml | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index fcd3b7ca1e6b..34282fb2c8f9 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -49,3 +49,34 @@ jobs: name: ${{ matrix.pairs.name || format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }} secrets: NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} + + # Resets the target branch of the current haskell-updates PR. + # This makes GitHub hide all the commits that are already part of staging and gives us a much clearer PR view. + haskell-updates: + needs: periodic-merge + runs-on: ubuntu-slim + permissions: + pull-requests: write + steps: + - name: Find PR and update target branch + uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 + with: + script: | + // There will at most be a single haskell-updates PR anyway, so no need to paginate. + await Promise.all( + ( + await github.rest.pulls.list({ + ...context.repo, + state: 'open', + head: `${context.repo.owner}:haskell-updates`, + }) + ).data.map((pr) => + github.rest.pulls.update({ + ...context.repo, + pull_number: pr.number, + // Just updating to the same branch to trigger a UI update. + // This is staging most of the time, but could be staging-next in rare cases. + base: pr.base.ref, + }), + ), + ) From daeb5131edef2f486b90eb575e1b89eedd0e8538 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 22:34:42 +0000 Subject: [PATCH 59/86] boring: 0.13.0 -> 0.14.0 --- pkgs/by-name/bo/boring/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/boring/package.nix b/pkgs/by-name/bo/boring/package.nix index 88287523f087..42ecfdb879cd 100644 --- a/pkgs/by-name/bo/boring/package.nix +++ b/pkgs/by-name/bo/boring/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "boring"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "alebeck"; repo = "boring"; tag = "v${finalAttrs.version}"; - hash = "sha256-9ei2Kl2590DY0S9jrc+MxsL5srxmwx8wD6uFlVQ6o4o="; + hash = "sha256-cyRy7lF2wGupzDnW4zPKEuM0X0aaHrWbF/3p13xb2DA="; }; nativeBuildInputs = [ From 870e80f0b41cc13d82f9678f499ef738c1980009 Mon Sep 17 00:00:00 2001 From: airone01 Date: Mon, 25 May 2026 00:48:03 +0200 Subject: [PATCH 60/86] wlroots_0_20: 0.20.0 -> 0.20.1 Diff: https://gitlab.freedesktop.org/wlroots/wlroots/-/compare/0.20.0...0.20.1 Changelog: https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/0.20.1 --- pkgs/development/libraries/wlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 2970b864faa2..c6090a770a7a 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -168,7 +168,7 @@ in }; wlroots_0_20 = generic { - version = "0.20.0"; - hash = "sha256-hVJlJiJK6+9RkgkmQzUzb8ypVMqsNhbQG6KfeCvxtb0="; + version = "0.20.1"; + hash = "sha256-uuc1dn13FXvFSBvE3+QOi35rLJZmWIUst64oaXGdPFk="; }; } From bea3dfef20b6e057780295c8d0b4ffd398bdd67e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 22:56:04 +0000 Subject: [PATCH 61/86] ncspot: 1.3.3 -> 1.3.4 --- pkgs/by-name/nc/ncspot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix index 6ea05bc88c3b..f904d3326345 100644 --- a/pkgs/by-name/nc/ncspot/package.nix +++ b/pkgs/by-name/nc/ncspot/package.nix @@ -32,16 +32,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ncspot"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; tag = "v${finalAttrs.version}"; - hash = "sha256-U2uadZzC38pZf4For6Nyo91IXr9XqNSU6B+gpuTZJQo="; + hash = "sha256-QQeiVmMRF5ql2GVR5nopKtBrTAP8K1Rjs/B89+Azg5s="; }; - cargoHash = "sha256-ny1vGZSUHxjUZb/nxu2SXP1gimPlPBUejAjiqPpe+CM="; + cargoHash = "sha256-u6T5zaeN+rmTH5eM7Inpw/EZh48RauhhVhnAmUMYFIc="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; From 31b69d41656ce76c17fe47bd5f6aa9cf84921891 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 23:01:29 +0000 Subject: [PATCH 62/86] qownnotes: 26.5.12 -> 26.5.15 --- pkgs/by-name/qo/qownnotes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index eb7f47336afb..5e1702855d80 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "26.5.12"; + version = "26.5.15"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-xb7bRcqxO51u3ZDxIlPaK7rUxsl2W5+81u8OLPFSgPs="; + hash = "sha256-Hx/OMImjjMdQLl5bhp3tQ+tDQjbEkptQjHavj7An4c0="; }; nativeBuildInputs = [ From f533f85387d48c31290b28b014699959330dbe36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 23:09:16 +0000 Subject: [PATCH 63/86] field-monitor: 50.0 -> 50.1 --- pkgs/by-name/fi/field-monitor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/field-monitor/package.nix b/pkgs/by-name/fi/field-monitor/package.nix index 8c9e1cb9330d..79efb70f57cb 100644 --- a/pkgs/by-name/fi/field-monitor/package.nix +++ b/pkgs/by-name/fi/field-monitor/package.nix @@ -34,7 +34,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "field-monitor"; - version = "50.0"; + version = "50.1"; strictDeps = true; @@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "theCapypara"; repo = "field-monitor"; tag = "v${finalAttrs.version}"; - hash = "sha256-IVHzMUjjVZHDTI6Jjq7i8wrENPerKzEiDT15otPFx9A="; + hash = "sha256-waMa70oLKvIoljvE+MjWWKVL1Cd0xnasVeB17tfMQW8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-c4ANjQ1OoDMMifAUpU8iNE9lSBamAR+XbEmYrYphixU="; + hash = "sha256-fsrczFhoIilxgZRH2PVXC67YdkMsIjA6zTfix57TTzo="; }; mesonBuildType = "release"; From 24e8d730ef4adac7727652e666cbf9dce4d21d03 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 25 May 2026 01:25:39 +0200 Subject: [PATCH 64/86] voicevox-engine: fix build by disabling failing test --- pkgs/by-name/vo/voicevox-engine/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix index 41466c761e90..7f9aa888b195 100644 --- a/pkgs/by-name/vo/voicevox-engine/package.nix +++ b/pkgs/by-name/vo/voicevox-engine/package.nix @@ -97,6 +97,11 @@ python3Packages.buildPythonApplication (finalAttrs: { httpx ]; + disabledTests = [ + # test expects an exact response, but OpenAPI is returning something a tiny bit different + "test_OpenAPIの形が変わっていないことを確認" + ]; + passthru = { resources = fetchFromGitHub { name = "voicevox-resource-${finalAttrs.version}"; # this contains ${version} to invalidate the hash upon updating the package From c51c7b418b0aa85752f7237bdcf8f8bcaa6ac660 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 00:17:58 +0000 Subject: [PATCH 65/86] terraform-providers.bpg_proxmox: 0.106.0 -> 0.107.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a5292ca19e58..514002865e10 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-RgyPVv3CWHgArDjmcz46j578hgleHFQ81MJ5OUWXnBk=", + "hash": "sha256-eOllsoXIHOym4pn2pBh5Air5eDvgvppVcnw+FfxRet4=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.106.0", + "rev": "v0.107.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-AxXZRn2D6iEIG6p00KGQi1kMkt2F/ZyeBsXHR345wag=" + "vendorHash": "sha256-IbxQVfNvMiXGMkrNQoSBQW3VemK9NW8zs8o1epTZydE=" }, "brightbox_brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", From 4e0483d6540f93675d7ce1bc4946dbf3110e62c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 00:37:18 +0000 Subject: [PATCH 66/86] python3Packages.beaupy: 3.11.0 -> 3.12.0 --- pkgs/development/python-modules/beaupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beaupy/default.nix b/pkgs/development/python-modules/beaupy/default.nix index a256721c82e4..791e11f27505 100644 --- a/pkgs/development/python-modules/beaupy/default.nix +++ b/pkgs/development/python-modules/beaupy/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "beaupy"; - version = "3.11.0"; + version = "3.12.0"; pyproject = true; src = fetchFromGitHub { owner = "petereon"; repo = "beaupy"; rev = "v${version}"; - hash = "sha256-EQekSvjhL2qVQTjbdv4OqYMRUXrS9VzAIWiDjGdy3Rc="; + hash = "sha256-9iJZFOtQ6UTc8i4cN4soEG0SLcljenAQwq0wfK6r/Rw="; }; build-system = [ From e69efbba6936d58b579596d0d996e8e5056f41b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 May 2026 02:42:19 +0200 Subject: [PATCH 67/86] esphome: 2026.5.0 -> 2026.5.1 https://github.com/esphome/esphome/releases/tag/2026.5.1 --- pkgs/by-name/es/esphome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 248875cd35d1..13ac763dd27b 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -33,14 +33,14 @@ let in python.pkgs.buildPythonApplication (finalAttrs: { pname = "esphome"; - version = "2026.5.0"; + version = "2026.5.1"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = finalAttrs.version; - hash = "sha256-oWlzpBzDOSrXv+gOnFSL7TQqDZJc3oN2RoAW2ywFCGo="; + hash = "sha256-faW44FhAymqGQG4khAUEcv6QoAn49KPSghi3YcXttNk="; }; patches = [ From 246b0d213592c846e31a626b5b4b571bc605f8a6 Mon Sep 17 00:00:00 2001 From: daspk04 Date: Sun, 24 May 2026 20:00:10 -0500 Subject: [PATCH 68/86] python3Packages.geoarrow-rust: fix the failing tests --- .../python-modules/geoarrow-rust/default.nix | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/geoarrow-rust/default.nix b/pkgs/development/python-modules/geoarrow-rust/default.nix index f7c5413a6fc4..26cc88a89d86 100644 --- a/pkgs/development/python-modules/geoarrow-rust/default.nix +++ b/pkgs/development/python-modules/geoarrow-rust/default.nix @@ -5,11 +5,21 @@ rustPlatform, pytestCheckHook, arro3-core, + obstore, + + # tests pyarrow, pyproj, numpy, pandas, geoarrow-types, + geopandas, + geodatasets, + shapely, + pyogrio, + pytest-asyncio, + arro3-io, + arro3-compute, }: let version = "0.6.1"; @@ -101,6 +111,7 @@ let dependencies = [ arro3-core pyproj + obstore ]; }; @@ -114,15 +125,39 @@ let nativeCheckInputs = [ pytestCheckHook + pytest-asyncio geoarrow-types pandas pyarrow numpy + geopandas + geodatasets + shapely + pyogrio + obstore + arro3-io + arro3-compute geoarrow-rust-core geoarrow-rust-io ]; - pytestFlags = [ "python" ]; + # use the latest test folder (skips the tests_old folder) + pytestFlags = [ "python/tests" ]; + + disabledTests = [ + # require internet access to download datasets + "test_parse_nybb" + "test_parse_nybb_chunked" + "test_getitem" + "test_geo_interface_polygon" + "test_parquet_file" + ]; + + # fix the directory name, as it is named as source for nix build + postPatch = '' + substituteInPlace python/tests/utils.py \ + --replace-fail 'while current_dir.stem != "geoarrow-rs":' 'while current_dir.stem != "source":' + ''; }; in { From 37249a0a29082516dd32312067e0be1cb59d04df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 May 2026 10:03:44 -0700 Subject: [PATCH 69/86] authentik: 2025.12.4 -> 2025.12.5 Diff: https://github.com/goauthentik/authentik/compare/version/2025.12.4...version/2025.12.5 Changelog: https://github.com/goauthentik/authentik/releases/tag/version%2F2025.12.5 --- pkgs/by-name/au/authentik/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 680c719f0f06..ac0f05e63f4a 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -20,13 +20,13 @@ let nodejs = nodejs_24; - version = "2025.12.4"; + version = "2025.12.5"; src = fetchFromGitHub { owner = "goauthentik"; repo = "authentik"; tag = "version/${version}"; - hash = "sha256-alTyrMBbjZbw4jhEna8saabf93sqSrZCu+Z5xH3pZ7M="; + hash = "sha256-LPGAhbtmuztDQ4CVhUXb+vBU5HjvNZ7JicI5r3lr1QQ="; }; meta = { @@ -52,7 +52,7 @@ let src = fetchFromGitHub { owner = "goauthentik"; repo = "client-go"; - tag = "v3.${version}"; + tag = "v3.2025.12.4"; hash = "sha256-+/CfOE2HkBU+ZddvdXGenB/z8xNFk8cujpZpMXyh3cY="; }; @@ -137,8 +137,8 @@ let outputHash = { - "aarch64-linux" = "sha256-GL5FPIBnoEXYtw8DPJpRPe3tT3qioN4AdoeOmCoiYsM="; - "x86_64-linux" = "sha256-AnceTipq6uUvTbOAZanVshAbAJ9LS1kwImbttTOcWxc="; + "aarch64-linux" = "sha256-smm9x29z7gOI7Wq0NvP45KHtBbT6p1lH6IjEf9LRuGs="; + "x86_64-linux" = "sha256-K86wnn50svP+QG3i0mggH8RQgfoIqEmyQTouz35xzw8="; } .${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform"); @@ -208,8 +208,8 @@ let outputHash = { - "aarch64-linux" = "sha256-eZZ5Ynj81KwFsU5emPtYZ2CxO8MFvWbJnCHs+L88KQQ="; - "x86_64-linux" = "sha256-yUAyyO1NFav1EptrRYGSzC8dxCxYVj0FmzHk8IckFZM="; + "aarch64-linux" = "sha256-J9wGQe7iMfKznNk3woqi0VNVNA/dE6TGi2f44DOlG1c="; + "x86_64-linux" = "sha256-9Q590Rw0mk3q5osxOKGWU7+XtKwkTyA+CLC2LxAA/3g="; } .${stdenvNoCC.hostPlatform.system} or (throw "authentik-webui-deps: unsupported host platform"); outputHashMode = "recursive"; From 9032d1d976934df487e56ebcd5c59d3d626e1235 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 01:35:41 +0000 Subject: [PATCH 70/86] tmux-sessionizer: 0.5.0 -> 0.6.0 --- pkgs/by-name/tm/tmux-sessionizer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix index babf4f711d14..daf97c4e2ba2 100644 --- a/pkgs/by-name/tm/tmux-sessionizer/package.nix +++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "tmux-sessionizer"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "jrmoulton"; repo = "tmux-sessionizer"; rev = "v${finalAttrs.version}"; - hash = "sha256-6eMKwp5639DIyhM6OD+db7jr4uF34JSt0Xg+lpyIPSI="; + hash = "sha256-tJ8aKajSWc62BZ8hb3u+OQtlu04z8Ala5nAK5H4Byp4="; }; - cargoHash = "sha256-gIsqHbCmfYs1c3LPNbE4zLVjzU3GJ4MeHMt0DC5sS3c="; + cargoHash = "sha256-AJqlzLr6MDFfPssSFMxslxFFuPVxoQGcuG7sZeu+8pg="; nativeInstallCheckInputs = [ versionCheckHook From 3fb9f6e816be914ce970e35ddf8d7ecafebf39f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 02:24:12 +0000 Subject: [PATCH 71/86] kirimoto: 4.6.3 -> 4.7.0 --- pkgs/by-name/ki/kirimoto/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ki/kirimoto/package.nix b/pkgs/by-name/ki/kirimoto/package.nix index 47f70c734141..608466b56362 100644 --- a/pkgs/by-name/ki/kirimoto/package.nix +++ b/pkgs/by-name/ki/kirimoto/package.nix @@ -5,12 +5,12 @@ }: let - version = "4.6.3"; + version = "4.7.0"; pname = "kirimoto"; src = fetchurl { url = "https://github.com/GridSpace/grid-apps/releases/download/${version}/KiriMoto-linux-x86_64.AppImage"; - hash = "sha256-YCfDCR92xtwL3634iIMYf6IjkeqoWrF7/YNCwKSjnfs=="; + hash = "sha256-bLeGDZzAzBVC4tTwcC8uDngqOEeJ/vyTJGre+EovOgs="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 1609924c67382e435b48a9070b753a71d2ace824 Mon Sep 17 00:00:00 2001 From: crertel Date: Sun, 24 May 2026 21:22:42 -0500 Subject: [PATCH 72/86] lmstudio: 0.4.13.1 -> 0.4.14.4 --- pkgs/by-name/lm/lmstudio/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 74b61d9b83a2..39b4bd8c9719 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,12 +7,12 @@ let pname = "lmstudio"; - version_aarch64-linux = "0.4.13-1"; - hash_aarch64-linux = "sha256-3Z+wt8H8QdFiz190Pa+33fkKHf1Df7nzWoUNYz2TrYw="; - version_aarch64-darwin = "0.4.13-1"; - hash_aarch64-darwin = "sha256-cj1KqM55iyJzg7O6SuQmUn2RHUZpE9fzljft8tYWHUE="; - version_x86_64-linux = "0.4.13-1"; - hash_x86_64-linux = "sha256-IHhqAsYVi1XCaryxrEyhakDyye2vehbsJ77eF68KaIg="; + version_aarch64-linux = "0.4.14-4"; + hash_aarch64-linux = "sha256-mlPeSTPUVJ8C7zheuX7ZJnDFQtg9oTg/LBqXJrbPfMs="; + version_aarch64-darwin = "0.4.14-4"; + hash_aarch64-darwin = "sha256-9Kcj+IA5DhJuxSetKCHCPJ5GECCpnjnZlYPXD9jafy0="; + version_x86_64-linux = "0.4.14-4"; + hash_x86_64-linux = "sha256-oDPL/m1Ghutxmi3iumsy2/Hs6Bp8UDWsJeup1Vlu/i8="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; From 5ecad0cc923c12cb633735c28719c457006631f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 02:40:36 +0000 Subject: [PATCH 73/86] qt6Packages.qtutilities: 6.21.1 -> 6.21.2 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index b6936066357b..9e1692bf2001 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.21.1"; + version = "6.21.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-kZ9Iql4QRxxm/NUPKFMMqYlAMV3zsHWzyaSH7k//Bnw="; + hash = "sha256-pPCXhk6ujIu+TmxeLP8FPkHopjhy0dVUj/kR9yXxmrc="; }; nativeBuildInputs = [ From 026adadbdb1e37e506ed6dc0f4ebc73a7c964385 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 02:51:30 +0000 Subject: [PATCH 74/86] syncthingtray: 2.1.0 -> 2.1.1 --- pkgs/by-name/sy/syncthingtray/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/syncthingtray/package.nix b/pkgs/by-name/sy/syncthingtray/package.nix index f7d020a004e9..f72a01abf46b 100644 --- a/pkgs/by-name/sy/syncthingtray/package.nix +++ b/pkgs/by-name/sy/syncthingtray/package.nix @@ -27,14 +27,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.1.0"; + version = "2.1.1"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-trmNK6lyKL6zNcL/FKELkLOJK9vVpFcS3uGMeMrlpPI="; + hash = "sha256-JaekoeY9owh9GNR2f26Po5BoNu+sTvLPfvn/O0VBEdM="; }; buildInputs = [ From 15c65151bbe6e4295c7197884fe6d3960fad4afa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 04:25:21 +0000 Subject: [PATCH 75/86] icm: 0.10.49 -> 0.10.50 --- pkgs/by-name/ic/icm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ic/icm/package.nix b/pkgs/by-name/ic/icm/package.nix index 65a8df3cb152..15a9f5957d4d 100644 --- a/pkgs/by-name/ic/icm/package.nix +++ b/pkgs/by-name/ic/icm/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "icm"; - version = "0.10.49"; + version = "0.10.50"; __structuredAttrs = true; src = fetchFromGitHub { owner = "rtk-ai"; repo = "icm"; tag = "icm-v${finalAttrs.version}"; - hash = "sha256-GB2SH/Y2l4AkxoFqJfWcsGmWK4uOayCs1FSxBuXShwc="; + hash = "sha256-zaKpKMVH2vzUk0ryWupE4ByqqcmAdJwAe5ybb2TNlvM="; }; - cargoHash = "sha256-U0mHWzRI6BDVC4LRpwWz/QbCeT0fEPxKoY5+1DrI048="; + cargoHash = "sha256-5NcmFaRqDla2ei694fJiqNr5n4V3A/ai3/9fzBHNa3s="; nativeBuildInputs = [ pkg-config From 090c54a9cddb43f290a47c249fc616ac3d750cd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 04:47:30 +0000 Subject: [PATCH 76/86] zerofs: 1.1.7 -> 1.1.10 --- pkgs/by-name/ze/zerofs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix index 918cf70b30ea..bb66b5b3d286 100644 --- a/pkgs/by-name/ze/zerofs/package.nix +++ b/pkgs/by-name/ze/zerofs/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zerofs"; - version = "1.1.7"; + version = "1.1.10"; src = fetchFromGitHub { owner = "Barre"; repo = "ZeroFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-DNdSrDlknZhUG7yQ5ckBcCJFktguDG1qfOtRz3MMmG4="; + hash = "sha256-1nCtfFxIH0DJCNSTcUlxkxqyLONualGMKfcVZP5b24Q="; }; sourceRoot = "${finalAttrs.src.name}/zerofs"; - cargoHash = "sha256-rS40vg3x+tWhlPv3KfK0mpoUeYa5O9QpTxuZm2IYZ3k="; + cargoHash = "sha256-vbiRllYMRVufwNPA987keP0MJK+DRms6TnSA8UAn+Bw="; nativeBuildInputs = [ cmake ]; From 9a1419dce076c18b427ac661b11fb7a61d58dd32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 05:06:45 +0000 Subject: [PATCH 77/86] python3Packages.pytest-resource-path: 1.4.1 -> 1.5.0 --- .../python-modules/pytest-resource-path/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix index 811bb87e5968..9ed070b1cd50 100644 --- a/pkgs/development/python-modules/pytest-resource-path/default.nix +++ b/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-resource-path"; - version = "1.4.1"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "yukihiko-shinoda"; repo = "pytest-resource-path"; tag = "v${version}"; - hash = "sha256-f0jN6V6tQRbr/DHOKKTrFCb1EBUUxZAQRckMy2iiVqI="; + hash = "sha256-Y/mB5Gmkt3Rt8rRBOFZrWIREnpEiSxf/MChqymXDNws="; }; build-system = [ setuptools ]; From efb08822315f6379561452f75f4638535388085e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 05:12:24 +0000 Subject: [PATCH 78/86] libretro.mame2003: 0-unstable-2026-04-02 -> 0-unstable-2026-05-22 --- pkgs/applications/emulators/libretro/cores/mame2003.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/applications/emulators/libretro/cores/mame2003.nix index d947317539dd..27de92ea2e6e 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003"; - version = "0-unstable-2026-04-02"; + version = "0-unstable-2026-05-22"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-libretro"; - rev = "c651c573655218428d7c524f611f7d62d13861a1"; - hash = "sha256-7tAmLBClwM6gMILiWN3cIl452EX0JVFtTSEdxPoRs/4="; + rev = "099c2ef21c67c463a97b9ab19403e58b31c69740"; + hash = "sha256-D3/d/TzTjK0t4bh6Il9CMfHTHdYgMsQNE52PxjrXeyE="; }; # Fix build with GCC 14 From 4c40a7718de02e7e426e2eb33e66bd85d4eefff5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 05:58:33 +0000 Subject: [PATCH 79/86] terraform-providers.scaleway_scaleway: 2.74.0 -> 2.75.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cc9d93777f6e..bf2997a5f20d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1184,13 +1184,13 @@ "vendorHash": "sha256-w/AmSHydCeyp/EURgPY2c/E2LjqAXXCORI53X1hEdxY=" }, "scaleway_scaleway": { - "hash": "sha256-daBVjUAmFbi5MlrroyVggXOr3i6dIfG8gT9+P8+GsIg=", + "hash": "sha256-79oqPfnfX1jFDM9hSXqGF1r3B6S0JEj2+6whxLEmq+Q=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.74.0", + "rev": "v2.75.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-MlhvbUewtVvfqM0aNM9VWmha30hoXLvCG9E3o8dsH4s=" + "vendorHash": "sha256-GwOKy2H06s+byyb0k4lta30lfAVmLSbEcyyQm0giw1E=" }, "scottwinkler_shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", From be347c722d51698721369bc4b388d0820d7e8ab8 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 15 May 2026 21:07:11 -0700 Subject: [PATCH 80/86] dwarf-fortress: 53.11 -> 53.14 --- pkgs/games/dwarf-fortress/df.lock.json | 18 +++++++++--------- .../dwarf-fortress/dwarf-therapist/wrapper.nix | 2 +- pkgs/games/dwarf-fortress/wrapper/default.nix | 6 +++--- .../dwarf-fortress/wrapper/dwarf-fortress.in | 8 ++++++++ 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json index 534cc66f4a90..8ae54a7a5936 100644 --- a/pkgs/games/dwarf-fortress/df.lock.json +++ b/pkgs/games/dwarf-fortress/df.lock.json @@ -1,28 +1,28 @@ { "game": { "latest": { - "linux": "53.11", + "linux": "53.14", "darwin": "0.47.05" }, "versions": { - "53.11": { + "53.14": { "df": { - "version": "53.11", + "version": "53.14", "urls": { "linux": { - "url": "https://www.bay12games.com/dwarves/df_53_11_linux.tar.bz2", - "outputHash": "sha256-Ss1SHsLr3V9aMWptIpd6PTO9ZmqPZiR8P97vNRBuLZs=" + "url": "https://www.bay12games.com/dwarves/df_53_14_linux.tar.bz2", + "outputHash": "sha256-ZU/va7bblzh5UuPuuctjUHzEmcFLtzjXp9R86UV+G9k=" } } }, "hack": { - "version": "53.11-r1", + "version": "53.14-r2", "git": { "url": "https://github.com/DFHack/dfhack.git", - "revision": "53.11-r1", - "outputHash": "sha256-w2yfR9kOw13Ag3wxEHMXI9tVZMUwfgUWmrSVD1ViU4U=" + "revision": "53.14-r2", + "outputHash": "sha256-UOmp84VoY/pam99T2ktAYH3N3cFMSIb9v8KOTZCof8U=" }, - "xmlRev": "d79288374802cc63b1507900030b32231ffd244b" + "xmlRev": "01aae95cacd98850e4f477c45a4b75f800bacecc" } }, "52.05": { diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 8abe6f904479..7fc0ecc31643 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { echo "It doesn't support DF $dfVersion out of the box, so we're doing it the hard way." export HOME="$(mktemp -dt dfhack.XXXXXX)" export XDG_DATA_HOME="$HOME/.local/share" - expect ${dfHackExpectScript} + expect ${dfHackExpectScript} | tr -d '\r' local ini="$XDG_DATA_HOME/df_linux/therapist.ini" if [ -f "$ini" ]; then if grep -q "$patched_md5" "$ini"; then diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index eb3970b35867..e7b7e655730d 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -281,18 +281,18 @@ lib.throwIf (enableTWBT' && !enableDFHack) "dwarf-fortress: TWBT requires DFHack export HOME="$(mktemp -dt dwarf-fortress.XXXXXX)" '' + lib.optionalString enableDFHack '' - expect ${dfHackExpectScript} + expect ${dfHackExpectScript} | tr -d '\r' df_home="$(find ~ -name "df_*" | head -n1)" test -f "$df_home/dfhack" '' + lib.optionalString isAtLeast50 '' - expect ${vanillaExpectScript true} + expect ${vanillaExpectScript true} | tr -d '\r' df_home="$(find ~ -name "df_*" | head -n1)" test ! -f "$df_home/dfhack" test -f "$df_home/libfmod_plugin.so" '' + '' - expect ${vanillaExpectScript false} + expect ${vanillaExpectScript false} | tr -d '\r' df_home="$(find ~ -name "df_*" | head -n1)" test ! -f "$df_home/dfhack" test ! -f "$df_home/libfmod_plugin.so" diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in index 484dd16ad275..fd94d84be373 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in +++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in @@ -37,11 +37,19 @@ dfhack_files=( libdfhooks.so dfhack-config/default dfhack-config/init + dfhooks_*.ini hack/* stonesense/* *.init *.init-example ) +# May be stale top-level libdfhooks_*.so symlinks in $NIXPKGS_DF_HOME, fix them +shopt -s nullglob +for stale in "$NIXPKGS_DF_HOME"/libdfhooks_*.so; do + dfhack_files+=( "${stale##*/}" ) +done +shopt -u nullglob + if [ "${NIXPKGS_DF_EXE##*/}" == dfhack ]; then for i in "${dfhack_files[@]}"; do if [ -e "$i" ]; then From 88aa5af92363220a9a1de131c75b608c8d3ae1b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 07:05:03 +0000 Subject: [PATCH 81/86] python3Packages.disposable-email-domains: 0.0.181 -> 0.0.188 --- .../python-modules/disposable-email-domains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index 702461222ff4..479d579f46cb 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "disposable-email-domains"; - version = "0.0.181"; + version = "0.0.188"; pyproject = true; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "disposable_email_domains"; inherit (finalAttrs) version; - hash = "sha256-BtW0MXgFTphae3O5XPDnix8RTKDx/tvzpTN4znZjFSI="; + hash = "sha256-CRSFrSo7wSUIBY3l/n5Uf3wM0AwbrxRiELepz0NWOXQ="; }; build-system = [ From 30575c536be8237607e568c4e8236a20e3c2f78f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 25 May 2026 07:20:52 +0000 Subject: [PATCH 82/86] python3Packages.geoarrow-rust: sort entries --- .../python-modules/geoarrow-rust/default.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/geoarrow-rust/default.nix b/pkgs/development/python-modules/geoarrow-rust/default.nix index 26cc88a89d86..8bb08b06c22b 100644 --- a/pkgs/development/python-modules/geoarrow-rust/default.nix +++ b/pkgs/development/python-modules/geoarrow-rust/default.nix @@ -8,18 +8,18 @@ obstore, # tests - pyarrow, - pyproj, + arro3-compute, + arro3-io, + geoarrow-types, + geodatasets, + geopandas, numpy, pandas, - geoarrow-types, - geopandas, - geodatasets, - shapely, + pyarrow, pyogrio, + pyproj, pytest-asyncio, - arro3-io, - arro3-compute, + shapely, }: let version = "0.6.1"; @@ -110,8 +110,8 @@ let pythonImportsCheck = [ "geoarrow.rust.io" ]; dependencies = [ arro3-core - pyproj obstore + pyproj ]; }; @@ -124,21 +124,21 @@ let dontInstall = true; nativeCheckInputs = [ - pytestCheckHook - pytest-asyncio - geoarrow-types - pandas - pyarrow - numpy - geopandas - geodatasets - shapely - pyogrio - obstore - arro3-io arro3-compute + arro3-io geoarrow-rust-core geoarrow-rust-io + geoarrow-types + geodatasets + geopandas + numpy + obstore + pandas + pyarrow + pyogrio + pytest-asyncio + pytestCheckHook + shapely ]; # use the latest test folder (skips the tests_old folder) From de7a08e42e79ae83656710b4a065ae738025f1db Mon Sep 17 00:00:00 2001 From: Victor Jacobs Date: Mon, 25 May 2026 09:23:26 +0200 Subject: [PATCH 83/86] jellyfin: 10.11.8 -> 10.11.10 --- pkgs/by-name/je/jellyfin-web/package.nix | 6 +++--- pkgs/by-name/je/jellyfin/package.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index 64a18cea81eb..9a3cdc75d5f3 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -13,7 +13,7 @@ }: buildNpmPackage (finalAttrs: { pname = "jellyfin-web"; - version = "10.11.8"; + version = "10.11.10"; src = assert finalAttrs.version == jellyfin.version; @@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: { owner = "jellyfin"; repo = "jellyfin-web"; tag = "v${finalAttrs.version}"; - hash = "sha256-Nrh4BNlhJyzj9cXQ6Yr7349r5H+4r9W3aldcg9+J6dU="; + hash = "sha256-fSpzF6Arx0JfL9fuQHjzf3m82XZR2BZkV0lA37L4DN4="; }; nodejs = nodejs_22; @@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: { --replace-fail "git describe --always --dirty" "echo ${finalAttrs.src.rev}" ''; - npmDepsHash = "sha256-oxytp6n/4X1bhpfFqpqMAji86sbjV669F324zY3hoK4="; + npmDepsHash = "sha256-DCFgivbZrDufRaB+4PeFxO6ISbEM9lXhXmlzc/5GbVU="; preBuild = '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 975ae1745201..89353c557a47 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -14,13 +14,13 @@ buildDotnetModule (finalAttrs: { pname = "jellyfin"; - version = "10.11.8"; # ensure that jellyfin-web has matching version + version = "10.11.10"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; tag = "v${finalAttrs.version}"; - hash = "sha256-wBf561mZvC65Hu4MHHSu8YeILQDp/WN9vGA+JxGXwE8="; + hash = "sha256-bad532F8Ln5Y3TV4x5c7mgsiI+ZJGTZoahuSZhefMvQ="; }; propagatedBuildInputs = [ sqlite ]; From 4f2f5d3940bbe2db020d50ae35b4e7f46930cabb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 May 2026 13:12:31 +0000 Subject: [PATCH 84/86] python3Packages.geoarrow-rust-core: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/geoarrow-rust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoarrow-rust/default.nix b/pkgs/development/python-modules/geoarrow-rust/default.nix index 8bb08b06c22b..e1967b606158 100644 --- a/pkgs/development/python-modules/geoarrow-rust/default.nix +++ b/pkgs/development/python-modules/geoarrow-rust/default.nix @@ -22,13 +22,13 @@ shapely, }: let - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "geoarrow"; repo = "geoarrow-rs"; tag = "py-v${version}"; - hash = "sha256-3/HOQsgQVpEd9iAVvIHvpb0slg55/V6X6KLLvhDUVz4="; + hash = "sha256-qQGGG8aGwFR7ApLaQAE0iQSElpSBeRTtbq4+1xbTC/o="; }; cargoDeps = rustPlatform.fetchCargoVendor { From d1e1404d547b80e6b66de0d96c436fa4405db3f7 Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Sat, 20 Dec 2025 18:19:19 -0500 Subject: [PATCH 85/86] tmuxPlugins.search-panes: init at 0-unstable-2025-07-27 --- pkgs/misc/tmux-plugins/default.nix | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 2415eba2774f..28c809ed996d 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -770,6 +770,42 @@ in }; }; + search-panes = mkTmuxPlugin { + pluginName = "search-panes"; + version = "0-unstable-2025-07-27"; + src = fetchFromGitHub { + owner = "multi-io"; + repo = "tmux-search-panes"; + rev = "3996b5c56c6be69d3a85ef26065b1877d9ac71c6"; + hash = "sha256-Z9Gu4v2LAyG6UxXVLTvQUz1wU4PaJlBQXjLiSzfSP7s="; + }; + rtpFilePath = "tmux-search-panes.tmux"; + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + for f in search-panes.sh _fzf-and-switch.sh _render-preview.sh; do + chmod +x $target/bin/$f + wrapProgram $target/bin/$f \ + --prefix PATH : ${ + with pkgs; + lib.makeBinPath [ + coreutils + fzf + gnugrep + gnused + tmux + ] + } + done + ''; + meta = { + homepage = "https://github.com/multi-io/tmux-search-panes"; + description = "Tmux plugin that allows you to perform a fulltext search"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.DieracDelta ]; + }; + }; + sensible = mkTmuxPlugin { pluginName = "sensible"; version = "unstable-2022-08-14"; From 06d04f05f4256324d99eb42dc29af778656292e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 May 2026 13:02:24 +0200 Subject: [PATCH 86/86] python3Packages.pytest-resource-path: migrate to finalAttrs --- .../python-modules/pytest-resource-path/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix index 9ed070b1cd50..37ea36285457 100644 --- a/pkgs/development/python-modules/pytest-resource-path/default.nix +++ b/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-resource-path"; version = "1.5.0"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "yukihiko-shinoda"; repo = "pytest-resource-path"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Y/mB5Gmkt3Rt8rRBOFZrWIREnpEiSxf/MChqymXDNws="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +})