From b371bd749f17d092918baba4ea589a8cf6b4a762 Mon Sep 17 00:00:00 2001 From: Tau Date: Sun, 13 Jul 2025 05:23:34 +0300 Subject: [PATCH 001/202] cubiomes-viewer: move to pkgs/by-name/ --- .../cu/cubiomes-viewer/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/misc/cubiomes-viewer/default.nix => by-name/cu/cubiomes-viewer/package.nix} (94%) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/by-name/cu/cubiomes-viewer/package.nix similarity index 94% rename from pkgs/applications/misc/cubiomes-viewer/default.nix rename to pkgs/by-name/cu/cubiomes-viewer/package.nix index eafd42bf38e9..fad763af0574 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/by-name/cu/cubiomes-viewer/package.nix @@ -2,10 +2,7 @@ lib, stdenv, fetchFromGitHub, - qtbase, - qmake, - qttools, - wrapQtAppsHook, + qt5, }: stdenv.mkDerivation rec { @@ -27,13 +24,13 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - qtbase + qt5.qtbase ]; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + qt5.qmake + qt5.qttools + qt5.wrapQtAppsHook ]; preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80a1ad392d14..18cfb16758c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7110,8 +7110,6 @@ with pkgs; ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix { }; - cubiomes-viewer = libsForQt5.callPackage ../applications/misc/cubiomes-viewer { }; - # can't use override - it triggers infinite recursion cmakeMinimal = callPackage ../by-name/cm/cmake/package.nix { isMinimalBuild = true; From e9e5d9c6c5f71e3fb55f561cc35752c981abbf92 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Sat, 26 Jul 2025 14:39:00 -0400 Subject: [PATCH 002/202] tic-80: add support for darwin Already built 'successfully' with `NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1`, but the default CMake `installPhase` didn't do anything on macOS, so it just resulted in an empty directory. Bundle creation commands are based on [the ones in the README][], but without the wrapper script since the extra args don't seem to be needed. [the ones in the README]: https://github.com/nesbox/TIC-80#mac --- pkgs/by-name/ti/tic-80/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix index c42152b9f97b..a23466fe9ce3 100644 --- a/pkgs/by-name/ti/tic-80/package.nix +++ b/pkgs/by-name/ti/tic-80/package.nix @@ -73,6 +73,15 @@ stdenv.mkDerivation { "BUILD_WITH_ALL" ]); + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out"/Applications/TIC-80.app/Contents/{MacOS,Resources} + cp bin/tic80 "$out"/Applications/TIC-80.app/Contents/MacOS/tic80 + cp macosx/tic80.plist "$out"/Applications/TIC-80.app/Contents/Info.plist + cp macosx/tic80.icns "$out"/Applications/TIC-80.app/Contents/Resources/tic80.icns + mkdir -p "$out"/bin + ln -s "$out"/Applications/TIC-80.app/Contents/MacOS/tic80 "$out"/bin/tic80 + ''; + nativeBuildInputs = [ cmake curl @@ -109,7 +118,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/nesbox/TIC-80"; license = licenses.mit; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; mainProgram = "tic80"; maintainers = with maintainers; [ blinry ]; }; From dfa2862afce7e94350b912822891abdd3e1769ef Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 21 Aug 2025 12:15:45 +0400 Subject: [PATCH 003/202] netbsd.compat: Fix cross-compilation from darwin --- pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix index e0be2bb0621c..747457afa821 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -32,6 +32,10 @@ mkDerivation ( preConfigure = '' make include/.stamp configure nbtool_config.h.in defs.mk.in + '' + + lib.optionalString stdenv.buildPlatform.isDarwin '' + # Fix cross-compilation from darwin, remove after update to netbsd 10.0 + substituteInPlace Makefile --replace-warn "-no-cpp-precomp" "" ''; configurePlatforms = [ From abb9ac873cf67ee1904a719853c1f9f7ad422392 Mon Sep 17 00:00:00 2001 From: Tau Date: Sun, 13 Jul 2025 22:17:49 +0300 Subject: [PATCH 004/202] cubiomes-viewer: small refactor to conform with nixpkgs recommendations - use `finalAttrs:` pattern instead of `rec` - remove `with lib;` - use `tag` instead of `rev` --- pkgs/by-name/cu/cubiomes-viewer/package.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cu/cubiomes-viewer/package.nix b/pkgs/by-name/cu/cubiomes-viewer/package.nix index fad763af0574..a385a51c8030 100644 --- a/pkgs/by-name/cu/cubiomes-viewer/package.nix +++ b/pkgs/by-name/cu/cubiomes-viewer/package.nix @@ -4,15 +4,14 @@ fetchFromGitHub, qt5, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cubiomes-viewer"; version = "4.1.2"; src = fetchFromGitHub { owner = "Cubitect"; - repo = pname; - rev = version; + repo = "cubiomes-viewer"; + tag = finalAttrs.version; hash = "sha256-izDKS08LNT2rV5rIxlWRHevJAKEbAVzekjfZy0Oen1I="; fetchSubmodules = true; }; @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/Cubitect/cubiomes-viewer"; description = "Graphical Minecraft seed finder and map viewer"; @@ -60,8 +59,8 @@ stdenv.mkDerivation rec { Cubiomes Viewer provides a graphical interface for the efficient and flexible seed-finding utilities provided by cubiomes and a map viewer for the Minecraft biomes and structure generation. ''; - platforms = platforms.all; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hqurve ]; + platforms = lib.platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ hqurve ]; }; -} +}) From bf1b57c1406606e30394b67512d2f729603a10b4 Mon Sep 17 00:00:00 2001 From: Tau Date: Sun, 13 Jul 2025 05:47:22 +0300 Subject: [PATCH 005/202] cubiomes-viewer: add darwin support --- pkgs/by-name/cu/cubiomes-viewer/package.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cu/cubiomes-viewer/package.nix b/pkgs/by-name/cu/cubiomes-viewer/package.nix index a385a51c8030..1978424fedf1 100644 --- a/pkgs/by-name/cu/cubiomes-viewer/package.nix +++ b/pkgs/by-name/cu/cubiomes-viewer/package.nix @@ -41,17 +41,27 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/bin - cp cubiomes-viewer $out/bin + ${ + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p "$out/Applications/" + cp -R cubiomes-viewer.app "$out/Applications/cubiomes-viewer.app" + ln -s "$out/Applications/cubiomes-viewer.app/Contents/MacOS/cubiomes-viewer" "$out/bin/cubiomes-viewer" + '' + else + '' + cp cubiomes-viewer $out/bin - mkdir -p $out/share/{pixmaps,applications} - cp rc/icons/map.png $out/share/pixmaps/com.github.cubitect.cubiomes-viewer.png - cp etc/com.github.cubitect.cubiomes-viewer.desktop $out/share/applications + mkdir -p $out/share/{pixmaps,applications} + cp rc/icons/map.png $out/share/pixmaps/com.github.cubitect.cubiomes-viewer.png + cp etc/com.github.cubitect.cubiomes-viewer.desktop $out/share/applications + '' + } runHook postInstall ''; meta = { - broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/Cubitect/cubiomes-viewer"; description = "Graphical Minecraft seed finder and map viewer"; mainProgram = "cubiomes-viewer"; From 05f950d07b744af6299fd15094bd158825d516c7 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 31 Aug 2025 11:49:52 +0200 Subject: [PATCH 006/202] python313Packages.pysam: 0.22.1-unstable-2024-10-30 -> 0.23.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: László Kupcsik --- pkgs/development/python-modules/pysam/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index cdabdace5294..2282c6e12a54 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -15,9 +15,9 @@ zlib, }: -buildPythonPackage { +buildPythonPackage rec { pname = "pysam"; - version = "0.22.1-unstable-2024-10-30"; + version = "0.23.3"; pyproject = true; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is @@ -26,8 +26,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "pysam-developers"; repo = "pysam"; - rev = "0eae5be21ac3ab3ac7aa770a3931e2977e37b909"; - hash = "sha256-i8glYSpuCRNhNtK4i6eUrerz8daiMfY/YgDwgSuELbc="; + tag = "v${version}"; + hash = "sha256-yOLnfuGQW+j0nHy4MRlwurZMpeRHTGmQ9eLmihcAGoQ="; }; nativeBuildInputs = [ From 9eb0b6c71dc918f66518eb8b0d210d83ac21b494 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 31 Aug 2025 11:51:29 +0200 Subject: [PATCH 007/202] python313Packages.pysam: refactor --- pkgs/development/python-modules/pysam/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 2282c6e12a54..3553d9540381 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -30,12 +30,15 @@ buildPythonPackage rec { hash = "sha256-yOLnfuGQW+j0nHy4MRlwurZMpeRHTGmQ9eLmihcAGoQ="; }; - nativeBuildInputs = [ + build-system = [ cython - samtools setuptools ]; + nativeBuildInputs = [ + samtools + ]; + buildInputs = [ bzip2 curl @@ -73,11 +76,13 @@ buildPythonPackage rec { "pysam.libchtslib" "pysam.libcutils" "pysam.libcvcf" + "pysam.libcsamtools" ]; meta = { description = "Python module for reading, manipulating and writing genome data sets"; downloadPage = "https://github.com/pysam-developers/pysam"; + changelog = "https://github.com/pysam-developers/pysam/releases/tag/${src.tag}"; homepage = "https://pysam.readthedocs.io"; maintainers = with lib.maintainers; [ unode ]; license = lib.licenses.mit; From 8500e52278abc5fdcd72078eec686a76813a01e2 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Mon, 1 Sep 2025 09:08:54 +0200 Subject: [PATCH 008/202] python313Packages.pysam: add nix-update-script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: László Kupcsik --- pkgs/development/python-modules/pysam/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 3553d9540381..da739b495b11 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -13,6 +13,7 @@ setuptools, samtools, zlib, + nix-update-script, }: buildPythonPackage rec { @@ -79,6 +80,8 @@ buildPythonPackage rec { "pysam.libcsamtools" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Python module for reading, manipulating and writing genome data sets"; downloadPage = "https://github.com/pysam-developers/pysam"; From 7247e0ceae16892a8eb5d3891dc8f8754c72f379 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 18:55:19 +0000 Subject: [PATCH 009/202] python3Packages.netbox-contract: 2.4.1 -> 2.4.2 --- pkgs/development/python-modules/netbox-contract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netbox-contract/default.nix b/pkgs/development/python-modules/netbox-contract/default.nix index b0b20ff31db2..8f40a1d28bf0 100644 --- a/pkgs/development/python-modules/netbox-contract/default.nix +++ b/pkgs/development/python-modules/netbox-contract/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { pname = "netbox-contract"; - version = "2.4.1"; + version = "2.4.2"; pyproject = true; disabled = python.pythonVersion != netbox.python.pythonVersion; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mlebreuil"; repo = "netbox-contract"; tag = "v${version}"; - hash = "sha256-2pjApKMybZGzojRF3vH1Ti/Wkmg/tafhpzX+qDkLY8o="; + hash = "sha256-hJz6+vJWhwZJId5Otf1LaFkyaLncuuvai83aCu/aKu0="; }; build-system = [ setuptools ]; From 1f58bf841cc69b806e206deeecef6cceb0fd2d58 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Wed, 3 Sep 2025 01:49:02 -0500 Subject: [PATCH 010/202] nzbget: 25.2 -> 25.3 --- pkgs/by-name/nz/nzbget/package.nix | 8 ++++---- pkgs/by-name/nz/nzbget/remove-git-usage.patch | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix index ea5cd7be3753..fc14d4964e83 100644 --- a/pkgs/by-name/nz/nzbget/package.nix +++ b/pkgs/by-name/nz/nzbget/package.nix @@ -22,19 +22,19 @@ let par2TurboSrc = fetchFromGitHub { owner = "nzbgetcom"; repo = "par2cmdline-turbo"; - rev = "v1.3.0"; # from cmake/par2-turbo.cmake - hash = "sha256-tNzf//StwE1A5XcmYlKapoaq/dFqMikHsQg3lsyKFj4="; + rev = "v1.3.0-20250808"; # from cmake/par2-turbo.cmake + hash = "sha256-ZP8AI5htmEcxQQtvgShcQ8qNoRL+jBR1BdKS6yyuB/E="; }; in stdenv.mkDerivation (finalAttrs: { pname = "nzbget"; - version = "25.2"; + version = "25.3"; src = fetchFromGitHub { owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-eFI4zFTMHlAdqsYyg0scrko0mWhlGPDqMPXTH45GHvY="; + hash = "sha256-ecTz+axqPOlRe0wi7IRiESn2JjLbalI+sQVKqrvrAoU="; }; patches = [ diff --git a/pkgs/by-name/nz/nzbget/remove-git-usage.patch b/pkgs/by-name/nz/nzbget/remove-git-usage.patch index 2ddf4eca14af..226b52cb9fe7 100644 --- a/pkgs/by-name/nz/nzbget/remove-git-usage.patch +++ b/pkgs/by-name/nz/nzbget/remove-git-usage.patch @@ -1,4 +1,4 @@ -From de94ddc6fa6ce4f84b658470842ed0450e932eb1 Mon Sep 17 00:00:00 2001 +From 15dc4c64531845b64b574647fc7218170b100533 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Tue, 25 Feb 2025 20:36:19 -0600 Subject: [PATCH] feat: use pre-fetched par2-turbo @@ -8,7 +8,7 @@ Subject: [PATCH] feat: use pre-fetched par2-turbo 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/cmake/par2-turbo.cmake b/cmake/par2-turbo.cmake -index bb200067..e2d12f10 100644 +index 0062b4d3..c0dd56ea 100644 --- a/cmake/par2-turbo.cmake +++ b/cmake/par2-turbo.cmake @@ -48,18 +48,13 @@ if(CMAKE_SYSROOT) @@ -19,7 +19,7 @@ index bb200067..e2d12f10 100644 - par2-turbo - PREFIX par2-turbo - GIT_REPOSITORY https://github.com/nzbgetcom/par2cmdline-turbo.git -- GIT_TAG v1.3.0 +- GIT_TAG v1.3.0-20250808 - TLS_VERIFY TRUE - GIT_SHALLOW TRUE - GIT_PROGRESS TRUE @@ -28,15 +28,15 @@ index bb200067..e2d12f10 100644 - CMAKE_ARGS ${CMAKE_ARGS} - INSTALL_COMMAND "" +ExternalProject_Add( -+ par2-turbo -+ PREFIX par2-turbo -+ SOURCE_DIR ${CMAKE_BINARY_DIR}/par2-turbo/src/par2-turbo -+ BUILD_BYPRODUCTS ${PAR2_LIBS} -+ CMAKE_ARGS ${CMAKE_ARGS} -+ INSTALL_COMMAND "" ++ par2-turbo ++ PREFIX par2-turbo ++ SOURCE_DIR ${CMAKE_BINARY_DIR}/par2-turbo/src/par2-turbo ++ BUILD_BYPRODUCTS ${PAR2_LIBS} ++ CMAKE_ARGS ${CMAKE_ARGS} ++ INSTALL_COMMAND "" ) set(LIBS ${LIBS} ${PAR2_LIBS}) -- -2.49.0 +2.50.1 From 6fb75b1e89ff22af201733916c0120a4c31b7c0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Sep 2025 09:08:56 +0000 Subject: [PATCH 011/202] vscode-extensions.sonarsource.sonarlint-vscode: 4.27.0 -> 4.30.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 312e7f5bc4f4..628345e1edc1 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4413,8 +4413,8 @@ let mktplcRef = { publisher = "sonarsource"; name = "sonarlint-vscode"; - version = "4.27.0"; - hash = "sha256-0BqIJL9Vyccjsov1JQil3dRUdo9w8ecOUotVKzBlYGQ="; + version = "4.30.0"; + hash = "sha256-sMiIxsMip2ep8ySOERHIAj+Ndwo+GnPhh9uaUncXO9k="; }; meta.license = lib.licenses.lgpl3Only; }; From 624fe3e9b422ce54c89a82e60f2896f91e4080ae Mon Sep 17 00:00:00 2001 From: winston Date: Wed, 20 Aug 2025 14:17:37 +0200 Subject: [PATCH 012/202] muon: 0.4.0 -> 0.5.0, enable tests --- pkgs/by-name/mu/muon/package.nix | 120 +++++++++++++++++-------------- 1 file changed, 66 insertions(+), 54 deletions(-) diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index 92fe65a060a1..18a2d2987e46 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchFromSourcehut, - fetchurl, + fetchFromGitHub, + coreutils, curl, libarchive, libpkgconf, @@ -10,33 +11,51 @@ python3, samurai, scdoc, + writableTmpDirAsHomeHook, zlib, embedSamurai ? false, buildDocs ? true, }: - stdenv.mkDerivation (finalAttrs: { pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai"; - version = "0.4.0"; + version = "0.5.0"; - src = fetchFromSourcehut { - name = "muon-src"; - owner = "~lattis"; - repo = "muon"; - tag = finalAttrs.version; - hash = "sha256-xTdyqK8t741raMhjjJBMbWnAorLMMdZ02TeMXK7O+Yw="; - }; + srcs = [ + (fetchFromSourcehut { + name = "muon-src"; + owner = "~lattis"; + repo = "muon"; + tag = finalAttrs.version; + hash = "sha256-bWEYWUD+GK8R3yVnDTnzFWmm4KAuVPI+1yMfCXWcG/A="; + }) + (fetchFromGitHub { + name = "meson-tests"; + repo = "meson-tests"; + owner = "muon-build"; + rev = "db92588773a24f67cda2f331b945825ca3a63fa7"; + hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM="; + }) + ] + ++ lib.optionals buildDocs [ + (fetchFromGitHub { + name = "meson-docs"; + repo = "meson-docs"; + owner = "muon-build"; + rev = "1017b3413601044fb41ad04977445e68a80e8181"; + hash = "sha256-aFpyJFIqybLNKhm/kyfCjYylj7DE6muI1+OUh4Cq4WY="; + }) + ]; + + sourceRoot = "./muon-src"; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; nativeBuildInputs = [ pkgconf + (python3.withPackages (ps: [ ps.pyyaml ])) ] ++ lib.optionals (!embedSamurai) [ samurai ] - ++ lib.optionals buildDocs [ - (python3.withPackages (ps: [ ps.pyyaml ])) - scdoc - ]; + ++ lib.optionals buildDocs [ scdoc ]; buildInputs = [ curl @@ -47,54 +66,43 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - postUnpack = - let - # URLs manually extracted from subprojects directory - meson-docs-wrap = fetchurl { - name = "meson-docs-wrap"; - url = "https://github.com/muon-build/meson-docs/archive/5bc0b250984722389419dccb529124aed7615583.tar.gz"; - hash = "sha256-5MmmiZfadCuUJ2jy5Rxubwf4twX0jcpr+TPj5ssdSbM="; - }; - - meson-tests-wrap = fetchurl { - name = "meson-tests-wrap"; - url = "https://github.com/muon-build/meson-tests/archive/591b5a053f9aa15245ccbd1d334cf3f8031b1035.tar.gz"; - hash = "sha256-6GXfcheZyB/S/xl/j7pj5EAWtsmx4N0fVhLPMJ2wC/w="; - }; - in - '' - mkdir -p $sourceRoot/subprojects/meson-docs - pushd $sourceRoot/subprojects/meson-docs - ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap} --strip-components=1"} - popd - - mkdir -p $sourceRoot/subprojects/meson-tests - pushd $sourceRoot/subprojects/meson-tests - tar xvf ${meson-tests-wrap} --strip-components=1 - popd - ''; + postUnpack = '' + for subproject in ${lib.optionalString buildDocs "meson-docs"} meson-tests; do + cp -r "$subproject" "$sourceRoot/subprojects/$subproject" + chmod +w -R "$sourceRoot/subprojects/$subproject" + rm "$sourceRoot/subprojects/$subproject.wrap" + done + ''; postPatch = '' - patchShebangs bootstrap.sh - '' - + lib.optionalString buildDocs '' - patchShebangs subprojects/meson-docs/docs/genrefman.py + find subprojects/meson-tests -name "*.py" -exec chmod +x {} \; + patchShebangs . + + substituteInPlace \ + "subprojects/meson-tests/common/14 configure file/test.py.in" \ + "subprojects/meson-tests/common/274 customtarget exe for test/generate.py" \ + "subprojects/meson-tests/native/8 external program shebang parsing/script.int.in" \ + --replace-fail "/usr/bin/env" "${coreutils}/bin/env" + + substituteInPlace \ + "subprojects/meson-tests/meson.build" \ + --replace-fail "['common/66 vcstag', {'python': true}]," "" ''; - # tests try to access "~" - postConfigure = '' - export HOME=$(mktemp -d) - ''; + enableParallelBuilding = true; buildPhase = let muonBool = lib.mesonBool; muonEnable = lib.mesonEnable; + muonOption = lib.mesonOption; cmdlineForMuon = lib.concatStringsSep " " [ + (muonOption "prefix" (placeholder "out")) (muonBool "static" stdenv.targetPlatform.isStatic) - (muonEnable "docs" buildDocs) + (muonEnable "meson-docs" buildDocs) (muonEnable "samurai" embedSamurai) + (muonEnable "tracy" false) ]; cmdlineForSamu = "-j$NIX_BUILD_CORES"; in @@ -108,19 +116,24 @@ stdenv.mkDerivation (finalAttrs: { ./stage-1/muon-bootstrap setup ${cmdlineForMuon} stage-2 ${lib.optionalString embedSamurai "./stage-1/muon-bootstrap"} samu ${cmdlineForSamu} -C stage-2 - ./stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3 + ./stage-2/muon setup ${cmdlineForMuon} stage-3 ${lib.optionalString embedSamurai "./stage-2/muon"} samu ${cmdlineForSamu} -C stage-3 runHook postBuild ''; - # tests are failing because they don't find Python - doCheck = false; + # tests only pass when samurai is embedded + doCheck = embedSamurai; + + nativeCheckInputs = [ + # needed for "common/220 fs module" + writableTmpDirAsHomeHook + ]; checkPhase = '' runHook preCheck - ./stage-3/muon -C stage-3 test + ./stage-3/muon -C stage-3 test -d dots -S -j$NIX_BUILD_CORES runHook postCheck ''; @@ -146,4 +159,3 @@ stdenv.mkDerivation (finalAttrs: { # TODO LIST: # 1. automate sources acquisition (especially wraps) # 2. setup hook -# 3. tests From b9a9eb100b5fdfe65db673faa93e627e02f995a2 Mon Sep 17 00:00:00 2001 From: winston Date: Wed, 20 Aug 2025 20:09:52 +0200 Subject: [PATCH 013/202] muon: unbreak on darwin --- pkgs/by-name/mu/muon/darwin-clang.patch | 15 +++++++++++++++ pkgs/by-name/mu/muon/package.nix | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/mu/muon/darwin-clang.patch diff --git a/pkgs/by-name/mu/muon/darwin-clang.patch b/pkgs/by-name/mu/muon/darwin-clang.patch new file mode 100644 index 000000000000..170e7864c630 --- /dev/null +++ b/pkgs/by-name/mu/muon/darwin-clang.patch @@ -0,0 +1,15 @@ +diff --git a/src/functions/kernel/dependency.c b/src/functions/kernel/dependency.c +index fbfc86f6..46f9be9d 100644 +--- a/src/functions/kernel/dependency.c ++++ b/src/functions/kernel/dependency.c +@@ -377,10 +377,6 @@ get_dependency_extraframework(struct workspace *wk, struct dep_lookup_ctx *ctx, + } + + struct obj_compiler *comp = get_obj_compiler(wk, compiler); +- if (comp->type[toolchain_component_compiler] != compiler_apple_clang) { +- L("skipping extraframework dependency lookup: compiler type is not apple clang"); +- return true; +- } + + if (!comp->fwdirs) { + obj cmd; diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index 18a2d2987e46..eed22dd00eab 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -74,6 +74,8 @@ stdenv.mkDerivation (finalAttrs: { done ''; + patches = [ ./darwin-clang.patch ]; + postPatch = '' find subprojects/meson-tests -name "*.py" -exec chmod +x {} \; patchShebangs . @@ -133,6 +135,9 @@ stdenv.mkDerivation (finalAttrs: { checkPhase = '' runHook preCheck + ${lib.optionalString ( + stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 + ) "NIX_BUILD_CORES=1"} ./stage-3/muon -C stage-3 test -d dots -S -j$NIX_BUILD_CORES runHook postCheck @@ -152,7 +157,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; maintainers = with maintainers; [ ]; platforms = platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # typical `ar failure` mainProgram = "muon"; }; }) From 53889b7b8e8c9fd3d33f6d9a70ee98287f9afd43 Mon Sep 17 00:00:00 2001 From: winston Date: Wed, 20 Aug 2025 22:39:27 +0200 Subject: [PATCH 014/202] muon: add updateScript and update meta --- pkgs/by-name/mu/muon/package.nix | 69 ++++++++++++++++---------------- pkgs/by-name/mu/muon/update.nix | 35 ++++++++++++++++ 2 files changed, 70 insertions(+), 34 deletions(-) create mode 100644 pkgs/by-name/mu/muon/update.nix diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index eed22dd00eab..1c1fb6f24485 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -1,8 +1,9 @@ { lib, stdenv, - fetchFromSourcehut, fetchFromGitHub, + fetchFromSourcehut, + callPackage, coreutils, curl, libarchive, @@ -20,31 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai"; version = "0.5.0"; - srcs = [ - (fetchFromSourcehut { - name = "muon-src"; - owner = "~lattis"; - repo = "muon"; - tag = finalAttrs.version; - hash = "sha256-bWEYWUD+GK8R3yVnDTnzFWmm4KAuVPI+1yMfCXWcG/A="; - }) - (fetchFromGitHub { - name = "meson-tests"; - repo = "meson-tests"; - owner = "muon-build"; - rev = "db92588773a24f67cda2f331b945825ca3a63fa7"; - hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM="; - }) - ] - ++ lib.optionals buildDocs [ - (fetchFromGitHub { - name = "meson-docs"; - repo = "meson-docs"; - owner = "muon-build"; - rev = "1017b3413601044fb41ad04977445e68a80e8181"; - hash = "sha256-aFpyJFIqybLNKhm/kyfCjYylj7DE6muI1+OUh4Cq4WY="; - }) - ]; + srcs = builtins.attrValues finalAttrs.passthru.srcs; sourceRoot = "./muon-src"; @@ -151,15 +128,39 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { - homepage = "https://muon.build/"; - description = "Implementation of Meson build system in C99"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + passthru.srcs = { + muon-src = fetchFromSourcehut { + name = "muon-src"; + owner = "~lattis"; + repo = "muon"; + tag = finalAttrs.version; + hash = "sha256-bWEYWUD+GK8R3yVnDTnzFWmm4KAuVPI+1yMfCXWcG/A="; + }; + meson-docs = fetchFromGitHub { + name = "meson-docs"; + repo = "meson-docs"; + owner = "muon-build"; + rev = "1017b3413601044fb41ad04977445e68a80e8181"; + hash = "sha256-aFpyJFIqybLNKhm/kyfCjYylj7DE6muI1+OUh4Cq4WY="; + }; + meson-tests = fetchFromGitHub { + name = "meson-tests"; + repo = "meson-tests"; + owner = "muon-build"; + rev = "db92588773a24f67cda2f331b945825ca3a63fa7"; + hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM="; + }; + }; + passthru.updateScript = callPackage ./update.nix { }; + + meta = { + homepage = "https://muon.build"; + description = "Implementation of the meson build system in C99"; + license = lib.licenses.gpl3Only; + maintainers = [ ]; + platforms = lib.platforms.unix; mainProgram = "muon"; }; }) # TODO LIST: -# 1. automate sources acquisition (especially wraps) -# 2. setup hook +# 1. setup hook diff --git a/pkgs/by-name/mu/muon/update.nix b/pkgs/by-name/mu/muon/update.nix new file mode 100644 index 000000000000..7c907ef2cec0 --- /dev/null +++ b/pkgs/by-name/mu/muon/update.nix @@ -0,0 +1,35 @@ +{ + lib, + writeShellApplication, + common-updater-scripts, + curl, + gnugrep, +}: + +lib.getExe (writeShellApplication { + name = "update-muon"; + + runtimeInputs = [ + common-updater-scripts + curl + gnugrep + ]; + + text = '' + REPO=$(nix-instantiate --raw --eval -E "with import ./. {}; muon.passthru.srcs.muon-src.meta.homepage") + MUON_VERSION=$(list-git-tags --url="$REPO" | tail -1) + + update-source-version "muon" \ + "$MUON_VERSION" \ + --version-key=version \ + --source-key=passthru.srcs.muon-src + update-source-version "muon" \ + "$(curl -s "$REPO/blob/$MUON_VERSION/subprojects/meson-docs.wrap" | grep -oP "revision = \K.+$")" \ + --version-key=passthru.srcs.meson-docs.rev \ + --source-key=passthru.srcs.meson-docs + update-source-version "muon" \ + "$(curl -s "$REPO/blob/$MUON_VERSION/subprojects/meson-tests.wrap" | grep -oP "revision = \K.+$")" \ + --version-key=passthru.srcs.meson-tests.rev \ + --source-key=passthru.srcs.meson-tests + ''; +}) From 8d0a64c83d90abe662b3f006bb82cc6678c1e55c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Sep 2025 16:14:23 +0000 Subject: [PATCH 015/202] apache-answer: 1.5.1 -> 1.6.0 --- pkgs/by-name/ap/apache-answer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix index 257f972e4f47..83e41338ce27 100644 --- a/pkgs/by-name/ap/apache-answer/package.nix +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "apache-answer"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "apache"; repo = "answer"; tag = "v${version}"; - hash = "sha256-OocQsCqyVHjkpGSDS23RbOJ+b10Ax32G2hok5bgNDTI="; + hash = "sha256-QrLYkGiEDBB4uUzG2yrlEUYXpQxovKFBmGZjLbZiGKk="; }; webui = stdenv.mkDerivation { @@ -55,7 +55,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-jKpUJD8rq+ZvTgJVaI+AfrwMzrrai+cfd4hjoDLYnxc="; + vendorHash = "sha256-mWSKoEYj23fy6ix3mK1/5HeGugp1UAUO+iwInXkzgU4="; doCheck = false; # TODO checks are currently broken upstream From 71f3ac41e77759f402709a9e0e69bc9d58a36b7e Mon Sep 17 00:00:00 2001 From: Louis Thevenet Date: Sun, 8 Jun 2025 15:41:14 +0200 Subject: [PATCH 016/202] mcat-unwrapped: add shell completions Added shell completions installation --- pkgs/by-name/mc/mcat-unwrapped/package.nix | 22 ++++++++++++++++++++++ pkgs/by-name/mc/mcat/package.nix | 1 + 2 files changed, 23 insertions(+) diff --git a/pkgs/by-name/mc/mcat-unwrapped/package.nix b/pkgs/by-name/mc/mcat-unwrapped/package.nix index c41828527550..207bb11e20cc 100644 --- a/pkgs/by-name/mc/mcat-unwrapped/package.nix +++ b/pkgs/by-name/mc/mcat-unwrapped/package.nix @@ -2,6 +2,9 @@ lib, rustPlatform, fetchFromGitHub, + installShellFiles, + stdenv, + buildPackages, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -17,6 +20,25 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-c3OJURz6eObjIC6AHUP6l/a5zYFV0QZ3VIxShFCcm4U="; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = + let + mcat = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + placeholder "out" + else + buildPackages.mcat-unwrapped; + in + '' + installShellCompletion --cmd mcat \ + --bash <(${mcat}/bin/mcat --generate bash) \ + --fish <(${mcat}/bin/mcat --generate fish) \ + --zsh <(${mcat}/bin/mcat --generate zsh) + ''; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/mc/mcat/package.nix b/pkgs/by-name/mc/mcat/package.nix index 9af71573fb08..c5953236638e 100644 --- a/pkgs/by-name/mc/mcat/package.nix +++ b/pkgs/by-name/mc/mcat/package.nix @@ -18,6 +18,7 @@ runCommand "mcat" } '' mkdir -p $out/bin + ln -s "${mcat-unwrapped}/share" "$out/share" makeWrapper ${lib.getExe mcat-unwrapped} $out/bin/mcat --prefix PATH : ${ lib.makeBinPath ((lib.optional useChromium chromium) ++ (lib.optional useFfmpeg ffmpeg-headless)) } From 1992ee89431f2f1f8976dc1984d69af58dc9da27 Mon Sep 17 00:00:00 2001 From: winston Date: Tue, 9 Sep 2025 02:25:04 +0200 Subject: [PATCH 017/202] muon: only run tests in `passthru.tests` This was done to for `muonStandalone` to have minimal dependencies. Other edits: - Additional cleanup to the postUnpack. - I've added `cmdlineForMuon` flags that I've learned about since starting work on the `setupHook`. Without these, we get warnings about `fortify` requiring `-O2`, and muon defaults to `-O0` when "plain" isn't given. --- pkgs/by-name/mu/muon/package.nix | 74 +++++++++++++++++++++++++------- 1 file changed, 59 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index 1c1fb6f24485..de78b476f1e7 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -9,13 +9,20 @@ libarchive, libpkgconf, pkgconf, - python3, samurai, - scdoc, - writableTmpDirAsHomeHook, zlib, embedSamurai ? false, + # docs buildDocs ? true, + scdoc, + # tests + runTests ? false, + gettext, + muon, + nasm, + pkg-config, + python3, + writableTmpDirAsHomeHook, }: stdenv.mkDerivation (finalAttrs: { pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai"; @@ -23,16 +30,20 @@ stdenv.mkDerivation (finalAttrs: { srcs = builtins.attrValues finalAttrs.passthru.srcs; - sourceRoot = "./muon-src"; + sourceRoot = "muon-src"; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; nativeBuildInputs = [ pkgconf - (python3.withPackages (ps: [ ps.pyyaml ])) ] ++ lib.optionals (!embedSamurai) [ samurai ] - ++ lib.optionals buildDocs [ scdoc ]; + ++ lib.optionals buildDocs [ + scdoc + ] + ++ lib.optionals (buildDocs || finalAttrs.doCheck) [ + (python3.withPackages (ps: [ ps.pyyaml ])) + ]; buildInputs = [ curl @@ -44,19 +55,25 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; postUnpack = '' - for subproject in ${lib.optionalString buildDocs "meson-docs"} meson-tests; do - cp -r "$subproject" "$sourceRoot/subprojects/$subproject" - chmod +w -R "$sourceRoot/subprojects/$subproject" - rm "$sourceRoot/subprojects/$subproject.wrap" + for src in $srcs; do + name=$(stripHash $src) + + # skip the main project, only move subprojects + [ "$name" == "$sourceRoot" ] && continue + + cp -r "$name" "$sourceRoot/subprojects/$name" + chmod +w -R "$sourceRoot/subprojects/$name" + rm "$sourceRoot/subprojects/$name.wrap" done ''; patches = [ ./darwin-clang.patch ]; postPatch = '' - find subprojects/meson-tests -name "*.py" -exec chmod +x {} \; - patchShebangs . - + find subprojects -name "*.py" -exec chmod +x {} \; + patchShebangs subprojects + '' + + lib.optionalString finalAttrs.doCheck '' substituteInPlace \ "subprojects/meson-tests/common/14 configure file/test.py.in" \ "subprojects/meson-tests/common/274 customtarget exe for test/generate.py" \ @@ -76,12 +93,22 @@ stdenv.mkDerivation (finalAttrs: { muonEnable = lib.mesonEnable; muonOption = lib.mesonOption; + # see `muon options -a` to see built-in options cmdlineForMuon = lib.concatStringsSep " " [ (muonOption "prefix" (placeholder "out")) + # don't let muon override stdenv C flags + (muonEnable "auto_features" true) + (muonOption "buildtype" "plain") + (muonOption "optimization" "plain") + (muonOption "wrap_mode" "nodownload") + # muon features (muonBool "static" stdenv.targetPlatform.isStatic) + (muonEnable "man-pages" buildDocs) (muonEnable "meson-docs" buildDocs) + (muonEnable "meson-tests" finalAttrs.doCheck) (muonEnable "samurai" embedSamurai) (muonEnable "tracy" false) + (muonEnable "website" false) ]; cmdlineForSamu = "-j$NIX_BUILD_CORES"; in @@ -102,11 +129,19 @@ stdenv.mkDerivation (finalAttrs: { ''; # tests only pass when samurai is embedded - doCheck = embedSamurai; + doCheck = embedSamurai && runTests; nativeCheckInputs = [ - # needed for "common/220 fs module" + # "common/220 fs module" writableTmpDirAsHomeHook + # "common/44 pkgconfig-gen" + pkg-config + # "frameworks/6 gettext" + gettext + ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + # "nasm/*" tests + nasm ]; checkPhase = '' @@ -151,6 +186,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM="; }; }; + + # tests are run here in package tests, rather than enabling doCheck by + # default, to reduce the number of required dependencies. + passthru.tests.test = (muon.overrideAttrs { pname = "muon-tests"; }).override { + buildDocs = false; + embedSamurai = true; + runTests = true; + }; + passthru.updateScript = callPackage ./update.nix { }; meta = { From 5a64c8630bf72aad82c2d7059e34c605b62102ea Mon Sep 17 00:00:00 2001 From: winston Date: Wed, 10 Sep 2025 03:53:35 +0200 Subject: [PATCH 018/202] muon: use two-stage build, only use needed srcs Had to work around an issue with the fetchFromSourcehut fetcher. #441478 --- pkgs/by-name/mu/muon/package.nix | 22 ++++++++-------------- pkgs/by-name/mu/muon/update.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index de78b476f1e7..dd760d4519f4 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai"; version = "0.5.0"; - srcs = builtins.attrValues finalAttrs.passthru.srcs; + srcs = builtins.attrValues (lib.filterAttrs (_: v: v.use or true) finalAttrs.passthru.srcsAttrs); sourceRoot = "muon-src"; @@ -93,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: { muonEnable = lib.mesonEnable; muonOption = lib.mesonOption; + bootstrapFlags = lib.optionalString (!embedSamurai) "CFLAGS=\"$CFLAGS -DBOOTSTRAP_NO_SAMU\""; # see `muon options -a` to see built-in options cmdlineForMuon = lib.concatStringsSep " " [ (muonOption "prefix" (placeholder "out")) @@ -115,16 +116,10 @@ stdenv.mkDerivation (finalAttrs: { '' runHook preBuild - ${ - lib.optionalString (!embedSamurai) "CFLAGS=\"$CFLAGS -DBOOTSTRAP_NO_SAMU\"" - } ./bootstrap.sh stage-1 - + ${bootstrapFlags} ./bootstrap.sh stage-1 ./stage-1/muon-bootstrap setup ${cmdlineForMuon} stage-2 ${lib.optionalString embedSamurai "./stage-1/muon-bootstrap"} samu ${cmdlineForSamu} -C stage-2 - ./stage-2/muon setup ${cmdlineForMuon} stage-3 - ${lib.optionalString embedSamurai "./stage-2/muon"} samu ${cmdlineForSamu} -C stage-3 - runHook postBuild ''; @@ -147,10 +142,7 @@ stdenv.mkDerivation (finalAttrs: { checkPhase = '' runHook preCheck - ${lib.optionalString ( - stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 - ) "NIX_BUILD_CORES=1"} - ./stage-3/muon -C stage-3 test -d dots -S -j$NIX_BUILD_CORES + ./stage-2/muon -C stage-2 test -d dots -S -j$NIX_BUILD_CORES runHook postCheck ''; @@ -158,12 +150,12 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - stage-3/muon -C stage-3 install + stage-2/muon -C stage-2 install runHook postInstall ''; - passthru.srcs = { + passthru.srcsAttrs = { muon-src = fetchFromSourcehut { name = "muon-src"; owner = "~lattis"; @@ -177,6 +169,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "muon-build"; rev = "1017b3413601044fb41ad04977445e68a80e8181"; hash = "sha256-aFpyJFIqybLNKhm/kyfCjYylj7DE6muI1+OUh4Cq4WY="; + passthru.use = buildDocs; }; meson-tests = fetchFromGitHub { name = "meson-tests"; @@ -184,6 +177,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "muon-build"; rev = "db92588773a24f67cda2f331b945825ca3a63fa7"; hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM="; + passthru.use = finalAttrs.doCheck; }; }; diff --git a/pkgs/by-name/mu/muon/update.nix b/pkgs/by-name/mu/muon/update.nix index 7c907ef2cec0..e870efce07c1 100644 --- a/pkgs/by-name/mu/muon/update.nix +++ b/pkgs/by-name/mu/muon/update.nix @@ -16,20 +16,20 @@ lib.getExe (writeShellApplication { ]; text = '' - REPO=$(nix-instantiate --raw --eval -E "with import ./. {}; muon.passthru.srcs.muon-src.meta.homepage") + REPO=$(nix-instantiate --raw --eval -E "with import ./. {}; muon.srcsAttrs.muon-src.meta.homepage") MUON_VERSION=$(list-git-tags --url="$REPO" | tail -1) update-source-version "muon" \ "$MUON_VERSION" \ --version-key=version \ - --source-key=passthru.srcs.muon-src + --source-key=srcsAttrs.muon-src update-source-version "muon" \ "$(curl -s "$REPO/blob/$MUON_VERSION/subprojects/meson-docs.wrap" | grep -oP "revision = \K.+$")" \ - --version-key=passthru.srcs.meson-docs.rev \ - --source-key=passthru.srcs.meson-docs + --version-key=srcsAttrs.meson-docs.rev \ + --source-key=srcsAttrs.meson-docs update-source-version "muon" \ "$(curl -s "$REPO/blob/$MUON_VERSION/subprojects/meson-tests.wrap" | grep -oP "revision = \K.+$")" \ - --version-key=passthru.srcs.meson-tests.rev \ - --source-key=passthru.srcs.meson-tests + --version-key=srcsAttrs.meson-tests.rev \ + --source-key=srcsAttrs.meson-tests ''; }) From 4402e311e672f567b0b053b9195e319dffed92e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Sep 2025 21:44:40 +0200 Subject: [PATCH 019/202] python313Packages.msgraph-sdk: 1.40.0 -> 1.44.0 Diff: https://github.com/microsoftgraph/msgraph-sdk-python/compare/v1.40.0...v1.44.0 Changelog: https://github.com/microsoftgraph/msgraph-sdk-python/blob/v1.44.0/CHANGELOG.md --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 9e6ac51e6df8..7704cc1be8c9 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.40.0"; + version = "1.44.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-qoQbYSFL96ovKKZ3KJAeTtwNRJxHjnmGDbSAZ4lTVNw="; + hash = "sha256-KRB3knoNXN6l38CekzbFhHzwuMI92udzfHLTfTQn6v4="; }; build-system = [ flit-core ]; From d9dddc493a896e381c334486fb69ba4db9e2d56c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Sep 2025 22:05:28 +0200 Subject: [PATCH 020/202] python313Packages.snitun: 0.44.0 -> 0.45.0 Diff: https://github.com/NabuCasa/snitun/compare/0.44.0...0.45.0 Changelog: https://github.com/NabuCasa/snitun/releases/tag/0.45.0 --- pkgs/development/python-modules/snitun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index b17c173e0144..a9726c37815c 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.44.0"; + version = "0.45.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = "snitun"; tag = version; - hash = "sha256-jZRA/UKamB5fUSvyaemN0Vq4GX6bNL8rsYCgToEkIL4="; + hash = "sha256-LAl6En7qMiGeKciY6UIOgtfaCdHqx/T/ohv9vQvk9gE="; }; postPatch = '' From 6f95df119eac884c3108b0a8fce8c8e00bdb2e5c Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Fri, 12 Sep 2025 09:34:16 +0200 Subject: [PATCH 021/202] checkov: fix broken build Overriden `cyclonedx-python-lib` fails to build because one of its dependency had a change of name. Therefore, we patch it by hand for it to work. Also added the missing dependency `cachetools`. --- pkgs/by-name/ch/checkov/package.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index eb2466dfc8ef..86fc0a9a84f4 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -17,6 +17,18 @@ let tag = "v${version}"; hash = "sha256-nklizCiu7Nmynjd5WU5oX/v2TWy9xFVF4GkmCwFKZLI="; }; + + # The `serializable` package eventually got renamed `py_serializable`, therefore we need + # to patch the imports; + # _c.f._ https://github.com/madpah/serializable/pull/155 . + postPatch = '' + find . -name '*.py' | xargs -I{} sed -i \ + -e 's/serializable\./py_serializable\./g' \ + -e 's/@serializable/@py_serializable/g' \ + -e 's/from serializable/from py_serializable/g' \ + -e 's/import serializable/import py_serializable/g' \ + {} + ''; }); }; }; @@ -41,8 +53,8 @@ python3.pkgs.buildPythonApplication rec { "bc-python-hcl2" "boto3" "botocore" + "cachetools" "cloudsplaining" - "cyclonedx-python-lib" "dpath" "igraph" "importlib-metadata" From 94ef8b69d6b96ddae090ca066a8896d74ce64bee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 08:39:45 +0000 Subject: [PATCH 022/202] dbus-cpp: 5.0.4 -> 5.0.5 --- pkgs/by-name/db/dbus-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix index d00ffc4d1e84..0b234fb4d48d 100644 --- a/pkgs/by-name/db/dbus-cpp/package.nix +++ b/pkgs/by-name/db/dbus-cpp/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dbus-cpp"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lib-cpp/dbus-cpp"; tag = finalAttrs.version; - hash = "sha256-ki4bnwRpvmB9yzt/Mn3MQs1Dr6Vrcs2D0tvCjvvfmq4="; + hash = "sha256-+QqmZsBFmYRwaAFqRyMBxVFFrjZGBDdMaW4YD/7D2gU="; }; outputs = [ From 8260f049b96a3e911a50c9138e9e7a4eaffedbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Fri, 12 Sep 2025 19:52:58 +0700 Subject: [PATCH 023/202] =?UTF-8?q?h2o:=202.3.0-rolling-2025-09-05=20?= =?UTF-8?q?=E2=86=92=202.3.0-rolling-2025-09-12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 88553c5fe451..bb778644aef3 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2025-09-05"; + version = "2.3.0-rolling-2025-09-12"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "3b9b6a53cac8bcc6a25fb28df81ad295fc5f9402"; - hash = "sha256-GJdZxGHQ6FWznY/PO3YN0yyfQ7RX8ilgEzXA4XciOqk="; + rev = "0a240b56de6c49940ec8b16fe2c224528b17e4b1"; + hash = "sha256-Mn9BSIPp/PZZA6+q1msdhlpuJ9A8Wk11oAWe3Jzioug="; }; outputs = [ From 21a288bffbed5752a22f5dedd462b01e08348dd7 Mon Sep 17 00:00:00 2001 From: Sapphire Date: Fri, 12 Sep 2025 16:29:53 -0500 Subject: [PATCH 024/202] alcom: 1.0.1 -> 1.1.4 --- pkgs/by-name/al/alcom/deps.json | 92 ------------------- .../al/alcom/disable-updater-artifacts.patch | 8 +- pkgs/by-name/al/alcom/package.nix | 47 +--------- 3 files changed, 9 insertions(+), 138 deletions(-) delete mode 100644 pkgs/by-name/al/alcom/deps.json diff --git a/pkgs/by-name/al/alcom/deps.json b/pkgs/by-name/al/alcom/deps.json deleted file mode 100644 index f20f43450945..000000000000 --- a/pkgs/by-name/al/alcom/deps.json +++ /dev/null @@ -1,92 +0,0 @@ -[ - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "8.0.1", - "hash": "sha256-vAqIkIrtqiJbQ8ngqSfxLA4XUyfqO1lr7NiYch5+TTc=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "8.0.1", - "hash": "sha256-QbUQXjCzr8j8u/5X0af9jE++EugdoxMhT08F49MZX74=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", - "version": "8.0.1", - "hash": "sha256-tiSDf189+7K788Z2qVmsP3PeUzkByUCtcjXR9onOdXA=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", - "version": "8.0.1", - "hash": "sha256-tYR6xGWvWoR0ITYHra9bsOxIhzhe/GYNVpB4R7KkKik=" - }, - { - "pname": "Microsoft.DotNet.ILCompiler", - "version": "8.0.1", - "hash": "sha256-u4JMGIe/rmXOzx+Y2tC5qlkP5aNVMHy6AQnYwxsXsN4=" - }, - { - "pname": "Microsoft.NET.ILLink.Tasks", - "version": "8.0.1", - "hash": "sha256-SopZpGaZ48/8dpUwDFDM3ix+g1rP4Yqs1PGuzRp+K7c=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "8.0.1", - "hash": "sha256-g4RhRWUP4o3dkNt2hV0ZNRRwDGIuAJ6gY02d3xhtFzY=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "8.0.1", - "hash": "sha256-+fUVeiQ2qXBtP4HI+8+/SLqZOEuKi9/zC/pX9g+rhqs=" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-arm64", - "version": "8.0.1", - "hash": "sha256-aRGVm8Ckd+uhkuAnJAuqHH6+muT+sXf+b+6nZ/Md77c=" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-x64", - "version": "8.0.1", - "hash": "sha256-UiJ5KdJdLg+/eDHsC4HgvYaY9h3av+/92VPoEixHDgQ=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "8.0.1", - "hash": "sha256-JeYU02u4ln0v56QeCs+8ZLWhRlNxZ6c/xHr8Jy3koww=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "8.0.1", - "hash": "sha256-jajBI5GqG2IIcsIMgxTHfXbMapoXrZGl/EEhShwYq7w=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", - "version": "8.0.1", - "hash": "sha256-TJbkjj3koeFN068auqXUojMLPrihO6sEMIPqglW7uTE=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-x64", - "version": "8.0.1", - "hash": "sha256-SYctZpDlsEHxmy+/Oa1Qp99mpx8I7icYoSBKczF1Ybo=" - }, - { - "pname": "runtime.linux-arm64.Microsoft.DotNet.ILCompiler", - "version": "8.0.1", - "hash": "sha256-oCzhhcSp2ZZ+R8ITzhVn21nmT+R6upf3IzsRtke4xxY=" - }, - { - "pname": "runtime.linux-x64.Microsoft.DotNet.ILCompiler", - "version": "8.0.1", - "hash": "sha256-BMDOdOJFDuItIL8gbYKJdoycvf2rJ8RI8FHsaaYYflY=" - }, - { - "pname": "runtime.osx-arm64.Microsoft.DotNet.ILCompiler", - "version": "8.0.1", - "hash": "sha256-7FJEqNLs8DvqsSJQZETbL2uvRrqO5M1ReWCYkXtqVAE=" - }, - { - "pname": "runtime.osx-x64.Microsoft.DotNet.ILCompiler", - "version": "8.0.1", - "hash": "sha256-WOJqlt/ONpCqhfB2S++rY+iRqW6mlAddxGoqaC/boCM=" - } -] diff --git a/pkgs/by-name/al/alcom/disable-updater-artifacts.patch b/pkgs/by-name/al/alcom/disable-updater-artifacts.patch index adc26d420178..17e739d312c6 100644 --- a/pkgs/by-name/al/alcom/disable-updater-artifacts.patch +++ b/pkgs/by-name/al/alcom/disable-updater-artifacts.patch @@ -1,5 +1,5 @@ diff --git a/vrc-get-gui/Tauri.toml b/vrc-get-gui/Tauri.toml -index ff969dbb..1339d861 100644 +index cd180da8..66a81aa9 100644 --- a/vrc-get-gui/Tauri.toml +++ b/vrc-get-gui/Tauri.toml @@ -34,8 +34,6 @@ icon = [ @@ -8,6 +8,6 @@ index ff969dbb..1339d861 100644 -createUpdaterArtifacts = "v1Compatible" # remove if ci # we do not generate updater artifacts in CI - - [bundle.linux.deb] - desktopTemplate = "alcom.desktop" - + [[bundle.fileAssociations]] + # note: for macOS we directory use info.plist for registering file association. + description = "ALCOM Project Template" diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index 95b60c92cca5..bc2cba3bcfd2 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -1,8 +1,6 @@ { - buildDotnetModule, cargo-about, cargo-tauri, - dotnetCorePackages, fetchFromGitHub, fetchNpmDeps, glib-networking, @@ -20,33 +18,16 @@ }: let pname = "alcom"; - version = "1.0.1"; + version = "1.1.4"; src = fetchFromGitHub { owner = "vrc-get"; repo = "vrc-get"; tag = "gui-v${version}"; - fetchSubmodules = true; - hash = "sha256-cOx7X3xfTBYpXhv1zIRStaIpyGWSp+d7qzdJLGzXtDY="; + hash = "sha256-pGWDMQIS2WgtnqRoOXRZrc25kJ5c6TY6UE2aZtpxN/s="; }; subdir = "vrc-get-gui"; - - dotnetSdk = dotnetCorePackages.sdk_8_0; - dotnetRuntime = dotnetCorePackages.runtime_8_0; - - dotnetBuild = buildDotnetModule { - inherit pname version src; - - dotnet-sdk = dotnetSdk; - dotnet-runtime = dotnetRuntime; - - projectFile = [ - "vrc-get-litedb/dotnet/vrc-get-litedb.csproj" - "vrc-get-litedb/dotnet/LiteDB/LiteDB/LiteDB.csproj" - ]; - nugetDeps = ./deps.json; - }; in rustPlatform.buildRustPackage { inherit pname version src; @@ -58,7 +39,6 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ cargo-about cargo-tauri.hook - dotnetSdk nodejs npmHooks.npmConfigHook wrapGAppsHook4 @@ -73,35 +53,18 @@ rustPlatform.buildRustPackage { libsoup_3 makeBinaryWrapper webkitgtk_4_1 - ] - ++ dotnetSdk.packages - ++ dotnetBuild.nugetDeps; + ]; - cargoHash = "sha256-Ph6QZW21JYQJgrUecN+MklWuY51iKC2glPEdgxw+3r8="; + cargoHash = "sha256-JuZHfpOYuLNdb03srECx73GK5ajgL6bHlbKbiuMN2NE="; buildAndTestSubdir = subdir; npmDeps = fetchNpmDeps { inherit src; sourceRoot = "${src.name}/${subdir}"; - hash = "sha256-lWQPBILZn8VGoILfEY2bMxGaBL2ALGbvcT5RqanTNyY="; + hash = "sha256-snXOfAtanLPhQNo0mg/r8UUXJua2X+52t7+7QS1vOkI="; }; npmRoot = subdir; - preConfigure = '' - dotnet restore "vrc-get-litedb/dotnet/vrc-get-litedb.csproj" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true - ''; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram $out/bin/ALCOM \ - --set APPIMAGE ALCOM - ''; - - passthru = { - inherit (dotnetBuild) fetch-deps; - }; - meta = { description = "Experimental GUI application to manage VRChat Unity Projects"; homepage = "https://github.com/vrc-get/vrc-get"; From 530b79aa41318d78645ed9e7b4cbb796f9928a21 Mon Sep 17 00:00:00 2001 From: Sapphire Date: Fri, 12 Sep 2025 17:03:09 -0500 Subject: [PATCH 025/202] alcom: fix meta.mainProgram --- pkgs/by-name/al/alcom/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index bc2cba3bcfd2..f4905db6beda 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -71,6 +71,6 @@ rustPlatform.buildRustPackage { license = lib.licenses.mit; maintainers = with lib.maintainers; [ Scrumplex ]; broken = stdenv.hostPlatform.isDarwin; - mainProgram = "alcom"; + mainProgram = "ALCOM"; }; } From 2cd2faedd88375f7b252ba0ad52ca085c2109a0c Mon Sep 17 00:00:00 2001 From: blenderfreaky Date: Fri, 12 Sep 2025 14:12:20 +0200 Subject: [PATCH 026/202] emhash: init at 1.0.1 --- pkgs/by-name/em/emhash/package.nix | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/em/emhash/package.nix diff --git a/pkgs/by-name/em/emhash/package.nix b/pkgs/by-name/em/emhash/package.nix new file mode 100644 index 000000000000..8a66cc2f4e7d --- /dev/null +++ b/pkgs/by-name/em/emhash/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "emhash"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "ktprime"; + repo = "emhash"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dFj/QaGdTJYdcxKlS9tES6OHae8xPMnrG9ccRNM/hi8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + # By default, it will try to build the benchmark suite, + # but we only care about the headers copied by the install target. + "-DWITH_BENCHMARKS=Off" + ]; + + passthru.update-script = nix-update-script { }; + + meta = { + homepage = "https://github.com/ktprime/emhash"; + changelog = "https://github.com/ktprime/emhash/releases/tag/v${finalAttrs.version}"; + description = "Fast and memory efficient c++ flat hash map/set"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ blenderfreaky ]; + platforms = lib.platforms.all; + }; +}) From 5c43592f4f5f4c024d235563701a0fd12de40f4a Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 13 Sep 2025 09:46:21 +0200 Subject: [PATCH 027/202] nixos/meilisearch: allow access to proc for memory limit Meilisearch requires access to more infomration in /proc to caluclate it's memory limits Resolves #441978 --- nixos/modules/services/search/meilisearch.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index f8e7bb573ca9..8a32cf302fa1 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -256,7 +256,9 @@ in LockPersonality = true; MemoryDenyWriteExecute = true; - ProcSubset = "pid"; + # Meilisearch needs to determine cgroup memory limits to set its own memory limits. + # This means this can't be set to "pid" + ProcSubset = "all"; ProtectProc = "invisible"; NoNewPrivileges = true; From cd5b7a7ee7e297fdd3a14dc5a824348c8b698535 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 13 Sep 2025 12:08:23 -0400 Subject: [PATCH 028/202] maintainers: remove thyol Inactive on nixpkgs for more than 1 year despite 7 pull requests requesting their review. --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/di/diamond/package.nix | 2 +- pkgs/by-name/et/etesync-dav/package.nix | 1 - pkgs/by-name/mu/muscle/package.nix | 1 - pkgs/by-name/sr/sratoolkit/package.nix | 1 - pkgs/by-name/ve/veryfasttree/package.nix | 2 +- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dc243490f1a1..5a0ea4f46f0a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25903,12 +25903,6 @@ name = "Chinmay D. Pai"; keys = [ { fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; } ]; }; - thyol = { - name = "thyol"; - email = "thyol@pm.me"; - github = "thyol"; - githubId = 81481634; - }; tiagolobocastro = { email = "tiagolobocastro@gmail.com"; github = "tiagolobocastro"; diff --git a/pkgs/by-name/di/diamond/package.nix b/pkgs/by-name/di/diamond/package.nix index 8f4d70d146c4..cd1e59ca6804 100644 --- a/pkgs/by-name/di/diamond/package.nix +++ b/pkgs/by-name/di/diamond/package.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/bbuchfink/diamond"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ thyol ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix index c9cb508296cc..979a20a36dc8 100644 --- a/pkgs/by-name/et/etesync-dav/package.nix +++ b/pkgs/by-name/et/etesync-dav/package.nix @@ -46,7 +46,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "etesync-dav"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ - thyol valodim ]; broken = stdenv.hostPlatform.isDarwin; # pyobjc-framework-Cocoa is missing diff --git a/pkgs/by-name/mu/muscle/package.nix b/pkgs/by-name/mu/muscle/package.nix index ef63da97cf76..7d85ef8aebdb 100644 --- a/pkgs/by-name/mu/muscle/package.nix +++ b/pkgs/by-name/mu/muscle/package.nix @@ -36,7 +36,6 @@ gccStdenv.mkDerivation rec { homepage = "https://www.drive5.com/muscle/"; maintainers = with maintainers; [ unode - thyol ]; }; } diff --git a/pkgs/by-name/sr/sratoolkit/package.nix b/pkgs/by-name/sr/sratoolkit/package.nix index fae32aa5a2b1..19c1a3ef599a 100644 --- a/pkgs/by-name/sr/sratoolkit/package.nix +++ b/pkgs/by-name/sr/sratoolkit/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Collection of tools and libraries for using data in the INSDC Sequence Read Archives"; license = lib.licenses.ncbiPd; maintainers = with lib.maintainers; [ - thyol t4ccer ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ve/veryfasttree/package.nix b/pkgs/by-name/ve/veryfasttree/package.nix index 89487a913eae..101337caefd6 100644 --- a/pkgs/by-name/ve/veryfasttree/package.nix +++ b/pkgs/by-name/ve/veryfasttree/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "VeryFastTree"; homepage = "https://github.com/citiususc/veryfasttree"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ thyol ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) From 32d5aa7059099ea0e654c49edf44ea7e1e9f75f5 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 13 Sep 2025 12:23:09 -0400 Subject: [PATCH 029/202] maintainers: remove artuuge Totally inactive on GitHub since 2023, despite many PRs in which they were tagged. --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/ar/argtable/package.nix | 2 +- pkgs/by-name/cl/clblas/package.nix | 2 +- pkgs/by-name/ep/epson-escpr/package.nix | 2 +- pkgs/by-name/li/libcpuid/package.nix | 1 - pkgs/development/python-modules/pycuda/default.nix | 2 +- pkgs/development/python-modules/pytools/default.nix | 2 +- 7 files changed, 5 insertions(+), 12 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dc243490f1a1..43ea6cdfcb46 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2203,12 +2203,6 @@ githubId = 4679721; name = "Artur Cygan"; }; - artuuge = { - email = "artuuge@gmail.com"; - github = "artuuge"; - githubId = 10285250; - name = "Artur E. Ruuge"; - }; arunoruto = { email = "mirza.arnaut45@gmail.com"; github = "arunoruto"; diff --git a/pkgs/by-name/ar/argtable/package.nix b/pkgs/by-name/ar/argtable/package.nix index cb874b99da80..8a6a7b6c5314 100644 --- a/pkgs/by-name/ar/argtable/package.nix +++ b/pkgs/by-name/ar/argtable/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { are essential but tedious to implement for a robust CLI program. ''; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ artuuge ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix index 12d59ec6d89e..a168188c8d2d 100644 --- a/pkgs/by-name/cl/clblas/package.nix +++ b/pkgs/by-name/cl/clblas/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { This package contains a library of BLAS functions on top of OpenCL. ''; license = licenses.asl20; - maintainers = with maintainers; [ artuuge ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; diff --git a/pkgs/by-name/ep/epson-escpr/package.nix b/pkgs/by-name/ep/epson-escpr/package.nix index a90a7f95e675..f7e09e922f3a 100644 --- a/pkgs/by-name/ep/epson-escpr/package.nix +++ b/pkgs/by-name/ep/epson-escpr/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { nssmdns4 = true; };''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ artuuge ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix index 39af93507db1..5018b719b89a 100644 --- a/pkgs/by-name/li/libcpuid/package.nix +++ b/pkgs/by-name/li/libcpuid/package.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ orivej - artuuge ]; platforms = platforms.x86; }; diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index bec89563e1e3..f0740908d6ea 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -76,6 +76,6 @@ buildPythonPackage rec { homepage = "https://github.com/inducer/pycuda/"; description = "CUDA integration for Python"; license = licenses.mit; - maintainers = with maintainers; [ artuuge ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 457b6d21d0f6..9b5de647dcb8 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/inducer/pytools/"; changelog = "https://github.com/inducer/pytools/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ artuuge ]; + maintainers = with lib.maintainers; [ ]; }; } From fae62a354f9206ddb2844317bc91e1201093edfa Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 13 Sep 2025 12:34:56 -0400 Subject: [PATCH 030/202] maintainers: remove yuuyins Totally inactive on GitHub since 2023. --- maintainers/maintainer-list.nix | 8 -------- pkgs/by-name/br/brmodelo/package.nix | 2 +- pkgs/by-name/jf/jflap/package.nix | 1 - pkgs/by-name/md/mdbook-epub/package.nix | 1 - pkgs/by-name/ni/nix-tour/package.nix | 1 - pkgs/by-name/st/stargate-libcds/package.nix | 2 +- pkgs/by-name/st/strictdoc/package.nix | 2 +- pkgs/by-name/sv/svgcleaner/package.nix | 2 +- pkgs/by-name/zi/zix/package.nix | 2 +- pkgs/by-name/zr/zrythm/package.nix | 1 - pkgs/development/libraries/libsbsms/common.nix | 2 +- pkgs/development/python-modules/datauri/default.nix | 2 +- .../python-modules/django-debug-toolbar/default.nix | 2 +- pkgs/development/python-modules/pymarshal/default.nix | 2 +- pkgs/development/python-modules/reqif/default.nix | 2 +- pkgs/development/python-modules/textx/default.nix | 2 +- pkgs/development/python-modules/wavefile/default.nix | 2 +- 17 files changed, 12 insertions(+), 24 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dc243490f1a1..5a41ef8c441c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28592,14 +28592,6 @@ githubId = 37774475; name = "Yusuf Duran"; }; - yuu = { - email = "yuunix@grrlz.net"; - matrix = "@yuu:matrix.org"; - github = "yuuyins"; - githubId = 86538850; - name = "Yuu Yin"; - keys = [ { fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; } ]; - }; yvan-sraka = { email = "yvan@sraka.xyz"; github = "yvan-sraka"; diff --git a/pkgs/by-name/br/brmodelo/package.nix b/pkgs/by-name/br/brmodelo/package.nix index 409b2e82cabb..05091a73916c 100644 --- a/pkgs/by-name/br/brmodelo/package.nix +++ b/pkgs/by-name/br/brmodelo/package.nix @@ -127,6 +127,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/chcandido/brModelo"; license = licenses.gpl3; mainProgram = "brmodelo"; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/by-name/jf/jflap/package.nix b/pkgs/by-name/jf/jflap/package.nix index fbc7a152c8ce..8f40b8794261 100644 --- a/pkgs/by-name/jf/jflap/package.nix +++ b/pkgs/by-name/jf/jflap/package.nix @@ -67,7 +67,6 @@ stdenvNoCC.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ grnnja - yuu ]; platforms = jre8.meta.platforms; }; diff --git a/pkgs/by-name/md/mdbook-epub/package.nix b/pkgs/by-name/md/mdbook-epub/package.nix index 47ba7ab77374..45824e68e41c 100644 --- a/pkgs/by-name/md/mdbook-epub/package.nix +++ b/pkgs/by-name/md/mdbook-epub/package.nix @@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://michael-f-bryan.github.io/mdbook-epub"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ - yuu matthiasbeyer ]; }; diff --git a/pkgs/by-name/ni/nix-tour/package.nix b/pkgs/by-name/ni/nix-tour/package.nix index 53d9124ff435..4fb5d9121f93 100644 --- a/pkgs/by-name/ni/nix-tour/package.nix +++ b/pkgs/by-name/ni/nix-tour/package.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ qknight - yuu ]; mainProgram = "nix-tour"; }; diff --git a/pkgs/by-name/st/stargate-libcds/package.nix b/pkgs/by-name/st/stargate-libcds/package.nix index 362abbd11d16..b39821e94c8d 100644 --- a/pkgs/by-name/st/stargate-libcds/package.nix +++ b/pkgs/by-name/st/stargate-libcds/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C data structure library"; homepage = "https://github.com/stargateaudio/libcds"; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; license = licenses.lgpl3Only; }; } diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index 9e234753ccc9..da8f4ba31267 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/strictdoc-project/strictdoc"; changelog = "https://github.com/strictdoc-project/strictdoc/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ yuu ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "strictdoc"; }; } diff --git a/pkgs/by-name/sv/svgcleaner/package.nix b/pkgs/by-name/sv/svgcleaner/package.nix index 2cb0a2c60345..dfcc36d40cea 100644 --- a/pkgs/by-name/sv/svgcleaner/package.nix +++ b/pkgs/by-name/sv/svgcleaner/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/RazrFalcon/SVGCleaner"; changelog = "https://github.com/RazrFalcon/svgcleaner/releases"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; mainProgram = "svgcleaner"; }; } diff --git a/pkgs/by-name/zi/zix/package.nix b/pkgs/by-name/zi/zix/package.nix index 4aefc8fbecb2..e9a57e08a99a 100644 --- a/pkgs/by-name/zi/zix/package.nix +++ b/pkgs/by-name/zi/zix/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/drobilla/zix/-/blob/${src.rev}/NEWS"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/zr/zrythm/package.nix b/pkgs/by-name/zr/zrythm/package.nix index a61eef83bc09..df928b135fd3 100644 --- a/pkgs/by-name/zr/zrythm/package.nix +++ b/pkgs/by-name/zr/zrythm/package.nix @@ -208,7 +208,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ tshaynik magnetophon - yuu astavie PowerUser64 ]; diff --git a/pkgs/development/libraries/libsbsms/common.nix b/pkgs/development/libraries/libsbsms/common.nix index d1144ce2759c..a4e5e72a4518 100644 --- a/pkgs/development/libraries/libsbsms/common.nix +++ b/pkgs/development/libraries/libsbsms/common.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { inherit homepage; description = "Subband sinusoidal modeling library for time stretching and pitch scaling audio"; - maintainers = with lib.maintainers; [ yuu ]; + maintainers = with lib.maintainers; [ ]; license = lib.licenses.gpl2; platforms = lib.platforms.all; }; diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index 87da3ec656d3..a2b40cab29f9 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/fcurella/python-datauri"; changelog = "https://github.com/fcurella/python-datauri/releases/tag/${src.tag}"; license = licenses.unlicense; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index a497e80beb69..49a94dfe4487 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -70,6 +70,6 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-debug-toolbar"; changelog = "https://django-debug-toolbar.readthedocs.io/en/latest/changes.html"; license = licenses.bsd3; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index 95acb47df0c0..b95074abb86b 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Python data serialization library"; homepage = "https://github.com/stargateaudio/pymarshal"; - maintainers = with lib.maintainers; [ yuu ]; + maintainers = with lib.maintainers; [ ]; license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index 884c0905e21e..308e6bc15233 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/strictdoc-project/reqif"; changelog = "https://github.com/strictdoc-project/reqif/releases/tag/${src.tag}"; license = licenses.asl20; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix index cffd4d5483f2..41d6f6e6596f 100644 --- a/pkgs/development/python-modules/textx/default.nix +++ b/pkgs/development/python-modules/textx/default.nix @@ -62,7 +62,7 @@ let mainProgram = "textx"; homepage = "https://github.com/textx/textx/"; license = licenses.mit; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; }; diff --git a/pkgs/development/python-modules/wavefile/default.nix b/pkgs/development/python-modules/wavefile/default.nix index c36b099f26d0..3634732ca7e3 100644 --- a/pkgs/development/python-modules/wavefile/default.nix +++ b/pkgs/development/python-modules/wavefile/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { description = "Pythonic libsndfile wrapper to read and write audio files"; homepage = "https://github.com/vokimon/python-wavefile"; changelog = "https://github.com/vokimon/python-wavefile#version-history"; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; }; } From 6717c331a5b69a9f0cf3022ff619342e45f6e934 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Wed, 10 Sep 2025 20:15:54 +0200 Subject: [PATCH 031/202] capnproto: add patch to fix powerpc-linux build --- pkgs/by-name/ca/capnproto/fix-libatomic.patch | 35 +++++++++++++++++++ pkgs/by-name/ca/capnproto/package.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/by-name/ca/capnproto/fix-libatomic.patch diff --git a/pkgs/by-name/ca/capnproto/fix-libatomic.patch b/pkgs/by-name/ca/capnproto/fix-libatomic.patch new file mode 100644 index 000000000000..a72036c463d8 --- /dev/null +++ b/pkgs/by-name/ca/capnproto/fix-libatomic.patch @@ -0,0 +1,35 @@ +From dfbbc505817bd0c3e01af5865196629c2a2a2b5e Mon Sep 17 00:00:00 2001 +From: Marie Ramlow +Date: Wed, 10 Sep 2025 20:12:39 +0200 +Subject: [PATCH] Check if libatomic is needed + +--- + c++/src/kj/CMakeLists.txt | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt +index 7114ddb80e..8ce355b8b0 100644 +--- a/c++/src/kj/CMakeLists.txt ++++ b/c++/src/kj/CMakeLists.txt +@@ -84,6 +84,21 @@ target_compile_features(kj PUBLIC cxx_std_20) + if(UNIX AND NOT ANDROID) + target_link_libraries(kj PUBLIC pthread) + endif() ++ ++include(CheckCXXSourceCompiles) ++check_cxx_source_compiles("#include ++int main() { ++ std::atomic w1; ++ std::atomic w2; ++ std::atomic w4; ++ std::atomic w8; ++ return ++w1 + ++w2 + ++w4 + ++w8; ++}" CAPNP_BUILDS_WITHOUT_LIBATOMIC) ++ ++if(NOT CAPNP_BUILDS_WITHOUT_LIBATOMIC) ++ target_link_libraries(kj PUBLIC atomic) ++endif() ++ + #make sure the lite flag propagates to all users (internal + external) of this library + target_compile_definitions(kj PUBLIC ${CAPNP_LITE_FLAG}) + #make sure external consumers don't need to manually set the include dirs diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix index 10e758fcfa39..5dce43d12f35 100644 --- a/pkgs/by-name/ca/capnproto/package.nix +++ b/pkgs/by-name/ca/capnproto/package.nix @@ -46,6 +46,8 @@ clangStdenv.mkDerivation rec { patches = [ # https://github.com/capnproto/capnproto/pull/2377 ./fix-libucontext.patch + # https://github.com/capnproto/capnproto/pull/2410 + ./fix-libatomic.patch ]; nativeBuildInputs = [ From 3b41a66a68033ab214fee18c75b8cb9283801bd9 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 14 Sep 2025 09:45:11 +1200 Subject: [PATCH 032/202] nixos/tests/bcachefs: update meta.maintainers Inherit maintainers from bcachefs-tools package. --- nixos/tests/bcachefs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 868c6b347adb..24b5daf04534 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -1,7 +1,9 @@ { pkgs, ... }: { name = "bcachefs"; - meta.maintainers = with pkgs.lib.maintainers; [ Madouura ]; + meta = { + inherit (pkgs.bcachefs-tools.meta) maintainers; + }; nodes.machine = { pkgs, ... }: From 2bbce79b7f9054a9557d7b3127051dbdf54215ef Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Sun, 14 Sep 2025 10:48:03 +0200 Subject: [PATCH 033/202] pythonPackages.apycula: 0.21 -> 0.25 --- pkgs/development/python-modules/apycula/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 2d882dc92005..32932d8ec878 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -9,15 +9,14 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.21"; + version = "0.25"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit version; - pname = "Apycula"; - hash = "sha256-rh+1U1bqyrX3Mv1HUl22ykUHx5Zaq59suc7ZVAOi0mo="; + inherit pname version; + hash = "sha256-CLrceuZbmGygZtPM0ETVvsBosjY3FlQDo0sJh2I1uF0="; }; build-system = [ setuptools-scm ]; From 982ede4108972fad3e7f7e77f08039ebeaa78402 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 14 Sep 2025 09:49:37 +1200 Subject: [PATCH 034/202] nixos/tests/zeronet: update meta.maintainers Inherit maintainers from zeronet package. --- nixos/modules/services/networking/zeronet.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index d293aa05758f..fd85f29e300e 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -133,5 +133,7 @@ with lib; ] "Zeronet will log by default in /var/lib/zeronet") ]; - meta.maintainers = with maintainers; [ Madouura ]; + meta = { + inherit (pkgs.zeronet) maintainers; + }; } From 9daf1fa76cc2e4bf8201782ba28d750035283816 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 14 Sep 2025 10:06:57 +1200 Subject: [PATCH 035/202] dumb: remove --- pkgs/applications/misc/lutris/fhsenv.nix | 1 - pkgs/by-name/du/dumb/package.nix | 38 ------------------------ pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/by-name/du/dumb/package.nix diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index af0a3989708a..98f5c355d226 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -79,7 +79,6 @@ buildFHSEnv { # Adventure Game Studio allegro - dumb # Battle.net jansson diff --git a/pkgs/by-name/du/dumb/package.nix b/pkgs/by-name/du/dumb/package.nix deleted file mode 100644 index 48d25f2601fd..000000000000 --- a/pkgs/by-name/du/dumb/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - allegro, - SDL2, -}: - -stdenv.mkDerivation rec { - pname = "dumb"; - version = "2.0.3"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - allegro - SDL2 - ]; - - src = fetchFromGitHub { - owner = "kode54"; - repo = "dumb"; - rev = version; - sha256 = "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6"; - }; - - cmakeFlags = [ - "-DBUILD_EXAMPLES='OFF'" - ]; - - meta = with lib; { - homepage = "https://github.com/kode54/dumb"; - description = "Module/tracker based music format parser and player library"; - license = licenses.free; # Derivative of GPL - maintainers = with maintainers; [ Madouura ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7a170f07622e..4da52440e64d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -794,6 +794,7 @@ mapAliases { du-dust = dust; # Added 2024-01-19 duckstation = throw "'duckstation' has been removed due to being unmaintained"; # Added 2025-08-03 duckstation-bin = throw "'duckstation-bin' has been removed due to being unmaintained"; # Added 2025-08-03 + dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14 dump1090 = dump1090-fa; # Added 2024-02-12 dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17 From 25229a538ed4775e089d98eb7f0b78e4c8ca79c1 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 14 Sep 2025 22:07:20 +1200 Subject: [PATCH 036/202] prboom-plus: remove --- pkgs/by-name/pr/prboom-plus/package.nix | 63 ------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 pkgs/by-name/pr/prboom-plus/package.nix diff --git a/pkgs/by-name/pr/prboom-plus/package.nix b/pkgs/by-name/pr/prboom-plus/package.nix deleted file mode 100644 index 9367745fc611..000000000000 --- a/pkgs/by-name/pr/prboom-plus/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - SDL2, - SDL2_mixer, - SDL2_image, - SDL2_net, - fluidsynth, - soundfont-fluid, - portmidi, - dumb, - libvorbis, - libmad, - pcre, -}: - -stdenv.mkDerivation rec { - pname = "prboom-plus"; - version = "2.6.66"; - - src = fetchFromGitHub { - owner = "coelckers"; - repo = "prboom-plus"; - rev = "v${version}"; - sha256 = "sha256-moU/bZ2mS1QfKPP6HaAwWP1nRNZ4Ue5DFl9zBBrJiHw="; - }; - - sourceRoot = "${src.name}/prboom2"; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - SDL2 - SDL2_mixer - SDL2_image - SDL2_net - fluidsynth - portmidi - dumb - libvorbis - libmad - pcre - ]; - - # Fixes impure path to soundfont - prePatch = '' - substituteInPlace src/m_misc.c --replace \ - "/usr/share/sounds/sf3/default-GM.sf3" \ - "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2" - ''; - - meta = with lib; { - homepage = "https://github.com/coelckers/prboom-plus"; - description = "Advanced, Vanilla-compatible Doom engine based on PrBoom"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.ashley ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4da52440e64d..69fe31099a0b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2042,6 +2042,7 @@ mapAliases { polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18 poppler_utils = poppler-utils; # Added 2025-02-27 powerline-rs = throw "'powerline-rs' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 + prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14 premake3 = throw "'premake3' has been removed since it is unmaintained. Consider using 'premake' instead"; # Added 2025-05-10 prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 From 1c5a1d77f87594f3e8fa6bcdad2983b69864ac7b Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 14 Sep 2025 10:11:00 +1200 Subject: [PATCH 037/202] maintainers: remove Madouura Maintainer has not been active in nixpkgs for over a year, and not been responding to maintainer pings for even longer. --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/misc/lutris/default.nix | 1 - pkgs/by-name/ar/ares/package.nix | 3 --- pkgs/by-name/bc/bcachefs-tools/package.nix | 1 - pkgs/by-name/bl/blaze/package.nix | 1 - pkgs/by-name/do/dolphin-emu-primehack/package.nix | 1 - pkgs/by-name/ea/easyjson/package.nix | 1 - pkgs/by-name/fr/frugally-deep/package.nix | 1 - pkgs/by-name/ge/geticons/package.nix | 1 - pkgs/by-name/ko/kokkos/package.nix | 1 - pkgs/by-name/qu/quicktemplate/package.nix | 1 - pkgs/by-name/ra/rapidjson/package.nix | 1 - pkgs/by-name/sn/sndio/package.nix | 1 - pkgs/by-name/st/statik/package.nix | 1 - pkgs/by-name/sv/svt-av1/package.nix | 1 - pkgs/by-name/te/tetrd/package.nix | 1 - pkgs/by-name/te/tewisay/package.nix | 1 - pkgs/by-name/ti/tinygo/package.nix | 1 - pkgs/by-name/to/tokyonight-gtk-theme/package.nix | 1 - pkgs/by-name/tr/triton-llvm/package.nix | 1 - pkgs/by-name/vl/vlang/package.nix | 1 - pkgs/development/python-modules/barectf/default.nix | 1 - .../python-modules/desktop-entry-lib/default.nix | 1 - pkgs/development/python-modules/merkletools/default.nix | 1 - pkgs/development/python-modules/protonup-ng/default.nix | 1 - .../python-modules/sphinx-markdown-tables/default.nix | 1 - pkgs/development/python-modules/triton/default.nix | 1 - 27 files changed, 34 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dc243490f1a1..3401af7e0bd1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15431,12 +15431,6 @@ name = "madonius"; matrix = "@madonius:entropia.de"; }; - Madouura = { - email = "madouura@gmail.com"; - github = "Madouura"; - githubId = 93990818; - name = "Madoura"; - }; maeve = { email = "mrey@mailbox.org"; matrix = "@maeve:catgirl.cloud"; diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 1b30138301e0..481f524194b4 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -156,7 +156,6 @@ buildPythonApplication rec { description = "Open Source gaming platform for GNU/Linux"; license = licenses.gpl3Plus; maintainers = with maintainers; [ - Madouura rapiteanu ]; platforms = platforms.linux; diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index 49889b2ee150..39d4bb316fba 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -121,9 +121,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Open-source multi-system emulator with a focus on accuracy and preservation"; license = lib.licenses.isc; mainProgram = "ares"; - maintainers = with lib.maintainers; [ - Madouura - ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 537a4c520508..1aa5118417dc 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -134,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ davidak johnrtitor - Madouura ]; platforms = lib.platforms.linux; mainProgram = "bcachefs"; diff --git a/pkgs/by-name/bl/blaze/package.nix b/pkgs/by-name/bl/blaze/package.nix index 4b0568307701..793a318d45c0 100644 --- a/pkgs/by-name/bl/blaze/package.nix +++ b/pkgs/by-name/bl/blaze/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: { description = "High performance C++ math library"; homepage = "https://bitbucket.org/blaze-lib/blaze"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix index 7a7651ca334d..25f704b90df3 100644 --- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix +++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix @@ -168,7 +168,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ Madouura ]; broken = stdenv.hostPlatform.isDarwin; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ea/easyjson/package.nix b/pkgs/by-name/ea/easyjson/package.nix index 97d6ddd6f845..17686896ed13 100644 --- a/pkgs/by-name/ea/easyjson/package.nix +++ b/pkgs/by-name/ea/easyjson/package.nix @@ -23,6 +23,5 @@ buildGoModule rec { description = "Fast JSON serializer for Go"; mainProgram = "easyjson"; license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix index 7435378c68f4..a07509644fb7 100644 --- a/pkgs/by-name/fr/frugally-deep/package.nix +++ b/pkgs/by-name/fr/frugally-deep/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Header-only library for using Keras (TensorFlow) models in C++"; homepage = "https://github.com/Dobiasd/frugally-deep"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/ge/geticons/package.nix b/pkgs/by-name/ge/geticons/package.nix index 8abc67d636a7..323f8c3c5660 100644 --- a/pkgs/by-name/ge/geticons/package.nix +++ b/pkgs/by-name/ge/geticons/package.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { mainProgram = "geticons"; homepage = "https://git.sr.ht/~zethra/geticons"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix index 4c3f199d7677..51ec26644676 100644 --- a/pkgs/by-name/ko/kokkos/package.nix +++ b/pkgs/by-name/ko/kokkos/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { asl20 llvm-exception ]; - maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/qu/quicktemplate/package.nix b/pkgs/by-name/qu/quicktemplate/package.nix index 6f6afe08d811..68409b3e7314 100644 --- a/pkgs/by-name/qu/quicktemplate/package.nix +++ b/pkgs/by-name/qu/quicktemplate/package.nix @@ -20,7 +20,6 @@ buildGoModule rec { homepage = "https://github.com/valyala/quicktemplate"; description = "Fast, powerful, yet easy to use template engine for Go"; license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; mainProgram = "qtc"; }; } diff --git a/pkgs/by-name/ra/rapidjson/package.nix b/pkgs/by-name/ra/rapidjson/package.nix index 44f01c91763e..0307b3458b95 100644 --- a/pkgs/by-name/ra/rapidjson/package.nix +++ b/pkgs/by-name/ra/rapidjson/package.nix @@ -90,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.dotlambda - lib.maintainers.Madouura lib.maintainers.tobim ]; }; diff --git a/pkgs/by-name/sn/sndio/package.nix b/pkgs/by-name/sn/sndio/package.nix index aa5ba4e85abd..96be144f53d0 100644 --- a/pkgs/by-name/sn/sndio/package.nix +++ b/pkgs/by-name/sn/sndio/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ Madouura ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/st/statik/package.nix b/pkgs/by-name/st/statik/package.nix index 8c965a73220d..ac3db0c0f565 100644 --- a/pkgs/by-name/st/statik/package.nix +++ b/pkgs/by-name/st/statik/package.nix @@ -32,6 +32,5 @@ buildGoModule rec { description = "Embed files into a Go executable"; mainProgram = "statik"; license = licenses.asl20; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/by-name/sv/svt-av1/package.nix b/pkgs/by-name/sv/svt-av1/package.nix index 71d65c1d9311..53eed9de216e 100644 --- a/pkgs/by-name/sv/svt-av1/package.nix +++ b/pkgs/by-name/sv/svt-av1/package.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { aom bsd3 ]; - maintainers = with maintainers; [ Madouura ]; mainProgram = "SvtAv1EncApp"; platforms = platforms.unix; }; diff --git a/pkgs/by-name/te/tetrd/package.nix b/pkgs/by-name/te/tetrd/package.nix index d979ba73d92b..d716e7f3fa71 100644 --- a/pkgs/by-name/te/tetrd/package.nix +++ b/pkgs/by-name/te/tetrd/package.nix @@ -82,6 +82,5 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/by-name/te/tewisay/package.nix b/pkgs/by-name/te/tewisay/package.nix index 0a5a57534db7..50a5fa78a04a 100644 --- a/pkgs/by-name/te/tewisay/package.nix +++ b/pkgs/by-name/te/tewisay/package.nix @@ -36,7 +36,6 @@ buildGoModule { homepage = "https://github.com/raymond-w-ko/tewisay"; description = "Cowsay replacement with unicode and partial ansi escape support"; license = with licenses; [ cc0 ]; - maintainers = with maintainers; [ Madouura ]; mainProgram = "tewisay"; }; } diff --git a/pkgs/by-name/ti/tinygo/package.nix b/pkgs/by-name/ti/tinygo/package.nix index 7dd741b3a795..7c09a99dba2b 100644 --- a/pkgs/by-name/ti/tinygo/package.nix +++ b/pkgs/by-name/ti/tinygo/package.nix @@ -144,7 +144,6 @@ buildGoModule rec { description = "Go compiler for small places"; license = licenses.bsd3; maintainers = with maintainers; [ - Madouura muscaln ]; }; diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix index fda9841253de..c7bd9417ccb7 100644 --- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix +++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix @@ -120,7 +120,6 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ garaiza-93 - Madouura d3vil0p3r ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix index 2d0b979f8494..84593c31a908 100644 --- a/pkgs/by-name/tr/triton-llvm/package.nix +++ b/pkgs/by-name/tr/triton-llvm/package.nix @@ -218,7 +218,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ ncsa ]; maintainers = with lib.maintainers; [ SomeoneSerge - Madouura ]; platforms = with lib.platforms; aarch64 ++ x86; }; diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix index dcf860d20446..f61d8d4fd8bd 100644 --- a/pkgs/by-name/vl/vlang/package.nix +++ b/pkgs/by-name/vl/vlang/package.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation { description = "Simple, fast, safe, compiled language for developing maintainable software"; license = licenses.mit; maintainers = with maintainers; [ - Madouura delta231 ]; mainProgram = "v"; diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix index 968570904067..f3d7187a5e3e 100644 --- a/pkgs/development/python-modules/barectf/default.nix +++ b/pkgs/development/python-modules/barectf/default.nix @@ -50,6 +50,5 @@ buildPythonPackage rec { mainProgram = "barectf"; homepage = "https://github.com/efficios/barectf"; license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/python-modules/desktop-entry-lib/default.nix b/pkgs/development/python-modules/desktop-entry-lib/default.nix index 1c84612d8f60..69fca060ab38 100644 --- a/pkgs/development/python-modules/desktop-entry-lib/default.nix +++ b/pkgs/development/python-modules/desktop-entry-lib/default.nix @@ -31,6 +31,5 @@ buildPythonPackage rec { homepage = "https://codeberg.org/JakobDev/desktop-entry-lib"; changelog = "https://codeberg.org/JakobDev/desktop-entry-lib/releases/tag/${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/python-modules/merkletools/default.nix b/pkgs/development/python-modules/merkletools/default.nix index 71e8a51b4e03..5dc519c801c1 100644 --- a/pkgs/development/python-modules/merkletools/default.nix +++ b/pkgs/development/python-modules/merkletools/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { homepage = "https://github.com/Tierion/pymerkletools"; changelog = "https://github.com/Tierion/pymerkletools/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/python-modules/protonup-ng/default.nix b/pkgs/development/python-modules/protonup-ng/default.nix index 8e69e1c743d3..b082dd68299c 100644 --- a/pkgs/development/python-modules/protonup-ng/default.nix +++ b/pkgs/development/python-modules/protonup-ng/default.nix @@ -36,7 +36,6 @@ buildPythonPackage rec { description = "CLI program and API to automate the installation and update of GloriousEggroll's Proton-GE"; license = licenses.gpl3Only; maintainers = with maintainers; [ - Madouura cafkafk ]; mainProgram = "protonup"; diff --git a/pkgs/development/python-modules/sphinx-markdown-tables/default.nix b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix index 6c9d36c69f0c..373bbd63e184 100644 --- a/pkgs/development/python-modules/sphinx-markdown-tables/default.nix +++ b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix @@ -26,7 +26,6 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension for rendering tables written in markdown"; homepage = "https://github.com/ryanfox/sphinx-markdown-tables"; - maintainers = with maintainers; [ Madouura ]; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index c22016654700..10094f9accee 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -317,7 +317,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ SomeoneSerge - Madouura derdennisop ]; }; From 443a8b8c04ae8fd8e102db008f137a100f8a55ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Sep 2025 10:49:33 -0700 Subject: [PATCH 038/202] python3Packages.decli: 0.6.1 -> 0.6.3 Diff: https://github.com/woile/decli/compare/v0.6.1...v0.6.3 Changelog: https://github.com/woile/decli/blob/v0.6.3/CHANGELOG.md --- .../python-modules/decli/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/decli/default.nix b/pkgs/development/python-modules/decli/default.nix index 5eb381bfb1cd..9f328a75bee3 100644 --- a/pkgs/development/python-modules/decli/default.nix +++ b/pkgs/development/python-modules/decli/default.nix @@ -2,36 +2,33 @@ lib, buildPythonPackage, fetchFromGitHub, + poetry-core, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "decli"; - version = "0.6.1"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "0.6.3"; + pyproject = true; src = fetchFromGitHub { owner = "woile"; repo = "decli"; tag = "v${version}"; - hash = "sha256-FZYKNKkQExx/YBn5y/W0+0aMlenuwEctYTL7LAXMZGE="; + hash = "sha256-W4GURqlkHzDwrPAlmiBjc2ZqN//nUK084uRMM7GIme0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "decli" ]; - meta = with lib; { + meta = { description = "Minimal, easy to use, declarative command line interface tool"; homepage = "https://github.com/Woile/decli"; - changelog = "https://github.com/woile/decli/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; + changelog = "https://github.com/woile/decli/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lovesegfault ]; }; } From 1254586fce41a52047700b8bf35a67074ecffb07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Sep 2025 10:33:03 -0700 Subject: [PATCH 039/202] commitizen: remove from python3Packages It does not provide a Python API. --- .../co/commitizen/package.nix} | 37 +++++-------------- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 10 insertions(+), 32 deletions(-) rename pkgs/{development/python-modules/commitizen/default.nix => by-name/co/commitizen/package.nix} (83%) diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/by-name/co/commitizen/package.nix similarity index 83% rename from pkgs/development/python-modules/commitizen/default.nix rename to pkgs/by-name/co/commitizen/package.nix index 1337a6add589..70594cfb5193 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/by-name/co/commitizen/package.nix @@ -2,40 +2,19 @@ lib, commitizen, fetchFromGitHub, - buildPythonPackage, gitMinimal, - pythonOlder, stdenv, installShellFiles, - poetry-core, nix-update-script, + python3Packages, testers, - argcomplete, - charset-normalizer, - colorama, - decli, - importlib-metadata, - jinja2, - packaging, - pyyaml, - questionary, - termcolor, - tomlkit, - py, - pytest-freezer, - pytest-mock, - pytest-regressions, - pytest7CheckHook, - deprecated, }: -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "commitizen"; version = "4.8.3"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "commitizen-tools"; repo = "commitizen"; @@ -49,11 +28,11 @@ buildPythonPackage rec { "termcolor" ]; - build-system = [ poetry-core ]; + build-system = with python3Packages; [ poetry-core ]; nativeBuildInputs = [ installShellFiles ]; - dependencies = [ + dependencies = with python3Packages; [ argcomplete charset-normalizer colorama @@ -68,15 +47,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + gitMinimal + ] + ++ (with python3Packages; [ argcomplete deprecated - gitMinimal py pytest-freezer pytest-mock pytest-regressions pytest7CheckHook - ]; + ]); pythonImportsCheck = [ "commitizen" ]; @@ -105,7 +86,7 @@ buildPythonPackage rec { postInstall = let - register-python-argcomplete = lib.getExe' argcomplete "register-python-argcomplete"; + register-python-argcomplete = lib.getExe' python3Packages.argcomplete "register-python-argcomplete"; in lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cz \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e7cd627f9e0..68703a4069e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1919,8 +1919,6 @@ with pkgs; extraPackages = [ ffmpeg ]; }; - commitizen = with python3Packages; toPythonApplication commitizen; - compactor = callPackage ../applications/networking/compactor { protobuf = protobuf_21; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f7fdd98b5baf..f080601af58f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -160,6 +160,7 @@ mapAliases ({ codespell = throw "codespell has been promoted to a top-level attribute name: `pkgs.codespell`"; # Added 2022-10-02 ColanderAlchemy = colanderalchemy; # added 2023-02-19 command_runner = command-runner; # added 2024-03-06 + commitizen = throw "commitizen has been promoted to a top-level attribute name: `pkgs.commitizen`"; # added 2025-09-14 CommonMark = commonmark; # added 2023-02-1 ConfigArgParse = configargparse; # added 2021-03-18 configshell = configshell-fb; # added 2025-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e8d639a9658..54036bc65da1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2895,8 +2895,6 @@ self: super: with self; { commentjson = callPackage ../development/python-modules/commentjson { }; - commitizen = callPackage ../development/python-modules/commitizen { }; - commoncode = callPackage ../development/python-modules/commoncode { }; commonmark = callPackage ../development/python-modules/commonmark { }; From 0616a7c13933be18d32c480624db691dd59582f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Sep 2025 10:35:03 -0700 Subject: [PATCH 040/202] commitizen: 4.8.3 -> 4.9.1 Diff: https://github.com/commitizen-tools/commitizen/compare/v4.8.3...v4.9.1 Changelog: https://github.com/commitizen-tools/commitizen/blob/v4.9.1/CHANGELOG.md --- pkgs/by-name/co/commitizen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/commitizen/package.nix b/pkgs/by-name/co/commitizen/package.nix index 70594cfb5193..a6c02ab71f05 100644 --- a/pkgs/by-name/co/commitizen/package.nix +++ b/pkgs/by-name/co/commitizen/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "commitizen"; - version = "4.8.3"; + version = "4.9.1"; pyproject = true; src = fetchFromGitHub { owner = "commitizen-tools"; repo = "commitizen"; tag = "v${version}"; - hash = "sha256-ukmLvv1/Ez04UhwXcb5QYiVWXCV7LvYd13Go6ASxsxI="; + hash = "sha256-vHA+TvKs9TOu/0/FpxLHHbDgshQFhP9Dwe6ZMnUOBKc="; }; pythonRelaxDeps = [ @@ -37,6 +37,7 @@ python3Packages.buildPythonPackage rec { charset-normalizer colorama decli + deprecated importlib-metadata jinja2 packaging @@ -51,7 +52,6 @@ python3Packages.buildPythonPackage rec { ] ++ (with python3Packages; [ argcomplete - deprecated py pytest-freezer pytest-mock From d35ec6acd230409d1f4c6b1ee029985e9dbdb7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Sep 2025 10:41:52 -0700 Subject: [PATCH 041/202] commitizen: modernize --- pkgs/by-name/co/commitizen/package.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/co/commitizen/package.nix b/pkgs/by-name/co/commitizen/package.nix index a6c02ab71f05..6d323466d044 100644 --- a/pkgs/by-name/co/commitizen/package.nix +++ b/pkgs/by-name/co/commitizen/package.nix @@ -7,7 +7,8 @@ installShellFiles, nix-update-script, python3Packages, - testers, + versionCheckHook, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonPackage rec { @@ -49,6 +50,8 @@ python3Packages.buildPythonPackage rec { nativeCheckInputs = [ gitMinimal + versionCheckHook + writableTmpDirAsHomeHook ] ++ (with python3Packages; [ argcomplete @@ -59,13 +62,12 @@ python3Packages.buildPythonPackage rec { pytest7CheckHook ]); + versionCheckProgramArg = "version"; + pythonImportsCheck = [ "commitizen" ]; # The tests require a functional git installation - # which requires a valid HOME directory. preCheck = '' - export HOME="$(mktemp -d)" - git config --global user.name "Nix Builder" git config --global user.email "nix-builder@nixos.org" git init . @@ -97,19 +99,15 @@ python3Packages.buildPythonPackage rec { passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = commitizen; - command = "cz version"; - }; }; - meta = with lib; { + meta = { description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs"; homepage = "https://github.com/commitizen-tools/commitizen"; - changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; + changelog = "https://github.com/commitizen-tools/commitizen/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; mainProgram = "cz"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ lovesegfault anthonyroussel ]; From 0c18f6b0c3d3ea200cce0ed13879843841f8508f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Sep 2025 21:07:31 -0700 Subject: [PATCH 042/202] python3Packages.spyder-kernels: run tests --- .../python-modules/spyder-kernels/default.nix | 48 ++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 993a6ce62554..c51129b7b0a9 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,6 +14,22 @@ pyxdg, pyzmq, wurlitzer, + + # tests + anyio, + django, + flaky, + h5py, + numpy, + pandas, + pillow, + polars, + pyarrow, + pydicom, + pytestCheckHook, + scipy, + writableTmpDirAsHomeHook, + xarray, }: buildPythonPackage rec { @@ -44,8 +60,36 @@ buildPythonPackage rec { wurlitzer ]; - # No tests - doCheck = false; + nativeCheckInputs = [ + anyio + django + flaky + h5py + numpy + pandas + pillow + polars + pyarrow + pydicom + pytestCheckHook + scipy + writableTmpDirAsHomeHook + xarray + ]; + + disabledTests = [ + "test_umr_reload_modules" + # OSError: Kernel failed to start + "test_debug_namespace" + "test_enter_debug_after_interruption" + "test_global_message" + "test_interrupt_long_sleep" + "test_interrupt_short_loop" + "test_matplotlib_inline" + "test_multiprocessing" + "test_np_threshold" + "test_runfile" + ]; pythonImportsCheck = [ "spyder_kernels" ]; From 1b5247288b31a2c98de2c17670f1efe6929edc81 Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Sun, 14 Sep 2025 10:48:40 +0200 Subject: [PATCH 043/202] nextpnr: 0.8 -> 0.9 Closes: #439087 Closes: #437337 --- pkgs/by-name/ne/nextpnr/package.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index fcfbc48c6f9f..f293b4e6351b 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -23,20 +23,13 @@ let }; pname = "nextpnr"; - version = "0.8"; - - prjxray_src = fetchFromGitHub { - owner = "f4pga"; - repo = "prjxray"; - rev = "faf9c774a340e39cf6802d009996ed6016e63521"; - hash = "sha256-BEv7vJoOHWHZoc9EXbesfwFFClkuiSpVwHUrj4ahUcA="; - }; + version = "0.9"; prjbeyond_src = fetchFromGitHub { owner = "YosysHQ-GmbH"; repo = "prjbeyond-db"; - rev = "06d3b424dd0e52d678087c891c022544238fb9e3"; - hash = "sha256-nmyFFUO+/J2lb+lPATEjdYq0d21P1fN3N94JXR8brZ0="; + rev = "f49f66be674d9857c657930353b867ba94bcbdd7"; + hash = "sha256-B/VmKgMu6f2Y8umE+NgGD5W0FYBIfDcMVwgHocFzreA="; }; in @@ -47,7 +40,7 @@ stdenv.mkDerivation rec { owner = "YosysHQ"; repo = "nextpnr"; tag = "${pname}-${version}"; - hash = "sha256-lconcmLACxWxC41fTIkUaGbfp79G98YdHA4mRJ9Qo1w="; + hash = "sha256-rpg99k7rSNU4p5D0iXipLgNNOA2j0PdDsz8JTxyYNPM="; fetchSubmodules = true; }; @@ -80,9 +73,12 @@ stdenv.mkDerivation rec { "-DTRELLIS_LIBDIR=${trellis}/lib/trellis" "-DGOWIN_BBA_EXECUTABLE=${python3Packages.apycula}/bin/gowin_bba" "-DUSE_OPENMP=ON" - "-DHIMBAECHEL_UARCH=all" + + # gatemate excluded due to non-reproducible build https://github.com/YosysHQ/prjpeppercorn/issues/9 + # xilinx excluded due to needing vivado https://github.com/f4pga/prjxray?tab=readme-ov-file#step-1 + "-DHIMBAECHEL_UARCH=example;gowin;ng-ultra" + "-DHIMBAECHEL_GOWIN_DEVICES=all" - "-DHIMBAECHEL_PRJXRAY_DB=${prjxray_src}" "-DHIMBAECHEL_PRJBEYOND_DB=${prjbeyond_src}" ] ++ (lib.optional enableGui "-DBUILD_GUI=ON"); From 63a7dae8bdb7a2ed25f9e6b65f16c09fd62034a9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 15 Sep 2025 15:56:10 +0700 Subject: [PATCH 044/202] cyclone-scheme: 0.34.0 -> 0.36.0, mark broken on darwin --- pkgs/by-name/cy/cyclone-scheme/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/cy/cyclone-scheme/package.nix b/pkgs/by-name/cy/cyclone-scheme/package.nix index 178c427c63ae..ee9618ae9a16 100644 --- a/pkgs/by-name/cy/cyclone-scheme/package.nix +++ b/pkgs/by-name/cy/cyclone-scheme/package.nix @@ -7,7 +7,7 @@ }: let - version = "0.34.0"; + version = "0.36.0"; bootstrap = stdenv.mkDerivation { pname = "cyclone-bootstrap"; inherit version; @@ -16,7 +16,7 @@ let owner = "justinethier"; repo = "cyclone-bootstrap"; rev = "v${version}"; - sha256 = "sha256-kJBPb0Ej32HveY/vdGpH2gyxSwq8Xq7muneFIw3Y7hM="; + sha256 = "sha256-8WK4rsLK3gi9a6PKFaT3KRK256rEDTTO6QvqYrOtYDs="; }; enableParallelBuilding = true; @@ -36,7 +36,7 @@ stdenv.mkDerivation { owner = "justinethier"; repo = "cyclone"; rev = "v${version}"; - sha256 = "sha256-4U/uOTbFpPTC9BmO6Wkhy4PY8UCFVt5eHSGqrOlKT/U="; + sha256 = "sha256-5h8jZ8EBgiLLYH/j3p7CqsQGXHhjGtQfOnxPbFnT5WM="; }; enableParallelBuilding = true; @@ -47,10 +47,12 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with lib; { + meta = { homepage = "https://justinethier.github.io/cyclone/"; description = "Brand-new compiler that allows practical application development using R7RS Scheme"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siraben ]; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; }; } From be6b98a88e119c5164928169e12fc50b21cd4e5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Sep 2025 11:14:23 +0000 Subject: [PATCH 045/202] python3Packages.llama-index-cli: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/llama-index-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index 62517983f525..38b71768f64c 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-LrlCYjLo2J/98PpnhP+NoJRJ2SDXHQ/MgdB76Tz5Np8="; + hash = "sha256-BEYVnYXFbCkCLByDDJiG9nDV9Z1pNDw8Apo7IO2hqdg="; }; build-system = [ hatchling ]; From 6c726de7268aabd6be3a69aab4a1543f53cb5506 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Wed, 27 Aug 2025 21:30:11 +0200 Subject: [PATCH 046/202] kexec-tools: mark powerpc-linux as bad platform --- pkgs/by-name/ke/kexec-tools/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix index 9c32fb24d70d..d4afe126caa4 100644 --- a/pkgs/by-name/ke/kexec-tools/package.nix +++ b/pkgs/by-name/ke/kexec-tools/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { "riscv32-linux" "sparc-linux" "sparc64-linux" + "powerpc-linux" ]; license = licenses.gpl2Only; mainProgram = "kexec"; From 37f4e53db56923761952cacf15a1f8f26d820f66 Mon Sep 17 00:00:00 2001 From: Katalin Rebhan Date: Mon, 15 Sep 2025 20:18:53 +0200 Subject: [PATCH 047/202] open5gs{,-webui}: fix webui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As it is now, the built webui won’t work since to be able to start it, it needs node_modules and the .next directory. Restore the normal NPM installPhase which will copy all the necessary files. The webui isn’t used during the main open5gs build, so move it to its own separate package. --- pkgs/by-name/op/open5gs-webui/package.nix | 13 +++++++++++++ pkgs/by-name/op/open5gs/package.nix | 20 -------------------- 2 files changed, 13 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/op/open5gs-webui/package.nix diff --git a/pkgs/by-name/op/open5gs-webui/package.nix b/pkgs/by-name/op/open5gs-webui/package.nix new file mode 100644 index 000000000000..76d6c28d1241 --- /dev/null +++ b/pkgs/by-name/op/open5gs-webui/package.nix @@ -0,0 +1,13 @@ +{ + buildNpmPackage, + open5gs, +}: + +buildNpmPackage (finalAttrs: { + pname = "${open5gs.pname}-webui"; + inherit (open5gs) src version meta; + + sourceRoot = "${finalAttrs.src.name}/webui"; + + npmDepsHash = "sha256-IpqineYa15GBqoPDJ7RpaDsq+MQIIDcdq7yhwmH4Lzo="; +}) diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix index a632a445d2f0..5cd935064901 100644 --- a/pkgs/by-name/op/open5gs/package.nix +++ b/pkgs/by-name/op/open5gs/package.nix @@ -1,7 +1,5 @@ { stdenv, - nodejs, - buildNpmPackage, lib, fetchFromGitHub, meson, @@ -62,21 +60,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2k+S+OXfdskJPtDUFSxb/+2UZcUiOZzRSSGgsEJWolc="; }; - webui = buildNpmPackage { - pname = finalAttrs.pname + "-webui"; - inherit (finalAttrs) src version meta; - - sourceRoot = "${finalAttrs.src.name}/webui"; - - npmDepsHash = "sha256-IpqineYa15GBqoPDJ7RpaDsq+MQIIDcdq7yhwmH4Lzo="; - - installPhase = '' - rm -rf node_modules - mkdir $out - cp -r * $out - ''; - }; - nativeBuildInputs = [ meson ninja @@ -113,9 +96,6 @@ stdenv.mkDerivation (finalAttrs: { cp -R --no-preserve=mode,ownership ${finalAttrs.diameter} subprojects/freeDiameter cp -R --no-preserve=mode,ownership ${finalAttrs.libtins} subprojects/libtins cp -R --no-preserve=mode,ownership ${finalAttrs.promc} subprojects/prometheus-client-c - - rm -rf webui/* - cp -r ${finalAttrs.webui}/* webui/ ''; postInstall = '' From 19da87792f417276c7d289200708b4af6fd2c6d6 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 16 Sep 2025 03:09:19 +0100 Subject: [PATCH 048/202] python3Packages.thriftpy2: apply upstream patch to remove toml dep - PR https://github.com/NixOS/nixpkgs/pull/431074 updated this package from 0.5.2 -> 0.5.3. - Between 0.5.2 and 0.5.3 a dependency for `toml` was added (see https://github.com/Thriftpy/thriftpy2/commit/8e226b12750829ee48abc1f883ea0fcf0b13f717). - The derivation does not include `toml`, so the build failed. - However, upstream have since removed `toml` in https://github.com/Thriftpy/thriftpy2/commit/0127d259eb4b96acb060cd158ca709f0597b148c. - A new upstream version has not been made yet, so apply the patch directly to fix the build. When upstream bumps, the patch can be removed. --- pkgs/development/python-modules/thriftpy2/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index 03ac0195c2d3..d3ebd886d6bf 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, cython, fetchFromGitHub, + fetchpatch, ply, pythonOlder, six, @@ -24,6 +25,12 @@ buildPythonPackage rec { hash = "sha256-idUKqpyRj8lq9Aq6vEEeYEawzRPOdNsySnkgfhwPtMc="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Thriftpy/thriftpy2/commit/0127d259eb4b96acb060cd158ca709f0597b148c.patch"; + sha256 = "sha256-UBcbd8NTkPyko1s9jTjKlQ7HprwtyOZS0m66u1CPH3A="; + }) + ]; build-system = [ setuptools ]; nativeBuildInputs = [ cython ]; From 50a8e2a474b4291fda4ae786b4da825822d28d10 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 16 Sep 2025 16:46:24 +0200 Subject: [PATCH 049/202] mir: 2.22.0 -> 2.22.1 Changes: https://github.com/canonical/mir/releases/tag/v2.22.1 --- pkgs/servers/mir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index ef46416f1d7f..6c521e671de7 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -5,8 +5,8 @@ let in { mir = common { - version = "2.22.0"; - hash = "sha256-46FxyS4Anm1id63GUUCzn9ubTQIvs1+HrXKgZki6fQw="; + version = "2.22.1"; + hash = "sha256-NESLpKedoI+WjnwmtmdTvqo+mbCopb2wCA5J4t49YSk="; }; mir_2_15 = common { From c7e00447194154630ea33ad4453e5b35c1720eaa Mon Sep 17 00:00:00 2001 From: Eric Kim-Butler Date: Thu, 11 Sep 2025 15:59:00 -0400 Subject: [PATCH 050/202] calibre: 8.7.0 -> 8.10.0 --- pkgs/by-name/ca/calibre/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 8d887c7026f5..c47115de90a6 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, cmake, + espeak-ng, fetchpatch, ffmpeg, fontconfig, @@ -18,6 +19,7 @@ libusb1, libwebp, nix-update-script, + onnxruntime, optipng, piper-tts, pkg-config, @@ -36,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "8.7.0"; + version = "8.10.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-LP5Yfjdz2GB/6LvvvNd7XPuBYSTKyJ5JE1PeuPL6kyQ="; + hash = "sha256-ByDUoF9C5FE8ZlQ/zP4H43b9+zUIsgah5/FO5mtXsMU="; }; patches = [ @@ -79,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + espeak-ng ffmpeg fontconfig hunspell @@ -91,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { libstemmer libuchardet libusb1 - piper-tts + onnxruntime podofo_0_10 poppler-utils qt6.qtbase @@ -145,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional unrarSupport unrardll )) + piper-tts xdg-utils ] ++ lib.optional speechSupport speechd-minimal; From 73bb91a546915d17bb7be6d3052c660731a83a31 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 20 Jun 2025 16:30:51 -0600 Subject: [PATCH 051/202] datadog-agent: 7.56.2 -> 7.70.2 https://github.com/DataDog/datadog-agent/releases/tag/7.70.2 Diff: https://github.com/DataDog/datadog-agent/compare/7.56.2...7.70.2 --- .../networking/dd-agent/datadog-agent.nix | 22 +++++++++---------- .../networking/dd-agent/integrations-core.nix | 16 +++++--------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 9f4da6aa77d6..edd4ed74468f 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -18,17 +18,17 @@ let # keep this in sync with github.com/DataDog/agent-payload dependency - payloadVersion = "5.0.124"; + payloadVersion = "5.0.164"; python = pythonPackages.python; owner = "DataDog"; repo = "datadog-agent"; goPackagePath = "github.com/${owner}/${repo}"; - version = "7.56.2"; + version = "7.70.2"; src = fetchFromGitHub { inherit owner repo; - rev = version; - hash = "sha256-rU3eg92MuGs/6r7oJho2roeUCZoyfqYt1xOERoRPqmQ="; + tag = version; + hash = "sha256-yXtybHWrm+6kWW396FLlRZI0YVuThGuLfSYzoNXAEBU="; }; rtloader = stdenv.mkDerivation { pname = "datadog-agent-rtloader"; @@ -49,11 +49,7 @@ buildGoModule rec { doCheck = false; - vendorHash = - if stdenv.hostPlatform.isDarwin then - "sha256-3Piq5DPMTZUEjqNkw5HZY25An2kATX6Jac9unQfZnZc=" - else - "sha256-FR0Et3DvjJhbYUPy9mpN0QCJ7QDU4VRZFUTL0J1FSXw="; + vendorHash = "sha256-iWOwhfSI7mLmDy6yewV0h9Y4pjYAV6Tz6TxsINOxYMg="; subPackages = [ "cmd/agent" @@ -67,10 +63,14 @@ buildGoModule rec { makeWrapper ]; buildInputs = [ rtloader ] ++ lib.optionals withSystemd [ systemd ]; - PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; + + proxyVendor = true; + + env.PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; tags = [ "ec2" + "kubelet" "python" "process" "log" @@ -97,7 +97,7 @@ buildGoModule rec { postPatch = '' sed -e "s|PyChecksPath =.*|PyChecksPath = filepath.Join(_here, \"..\", \"${python.sitePackages}\")|" \ -e "s|distPath =.*|distPath = filepath.Join(_here, \"..\", \"share\", \"datadog-agent\")|" \ - -i cmd/agent/common/path/path_nix.go + -i pkg/util/defaultpaths/path_nix.go sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \ -i pkg/util/hostname/fqdn_nix.go ''; diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix index 263b5f51d277..5cd012ad4434 100644 --- a/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -42,14 +42,14 @@ let inherit (lib) attrValues mapAttrs; + version = "7.70.2"; src = fetchFromGitHub { owner = "DataDog"; repo = "integrations-core"; - rev = version; - sha256 = "sha256-p5eoNNHQQl314mfUk2t3qQaerPu02GKA+tKkAY7bojk="; + tag = version; + hash = "sha256-3H8nQpy/m53ZjtDfe6s89yowBXnPt+1ARfWxcx+JwQM="; }; - version = "7.56.2"; # Build helper to build a single datadog integration package. buildIntegration = @@ -75,19 +75,13 @@ let pname = "checks-base"; sourceRoot = "datadog_checks_base"; - # Make setuptools build the 'base' and 'checks' modules. - postPatch = '' - substituteInPlace setup.py \ - --replace "from setuptools import setup" "from setuptools import find_packages, setup" \ - --replace "packages=['datadog_checks']" "packages=find_packages()" - ''; - - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ binary cachetools cryptography immutables jellyfish + lazy-loader prometheus-client protobuf pydantic From 88c093983b65789cc0df6f26f47b07f2c463d0f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Sep 2025 19:47:00 +0000 Subject: [PATCH 052/202] python3Packages.aioshelly: 13.9.0 -> 13.10.0 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index d7c62e7c3143..f4c3e6a2fbd5 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "13.9.0"; + version = "13.10.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-G8iZmgrTR+hqrRLoEdnJnqzU8GFQUrOrGenL6hkjtps="; + hash = "sha256-sN8Qr+ZgKBaZbTgQSGujdZmA3N0fBMFEPnUIWiBkPhg="; }; build-system = [ setuptools ]; From 00470853e5631f237a958c3b081642a6fdd80ac4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 16 Sep 2025 18:43:09 -0400 Subject: [PATCH 053/202] julia_111: 1.11.6 -> 1.11.7 --- pkgs/development/compilers/julia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 1a37dd5df768..640e7c8d5002 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -79,8 +79,8 @@ in ); julia_111 = wrapJulia ( callPackage (import ./generic.nix { - version = "1.11.6"; - hash = "sha256-smje9BrcF0lsPg59y14nssvmocYcePZGNUTF9Mc0Foo="; + version = "1.11.7"; + hash = "sha256-puluy9YAV8kdx6mfwbN1F7Nhot+P0cRv/a0dm86Jln0="; patches = [ ./patches/1.11/0002-skip-failing-and-flaky-tests.patch ]; From 2608a877889a9ecd653ad8539a997ea2f0143151 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 16 Sep 2025 18:44:42 -0400 Subject: [PATCH 054/202] julia_111-bin: 1.11.6 -> 1.11.7 --- pkgs/development/compilers/julia/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 640e7c8d5002..7c42fb497b5c 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -42,12 +42,12 @@ in ); julia_111-bin = wrapJulia ( callPackage (import ./generic-bin.nix { - version = "1.11.6"; + version = "1.11.7"; sha256 = { - x86_64-linux = "e99e52e2029d845097c68f2372d836186f0eb3fb897a9dde0bdf9ee9250d03d5"; - aarch64-linux = "c2c5cdce017cacadaccb7d22aa070f549e4e87c4bb10f15853170ddcb50bf5f4"; - x86_64-darwin = "195a897e031595f59821dbcaf87514faa8d64220334b285c3e9809fce4958f79"; - aarch64-darwin = "01caaa9c25fa1f071003807c8a6739de4941b5ec13751131128e00e21880e639"; + x86_64-linux = "aa5924114ecb89fd341e59aa898cd1882b3cb622ca4972582c1518eff5f68c05"; + aarch64-linux = "f97f80b35c12bdaf40c26f6c55dbb7617441e49c9e6b842f65e8410a388ca6f4"; + x86_64-darwin = "b2c11315df39da478ab0fa77fb228f3fd818f1eaf42dc5cc1223c703f7122fe5"; + aarch64-darwin = "74df9d4755a7740d141b04524a631e2485da9d65065d934e024232f7ba0790b6"; }; }) { } ); From b32bb54834d2cafe1d25f871fb37831f8788ee70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 17 Sep 2025 13:36:38 +0200 Subject: [PATCH 055/202] treewide: set CI=true for pnpm prune In a recent PNPM version `pnpm prune` started creating a confirmation prompt which was automatically denied, as there was no TTY. Adding CI environment variable will make sure there are no prompts. --- pkgs/by-name/ba/bash-language-server/package.nix | 2 +- pkgs/by-name/em/emmet-language-server/package.nix | 2 +- pkgs/by-name/et/etherpad-lite/package.nix | 2 +- pkgs/by-name/fo/folo/package.nix | 2 +- pkgs/by-name/je/jellyseerr/package.nix | 2 +- pkgs/by-name/n8/n8n/package.nix | 2 +- pkgs/by-name/st/stylelint-lsp/package.nix | 2 +- pkgs/by-name/ts/tsx/package.nix | 2 +- pkgs/by-name/vu/vue-language-server/package.nix | 2 +- pkgs/by-name/zi/zipline/package.nix | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix index e11f3b35dd7a..1fc4de499a2c 100644 --- a/pkgs/by-name/ba/bash-language-server/package.nix +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { preInstall = '' # remove unnecessary files rm node_modules/.modules.yaml - pnpm --ignore-scripts --prod prune + CI=true pnpm --ignore-scripts --prod prune rm -r node_modules/.pnpm/@mixmark-io*/node_modules/@mixmark-io/domino/{test,.yarn} find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + # https://github.com/pnpm/pnpm/issues/3645 diff --git a/pkgs/by-name/em/emmet-language-server/package.nix b/pkgs/by-name/em/emmet-language-server/package.nix index b29dfe084c91..a9a9e566d2d4 100644 --- a/pkgs/by-name/em/emmet-language-server/package.nix +++ b/pkgs/by-name/em/emmet-language-server/package.nix @@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # remove unnecessary and non-deterministic files preInstall = '' - pnpm --ignore-scripts --prod prune + CI=true pnpm --ignore-scripts --prod prune find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + # https://github.com/pnpm/pnpm/issues/3645 find node_modules -xtype l -delete diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix index bbeeecc224d5..ffc5a6f0ac49 100644 --- a/pkgs/by-name/et/etherpad-lite/package.nix +++ b/pkgs/by-name/et/etherpad-lite/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { preInstall = '' # remove unnecessary files rm node_modules/.modules.yaml - pnpm prune --prod --ignore-scripts + CI=true pnpm prune --prod --ignore-scripts find -type f \( -name "*.d.ts" -o -name "*.map" \) -exec rm -rf {} + # remove non-deterministic files diff --git a/pkgs/by-name/fo/folo/package.nix b/pkgs/by-name/fo/folo/package.nix index 2503f7132bff..20a2b970fe2c 100644 --- a/pkgs/by-name/fo/folo/package.nix +++ b/pkgs/by-name/fo/folo/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { cd ../.. # Remove dev dependencies. - pnpm --ignore-scripts prune --prod + CI=true pnpm --ignore-scripts prune --prod # Clean up broken symlinks left behind by `pnpm prune` find node_modules/.bin -xtype l -delete diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index 2478508925ec..400e2e0703ad 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild pnpm build - pnpm prune --prod --ignore-scripts + CI=true pnpm prune --prod --ignore-scripts rm -rf .next/cache # Clean up broken symlinks left behind by `pnpm prune` diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 23cd287f845b..a00211a2d263 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { rm node_modules/.modules.yaml rm packages/nodes-base/dist/types/nodes.json - pnpm --ignore-scripts prune --prod + CI=true pnpm --ignore-scripts prune --prod find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + rm -rf node_modules/.pnpm/{typescript*,prettier*} shopt -s globstar diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix index 6fc0ac292506..b7e4d9dad204 100644 --- a/pkgs/by-name/st/stylelint-lsp/package.nix +++ b/pkgs/by-name/st/stylelint-lsp/package.nix @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { preInstall = '' # remove unnecessary files - pnpm --ignore-scripts prune --prod + CI=true pnpm --ignore-scripts prune --prod rm -rf node_modules/.pnpm/typescript* find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + # https://github.com/pnpm/pnpm/issues/3645 diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix index faa25ee6f5a1..e17dabd445a2 100644 --- a/pkgs/by-name/ts/tsx/package.nix +++ b/pkgs/by-name/ts/tsx/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # remove devDependencies that are only required to build # and package the typescript code - pnpm prune --prod + CI=true pnpm prune --prod # Clean up broken symlinks left behind by `pnpm prune` # https://github.com/pnpm/pnpm/issues/3645 diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index a120e28a8f23..6f763148ef77 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ''; preInstall = '' - pnpm prune --prod + CI=true pnpm prune --prod find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + # https://github.com/pnpm/pnpm/issues/3645 diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index 371922fa4017..48b817a215fe 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - pnpm prune --prod + CI=true pnpm prune --prod find node_modules -xtype l -delete mkdir -p $out/{bin,share/zipline} From 1f1a47e23ee7055a32b8499d085e50ffe055527a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 12 Sep 2025 23:58:19 +0000 Subject: [PATCH 056/202] pnpm_10: 10.15.1 -> 10.17.0 --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 8000474af74f..b249f8c25144 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc="; }; "10" = { - version = "10.15.1"; - hash = "sha256-jFOvAq4+wfsK51N3+NTWIXwtfL5vA8FjUMq/dJPebv8="; + version = "10.17.0"; + hash = "sha256-vZ7FQXZBOR4KyzkSspEr1bA4VAeoLalHRKdAe1Z/208="; }; }; From 98e63169d3f1c3bfebcbbd03785e5144882f27e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Sep 2025 01:45:28 +0000 Subject: [PATCH 057/202] python3Packages.cyclonedx-python-lib: 11.0.0 -> 11.1.0 --- .../python-modules/cyclonedx-python-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 2b3b5c5c27b8..2d117051ed2a 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "11.0.0"; + version = "11.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; tag = "v${version}"; - hash = "sha256-TS/3O/ojabMUUW8RVd1ymo67rjNoRCtrIqZcUygpW+Y="; + hash = "sha256-XlsVJTyAeqYex5q/07mFLXfMc9vnS5X+stP77i4IbVc="; }; pythonRelaxDeps = [ "py-serializable" ]; From 35cd82e0377133a9f0006dbb6c942d519c1dc0b0 Mon Sep 17 00:00:00 2001 From: Benjamin Levesque <14175665+benjlevesque@users.noreply.github.com> Date: Thu, 18 Sep 2025 12:29:13 +0200 Subject: [PATCH 058/202] scalingo: add completions for bash and zsh --- pkgs/by-name/sc/scalingo/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index b42373486121..0dd7cc0575c9 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, }: buildGoModule rec { @@ -21,8 +22,12 @@ buildGoModule rec { export HOME=$TMPDIR ''; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' rm $out/bin/dists + installShellCompletion --cmd scalingo \ + --bash cmd/autocomplete/scripts/scalingo_complete.bash \ + --zsh cmd/autocomplete/scripts/scalingo_complete.zsh ''; meta = with lib; { From da253f9dd52ec191365b114feb4e148522935df5 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 18 Sep 2025 14:37:38 +0200 Subject: [PATCH 059/202] dbus-cpp.passthru.tests.pkg-config: Disable version check for current version Will hopefully get fixed by the next release, so do the check once version gets changed again. --- pkgs/by-name/db/dbus-cpp/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix index 0b234fb4d48d..64c051d6c136 100644 --- a/pkgs/by-name/db/dbus-cpp/package.nix +++ b/pkgs/by-name/db/dbus-cpp/package.nix @@ -94,7 +94,9 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; - versionCheck = true; + # Not bumped for 5.0.5: https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/9 + # Try again on next bump. + versionCheck = finalAttrs.version != "5.0.5"; }; updateScript = gitUpdater { }; }; From d9ac3ba30b6fcf2996e015bc5c0ecef3f0295fcf Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 18 Sep 2025 15:33:06 +0200 Subject: [PATCH 060/202] nixos/ec2-data: sshd.service -> sshd-keygen.service SSH key generation was split out into its own systemd service in https://github.com/NixOS/nixpkgs/pull/372979, but dependent service definitions weren't updated. The `apply-ec2-data` service needs to run before SSH key generation, as it fetches host keys defined in ec2 user data and these keys should take priority over generating new ones. Currently, the ordering doesn't specify which should run first of `apply-ec2-data` and `sshd-keygen`; in practice it seems that `sshd-keygen` often wins the race, though. Update the dependencies so that `apply-ec2-data` always runs first. --- nixos/modules/virtualisation/ec2-data.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 0e71bde0a452..f1b3dfe1bbad 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -23,9 +23,9 @@ with lib; wantedBy = [ "multi-user.target" - "sshd.service" + "sshd-keygen.service" ]; - before = [ "sshd.service" ]; + before = [ "sshd-keygen.service" ]; after = [ "fetch-ec2-metadata.service" ]; path = [ pkgs.iproute2 ]; @@ -80,7 +80,7 @@ with lib; systemd.services.print-host-key = { description = "Print SSH Host Key"; wantedBy = [ "multi-user.target" ]; - after = [ "sshd.service" ]; + after = [ "sshd-keygen.service" ]; script = '' # Print the host public key on the console so that the user # can obtain it securely by parsing the output of From 0a98febe6b3ddeffc2e51a89fd2328fc39171794 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 18 Sep 2025 18:23:54 +0200 Subject: [PATCH 061/202] python3Packages.scikit-bio: add missing dependency, reenable test --- pkgs/development/python-modules/scikit-bio/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 347c9364e41b..ef4e4ed9719b 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -17,6 +17,7 @@ biom-format, statsmodels, patsy, + array-api-compat, python, pytestCheckHook, @@ -51,6 +52,7 @@ buildPythonPackage rec { biom-format statsmodels patsy + array-api-compat ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -58,11 +60,6 @@ buildPythonPackage rec { # only the $out dir contains the built cython extensions, so we run the tests inside there enabledTestPaths = [ "${placeholder "out"}/${python.sitePackages}/skbio" ]; - disabledTestPaths = [ - # don't know why, but this segfaults - "${placeholder "out"}/${python.sitePackages}/skbio/metadata/tests/test_intersection.py" - ]; - pythonImportsCheck = [ "skbio" ]; meta = { From 8f4cd7a4bab5ae18e4d4941b3a5549774aefe4e1 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Thu, 18 Sep 2025 19:48:46 +0200 Subject: [PATCH 062/202] readest: 0.9.78 -> 0.9.80 Changelog: https://github.com/readest/readest/releases/tag/v0.9.80 Diff: https://github.com/readest/readest/compare/v0.9.78...v0.9.80 --- pkgs/by-name/re/readest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 80322dc6e706..b8695a22ac32 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.78"; + version = "0.9.80"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-sKk/NwnD9asIqDW75FI7xZf3zNavlorbK08ff+v4O3g="; + hash = "sha256-PIoI1tpVqxcWB46TGCB/YhCRAKcOoiBigyndicY11ic="; fetchSubmodules = true; }; From 12190a1083e7e1ce02047adde49fed2783e4eb8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Sep 2025 18:42:09 +0000 Subject: [PATCH 063/202] jetty: 12.1.0 -> 12.1.1 --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 0669a31c14a5..70b9dbdfbc34 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -57,7 +57,7 @@ in }; jetty_12 = common { - version = "12.1.0"; - hash = "sha256-wVStusEURjaBYoh/37vO7PvdNFXrn7rLccchWGYzz+8="; + version = "12.1.1"; + hash = "sha256-VHmPhVEqq4eoOwo9O7sbdv6bJB9dCFkN+64jTlnFarM="; }; } From 699304cd9ba789310af1e4c0767e8d3e04e97cdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Sep 2025 19:22:01 +0000 Subject: [PATCH 064/202] typescript-language-server: 4.4.0 -> 5.0.0 --- pkgs/by-name/ty/typescript-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix index 5bad96099d66..b6df1a673575 100644 --- a/pkgs/by-name/ty/typescript-language-server/package.nix +++ b/pkgs/by-name/ty/typescript-language-server/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "typescript-language-server"; - version = "4.4.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "typescript-language-server"; repo = "typescript-language-server"; rev = "v${finalAttrs.version}"; - hash = "sha256-5JvYTVHZUoTGokOiaJ6FF5dsNXaY7oFsWLf2doZv36Q="; + hash = "sha256-dWTo9OM5gPKj78/KtCMeu59KYL5IhhapOsFtuj9JzVQ="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-05o1aOaUEL/KI5hf7dKL2lKEDxbzpg89CyR8qMi1G8s="; + hash = "sha256-9WezeKRsnwWB98YVhQD1nzrT/T6T3plIVwKhVkOsKPo="; }; nativeBuildInputs = [ From 0efb0c9c81fd5fb3073e672abc81e8b3549c3303 Mon Sep 17 00:00:00 2001 From: Augusto Melo <4723788+augustomelo@users.noreply.github.com> Date: Thu, 18 Sep 2025 21:02:09 +0100 Subject: [PATCH 065/202] fix: add mandatory runtime dependencies https://podman.io/docs/installation#building-from-source --- nixos/modules/virtualisation/podman/default.nix | 4 ---- pkgs/by-name/po/podman/package.nix | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 962e5f494d15..5949621d5bf0 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -232,10 +232,6 @@ in # containers cannot reach aardvark-dns otherwise networking.firewall.interfaces.${network_interface}.allowedUDPPorts = lib.mkIf dns_enabled [ 53 ]; - virtualisation.podman.extraPackages = [ - pkgs.iptables - ] - ++ lib.optional config.networking.nftables.enable pkgs.nftables; virtualisation.containers = { enable = true; # Enable common /etc/containers configuration containersConf.settings = { diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 985a1307aa98..978736798756 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -25,6 +25,8 @@ extraRuntimes ? lib.optionals stdenv.hostPlatform.isLinux [ runc ], # e.g.: runc, gvisor, youki fuse-overlayfs, util-linuxMinimal, + nftables, + iptables, iproute2, catatonit, gvproxy, @@ -44,7 +46,9 @@ let lib.optionals stdenv.hostPlatform.isLinux [ fuse-overlayfs util-linuxMinimal + iptables iproute2 + nftables ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ vfkit From 0e6b8974073ce5fae3801c5df4a33981ca55789d Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 18 Sep 2025 14:59:02 +0200 Subject: [PATCH 066/202] clickhouse: remove reference to clang --- pkgs/by-name/cl/clickhouse/generic.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index dd3378440f32..fffeaa3145c0 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -21,14 +21,17 @@ darwin, findutils, libiconv, + removeReferencesTo, rustSupport ? true, rustc, cargo, rustPlatform, nix-update-script, }: - -llvmPackages_19.stdenv.mkDerivation (finalAttrs: { +let + llvmStdenv = llvmPackages_19.stdenv; +in +llvmStdenv.mkDerivation (finalAttrs: { pname = "clickhouse" + lib.optionalString lts "-lts"; inherit version; @@ -70,6 +73,7 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { python3 perl llvmPackages_19.lld + removeReferencesTo ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ nasm @@ -154,8 +158,12 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { substituteInPlace $out/etc/clickhouse-server/config.xml \ --replace-fail "/var/log/clickhouse-server/clickhouse-server.err.log" "1" \ --replace-fail "trace" "warning" + remove-references-to -t ${llvmStdenv.cc} $out/bin/clickhouse ''; + # canary for the remove-references-to hook failing + disallowedReferences = [ llvmStdenv.cc ]; + # Basic smoke test doCheck = true; checkPhase = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' From 84fc521b04a2355e73704ab57f20d56ce2bc77a9 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Mon, 15 Sep 2025 20:37:21 +0200 Subject: [PATCH 067/202] szurubooru: replace pillow-avif-plugin, pyheif, heif-image-plugin with pillow-heif via patch --- .../szurubooru/001-server-pillow-heif.patch | 66 +++++++++++++++++++ pkgs/servers/web-apps/szurubooru/server.nix | 12 ++-- 2 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 pkgs/servers/web-apps/szurubooru/001-server-pillow-heif.patch diff --git a/pkgs/servers/web-apps/szurubooru/001-server-pillow-heif.patch b/pkgs/servers/web-apps/szurubooru/001-server-pillow-heif.patch new file mode 100644 index 000000000000..d36d558fbf42 --- /dev/null +++ b/pkgs/servers/web-apps/szurubooru/001-server-pillow-heif.patch @@ -0,0 +1,66 @@ +commit f89ce378d3b405d69635da28dfd57adced23aa17 +Author: kuflierl <41301536+kuflierl@users.noreply.github.com> +Date: Mon Sep 15 20:14:08 2025 +0200 + + server: replace pillow-avif-plugin, pyheif, heif-image-plugin with pillow-heif + +diff --git a/requirements.txt b/requirements.txt +index ffe18f0c..16a72750 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,12 +1,10 @@ + alembic>=0.8.5 + certifi>=2017.11.5 + coloredlogs==5.0 +-heif-image-plugin==0.3.2 + numpy>=1.8.2 +-pillow-avif-plugin~=1.1.0 +-pillow>=4.3.0 ++pillow>=11.2.1 ++pillow-heif>=1.0.0 + psycopg2-binary>=2.6.1 +-pyheif==0.6.1 + pynacl>=1.2.1 + pyRFC3339>=1.0 + pytz>=2018.3 +diff --git a/szurubooru/func/image_hash.py b/szurubooru/func/image_hash.py +index 76d5a846..b89541eb 100644 +--- a/szurubooru/func/image_hash.py ++++ b/szurubooru/func/image_hash.py +@@ -4,13 +4,13 @@ from datetime import datetime + from io import BytesIO + from typing import Any, Callable, List, Optional, Set, Tuple + +-import HeifImagePlugin ++from pillow_heif import register_heif_opener + import numpy as np +-import pillow_avif + from PIL import Image + + from szurubooru import config, errors + ++register_heif_opener() + logger = logging.getLogger(__name__) + + # Math based on paper from H. Chi Wong, Marshall Bern and David Goldberg +diff --git a/szurubooru/func/images.py b/szurubooru/func/images.py +index e135d182..f4b5aa5b 100644 +--- a/szurubooru/func/images.py ++++ b/szurubooru/func/images.py +@@ -7,14 +7,14 @@ import subprocess + from io import BytesIO + from typing import List + +-import HeifImagePlugin +-import pillow_avif ++from pillow_heif import register_heif_opener + from PIL import Image as PILImage + + from szurubooru import errors + from szurubooru.func import mime, util + + logger = logging.getLogger(__name__) ++register_heif_opener() + + + def convert_heif_to_png(content: bytes) -> bytes: diff --git a/pkgs/servers/web-apps/szurubooru/server.nix b/pkgs/servers/web-apps/szurubooru/server.nix index 3c8a95818b4e..594ef1d04859 100644 --- a/pkgs/servers/web-apps/szurubooru/server.nix +++ b/pkgs/servers/web-apps/szurubooru/server.nix @@ -20,10 +20,6 @@ let doCheck = false; }); - pyheif = super.pyheif.overridePythonAttrs (oldAttrs: { - doCheck = false; - }); - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.23"; src = fetchPypi { @@ -50,18 +46,20 @@ python.pkgs.buildPythonApplication { src = "${src}/server"; + patches = [ + ./001-server-pillow-heif.patch + ]; + nativeBuildInputs = with python.pkgs; [ setuptools ]; propagatedBuildInputs = with python.pkgs; [ alembic certifi coloredlogs - heif-image-plugin legacy-cgi numpy - pillow-avif-plugin pillow + pillow-heif psycopg2-binary - pyheif pynacl pyrfc3339 pytz From d1169e10f8b09105a0a9807cc42493c75e3d785b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Sep 2025 20:49:22 +0000 Subject: [PATCH 068/202] python3Packages.python-roborock: 2.44.0 -> 2.44.1 --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 32e200ec031b..5c7d491d44d8 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.44.0"; + version = "2.44.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "Python-roborock"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-Vd6ivFF55EXYymf6ulayW/X1yfNojL5N4p+I2CvWJP4="; + hash = "sha256-HXQqaXsbjzJ52yxP7m3Edc5HijwcGhZ6suu7QAcBu4A="; }; postPatch = '' From 124a5c711012bf3e737089eb192fe6457ab340d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Sep 2025 22:09:19 +0000 Subject: [PATCH 069/202] python3Packages.pypck: 0.8.10 -> 0.8.12 --- pkgs/development/python-modules/pypck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 240e3afc5287..61974b945f77 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.8.10"; + version = "0.8.12"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = "pypck"; tag = version; - hash = "sha256-0wwFkkIBQiRIdkMHsNHvqf1i5bzBNV7eP8uCWOk89oc="; + hash = "sha256-XXlHgr8/Cl3eu1vIDl/XykB2gv8PPkPIFEBG30yUue0="; }; postPatch = '' From df850eab1643cf713f44275015f8a6d6b578941d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 18 Sep 2025 19:43:38 -0300 Subject: [PATCH 070/202] iconpack-obsidian: fix broken symlink --- pkgs/by-name/ic/iconpack-obsidian/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/ic/iconpack-obsidian/package.nix b/pkgs/by-name/ic/iconpack-obsidian/package.nix index e349b8f291c5..d0bc17752aff 100644 --- a/pkgs/by-name/ic/iconpack-obsidian/package.nix +++ b/pkgs/by-name/ic/iconpack-obsidian/package.nix @@ -37,6 +37,18 @@ stdenvNoCC.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + # Fix broken symlink only if needed + # https://github.com/NixOS/nixpkgs/issues/394218 + + broken_symlink="$out/share/icons/Obsidian/actions/96/lock.svg" + target_svg="$out/share/icons/Obsidian/actions/scalable/system-lock-screen.svg" + + if [ -h "$broken_symlink" ] && [ ! -e "$broken_symlink" ]; then + echo "=== Fixing broken symlink: $broken_symlink" + rm -f "$broken_symlink" + ln -s "$target_svg" "$broken_symlink" + fi ''; meta = with lib; { From ee63660e0e9a4954ead9f38559cd97c0221053ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 00:30:15 +0000 Subject: [PATCH 071/202] python3Packages.beancount: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 55671d7d987b..90b763598e74 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -14,7 +14,7 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.0"; pname = "beancount"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "beancount"; repo = "beancount"; tag = version; - hash = "sha256-ogjBW/NGlMmhYlzcx3EWWoVi+OOEv2Wm49tzwMiNb8A="; + hash = "sha256-XWTgaBvB4/SONL44afvprZwJUVrkoda5XLGNxad0kec="; }; build-system = [ From a617bdd459513bf37705fc3629c4377e20c45372 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 02:42:45 +0000 Subject: [PATCH 072/202] duf: 0.9.0 -> 0.9.1 --- pkgs/by-name/du/duf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/du/duf/package.nix b/pkgs/by-name/du/duf/package.nix index 22a898f7ae87..45ec5bf6f90e 100644 --- a/pkgs/by-name/du/duf/package.nix +++ b/pkgs/by-name/du/duf/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "duf"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; tag = "v${finalAttrs.version}"; - hash = "sha256-cIHFWFSsfS5UG2QKkFEEB34Q1l0pjuICxQlGfgWnLeY="; + hash = "sha256-d/co7EaDk0m/oYxWFATxQYCdH3Z9r8eTtOOo+M+HD4o="; }; vendorHash = "sha256-Br2jagMynnzH77GNA7NeWbM5qSHbhfW5Bo7X2b6OX28="; From bcd36993eb10dca81c45c4825ec395cf90b2c16d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 03:34:10 +0000 Subject: [PATCH 073/202] circt: 1.130.0 -> 1.131.0 --- pkgs/by-name/ci/circt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 9fd6328e2333..e58724c1231f 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.130.0"; + version = "1.131.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-4HAGseBeMfHP5eqaOkpakgtzA3+kv5ue9uvTQSOIHCA="; + hash = "sha256-im+w6vYsLdJ/i88mG/anFjPYgE1HfvJIemLEse0pzco="; fetchSubmodules = true; }; From 5131b595a629ec9c0f61801c6c770ffce101779a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 03:55:04 +0000 Subject: [PATCH 074/202] rclip: 2.0.7 -> 2.0.8 --- pkgs/by-name/rc/rclip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index b39198487c7f..ecb9e22f09d8 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication rec { pname = "rclip"; - version = "2.0.7"; + version = "2.0.8"; pyproject = true; src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; tag = "v${version}"; - hash = "sha256-OiAOK6i088TMqD2+PzdSs7UBsycNHa+nqWima0dPYIA="; + hash = "sha256-ScNyy5qWDskKgqxjfRU7y8WBCdThXTjlE3x0oIa8fhU="; }; build-system = with python3Packages; [ From 3860f3b91e8578d9c40ed7efa3c1eab625c48e99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 05:11:59 +0000 Subject: [PATCH 075/202] terraform-providers.datadog: 3.73.0 -> 3.74.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 693de1973bcf..6baf62af2e95 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -335,13 +335,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-0ewJLIrKCdTAb3+up7xdbxXscr3hmcIWWcAEGp2TaG4=", + "hash": "sha256-WyIXWOpplukkdCVcI6EyJxcpL1lE+gOwkgLM7ZYjPMM=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.73.0", + "rev": "v3.74.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RsIuWBhiziUeil/buqOKNH5tPuuWcMoGbKKQUMH17sc=" + "vendorHash": "sha256-29N8ejKj9kuo56hPZkdrQDEF4nwNNzAS1+BSsYOvvl0=" }, "deno": { "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", From 9c9848be544fc20f80b2fdcb5aeb0bb12c23fbe5 Mon Sep 17 00:00:00 2001 From: dramforever Date: Fri, 19 Sep 2025 14:49:25 +0800 Subject: [PATCH 076/202] linuxManualConfig: Handle only y and m in readConfig Parsing Linux config files in Nix in full is complicated, primarily due to string values. Currently, the regular expression used is fragile and breaks with string values containing equal signs or (escaped) quotes. The primary use of these options is system.requiredKernelConfig, which only really needs to track "yes" and "module". Therefore, only parse those. This is a breaking change. However, this is a very obscure corner of linuxManualConfig and should have few if any affected users. --- .../linux/kernel/manual-config.nix | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 41d23aa13240..cd207f1d610c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -32,24 +32,18 @@ let readConfig = configfile: - lib.listToAttrs ( - map - ( - line: - let - match = lib.match "(.*)=\"?(.*)\"?" line; - in - { - name = lib.elemAt match 0; - value = lib.elemAt match 1; - } - ) - ( - lib.filter (line: !(lib.hasPrefix "#" line || line == "")) ( - lib.splitString "\n" (builtins.readFile configfile) - ) - ) - ); + let + matchLine = + line: + let + match = lib.match "(CONFIG_[^=]+)=([ym])" line; + in + lib.optional (match != null) { + name = lib.elemAt match 0; + value = lib.elemAt match 1; + }; + in + lib.listToAttrs (lib.concatMap matchLine (lib.splitString "\n" (builtins.readFile configfile))); in lib.makeOverridable ( { From abf2b9d1dad4baf8b097ee6a64331ae36151f1d8 Mon Sep 17 00:00:00 2001 From: dramforever Date: Fri, 19 Sep 2025 15:06:14 +0800 Subject: [PATCH 077/202] linuxPackages_custom: Default allowImportFromDerivation to false Since #434608, we no longer need to use allowImportFromDerivation if configfile is a path, which does not require IFD to read. Default it to false. --- pkgs/top-level/linux-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d64f7f282c8e..b84c20d1a1b4 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -819,7 +819,7 @@ in src, modDirVersion ? lib.versions.pad 3 version, configfile, - allowImportFromDerivation ? true, + allowImportFromDerivation ? false, }: recurseIntoAttrs ( packagesFor (manualConfig { From 96e76d543268659d807f5d87e07a0e2fe4f0d4b8 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Fri, 19 Sep 2025 11:47:27 +0200 Subject: [PATCH 078/202] python3Packages.beanquery: Fix build with beancount 3.2.0 --- pkgs/development/python-modules/beanquery/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/beanquery/default.nix b/pkgs/development/python-modules/beanquery/default.nix index 9e016ec860fc..fad735aa6a8d 100644 --- a/pkgs/development/python-modules/beanquery/default.nix +++ b/pkgs/development/python-modules/beanquery/default.nix @@ -4,6 +4,7 @@ click, buildPythonPackage, fetchFromGitHub, + fetchpatch2, python-dateutil, pytestCheckHook, setuptools, @@ -21,6 +22,14 @@ buildPythonPackage rec { hash = "sha256-O7+WCF7s50G14oNTvJAOTvgSoNR9fWcn/m1jv7RHmK8="; }; + patches = [ + (fetchpatch2 { + name = "beancount-workaround.patch"; + url = "https://github.com/beancount/beanquery/commit/aa0776285a25baeedf151e9f582bef0314f76004.patch?full_index=1"; + hash = "sha256-hWL1CDsBSbMqufEQrtEncmyUr5L5VJI+i4xQtnAvQd8="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ From 4c9b81aac5e1ec6a5bca096607e7977286a4492b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 10:06:13 +0000 Subject: [PATCH 079/202] siyuan: 3.3.1 -> 3.3.2 --- pkgs/by-name/si/siyuan/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 02f67b6ac6a1..9c4ad615e723 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-Hqm7WCckdFcePkNzm+JGzRmFtgfjd1GdEFKmwU6O2WU="; + hash = "sha256-haZwGJKRRAguCbY7C+kBIOq5Cr0lymGbRH90oarYUpE="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-bI6hbvFMAuLfKkasAuQDpJ5BGXxw2nUwBNXeYtYTF2k="; + vendorHash = "sha256-joLfVa6xi03JmQBIj08dTyDMPn0q2LqwJtfUJRYW+4c="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch ; fetcherVersion = 1; - hash = "sha256-UqWPOC/j94WTqWUJuE7lwOqIXqhGeeEHgnv+uXlujuM="; + hash = "sha256-QhgND6yxXEJYJM1jkbViAfxNr9FRklYk1YjrnDjZSPc="; }; sourceRoot = "${finalAttrs.src.name}/app"; From 0734d6a6075d2f45788b1716547cdf3fcfd17079 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Fri, 19 Sep 2025 12:21:52 +0200 Subject: [PATCH 080/202] fava: 1.30.5 -> 1.30.6 --- pkgs/by-name/fa/fava/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fa/fava/package.nix b/pkgs/by-name/fa/fava/package.nix index 91790a6bda90..e20ea15fb424 100644 --- a/pkgs/by-name/fa/fava/package.nix +++ b/pkgs/by-name/fa/fava/package.nix @@ -8,17 +8,17 @@ let src = buildNpmPackage (finalAttrs: { pname = "fava-frontend"; - version = "1.30.5"; + version = "1.30.6"; src = fetchFromGitHub { owner = "beancount"; repo = "fava"; tag = "v${finalAttrs.version}"; - hash = "sha256-46ze+1sdgXq9Unhu1ec4buXbH3s/PCcfCx+rmYc+fZw="; + hash = "sha256-AMbKGIfR/URu7RpyBKSR3lzfIliRWjnUNNjLvu9KmfM="; }; sourceRoot = "${finalAttrs.src.name}/frontend"; - npmDepsHash = "sha256-ImBNqccAd61c9ASzklcooQyh7BYdgJW9DTcQRmFHqho="; + npmDepsHash = "sha256-geou0+Ges0jjrlXG9m3u1GMdf0Qt2pTd8vRGh9gAWJ4="; makeCacheWritable = true; preBuild = '' @@ -34,7 +34,7 @@ let in python3Packages.buildPythonApplication { pname = "fava"; - version = "1.30.5"; + version = "1.30.6"; pyproject = true; inherit src; From c0c0af52fe6aadd4cd3f8bcc39087038861f7ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Fri, 19 Sep 2025 13:33:06 +0200 Subject: [PATCH 081/202] taterclient-ddnet: 10.5.2 -> 10.5.3 --- pkgs/by-name/ta/taterclient-ddnet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index 0b270f497b45..1569df1b499b 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taterclient-ddnet"; - version = "10.5.2"; + version = "10.5.3"; src = fetchFromGitHub { owner = "sjrc6"; repo = "taterclient-ddnet"; tag = "V${finalAttrs.version}"; - hash = "sha256-e+nJ93Fld/F2rLIfhmhC64YVPZdMGKrcKfxGtrQOtSQ="; + hash = "sha256-MHBBDn/3kS1BuZQU7qHdbtuy0JuRRqtzmHVdg8Az+Qc="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 01fad8a9cb8b62746a469f4f0287b610f029dfef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 11:59:39 +0000 Subject: [PATCH 082/202] terraform-providers.signalfx: 9.19.1 -> 9.21.1 --- .../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 dec3523a35d4..4f91d8c11c23 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1219,13 +1219,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-hNMZbrihV+xlfamXRaGszQRqO8Tn2829rd4+pH83lrU=", + "hash": "sha256-cZnG8WohzR4OPBoX9PHdbvsziPfcsR75apXZX8EwtEQ=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.19.1", + "rev": "v9.21.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-wpm7J8kfkm4vDZhZ0koQsgpW5JwWY7DngSYXfaWh3FQ=" + "vendorHash": "sha256-TMoZ1uR7G9oC7/9CiwC9rIJazqB9g6Xb+vxvYX2T9RY=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", From ec89bf06d6ddce1a1e022c979e828e7bfcb578c2 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Fri, 19 Sep 2025 14:16:41 +0200 Subject: [PATCH 083/202] readest: 0.9.80 -> 0.9.81 Changelog: https://github.com/readest/readest/releases/tag/v0.9.81 Diff: https://github.com/readest/readest/compare/v0.9.80...v0.9.81 --- pkgs/by-name/re/readest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index b8695a22ac32..181518cfa829 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.80"; + version = "0.9.81"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-PIoI1tpVqxcWB46TGCB/YhCRAKcOoiBigyndicY11ic="; + hash = "sha256-aj4XBphkIeqGdqiWz3Um1+dGSYF6G3b+9DdN/4qZcZI="; fetchSubmodules = true; }; From 49328727808c0e3582707c5d3c155256e35cc952 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 19 Sep 2025 20:34:27 +0800 Subject: [PATCH 084/202] planify: 4.13.4 -> 4.14.0 https://github.com/alainm23/planify/compare/4.13.4...4.14.0 --- pkgs/by-name/pl/planify/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix index c760c307e9f0..bdda3c057760 100644 --- a/pkgs/by-name/pl/planify/package.nix +++ b/pkgs/by-name/pl/planify/package.nix @@ -22,19 +22,20 @@ libportal-gtk4, libsecret, libsoup_3, + libspelling, sqlite, webkitgtk_6_0, }: stdenv.mkDerivation rec { pname = "planify"; - version = "4.13.4"; + version = "4.14.0"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-lHjMOpCr6ya0k5NMaiZW7jz0EGVUEADA7od87W8DcT8="; + hash = "sha256-QvCESTpHyT6Lu4z7b9DhjFu27PhQwgAo9FY7TMsKy18="; }; nativeBuildInputs = [ @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { libportal-gtk4 libsecret libsoup_3 + libspelling sqlite webkitgtk_6_0 ]; From 3fbb8e08a1f856ac4be407c309f35797c8cdc182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 19 Sep 2025 05:35:09 -0700 Subject: [PATCH 085/202] nixos/immich: set $XDG_CACHE_HOME The immich-machine-learning service can fail with RuntimeError: Data processing error: I/O error: Operation not permitted (os error 1) because huggingface attempts to download files to $HOME/.cache (which doesn't exist in this case) unless $XDG_CACHE_HOME or $HF_HOME is set. --- nixos/modules/services/web-apps/immich.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index 6fdfb0c831b5..a68066c30df0 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -360,6 +360,7 @@ in MACHINE_LEARNING_WORKERS = "1"; MACHINE_LEARNING_WORKER_TIMEOUT = "120"; MACHINE_LEARNING_CACHE_FOLDER = "/var/cache/immich"; + XDG_CACHE_HOME = "/var/cache/immich"; IMMICH_HOST = "localhost"; IMMICH_PORT = "3003"; }; From 0971877da3cae87fe15dc4167f01bd8e2dcf751e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Sep 2025 15:25:14 +0200 Subject: [PATCH 086/202] python313Packages.sectools: 1.4.4 -> 1.5.0 Diff: https://github.com/p0dalirius/sectools/compare/1.4.4...1.5.0 Changelog: https://github.com/p0dalirius/sectools/releases/tag/1.5.0 --- pkgs/development/python-modules/sectools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sectools/default.nix b/pkgs/development/python-modules/sectools/default.nix index 2dfd890a3376..df798b3f38df 100644 --- a/pkgs/development/python-modules/sectools/default.nix +++ b/pkgs/development/python-modules/sectools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sectools"; - version = "1.4.4"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "p0dalirius"; repo = "sectools"; tag = version; - hash = "sha256-dI0zokmndMZ4C7aX73WOdyXvOjCQJzZU6C1uXDt97Vg="; + hash = "sha256-P0ixL6zdEcvL7KKbr1LcJyd8mqPZrwklspJmZ/KokEA="; }; nativeBuildInputs = [ setuptools ]; From 77e8a23c87ff145fa6fdc2d4633c6bc95ae190ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Sep 2025 15:26:39 +0200 Subject: [PATCH 087/202] python313Packages.sectools: modernize --- pkgs/development/python-modules/sectools/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/sectools/default.nix b/pkgs/development/python-modules/sectools/default.nix index df798b3f38df..3793ccd6912f 100644 --- a/pkgs/development/python-modules/sectools/default.nix +++ b/pkgs/development/python-modules/sectools/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, ldap3, - pythonOlder, setuptools, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "1.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "p0dalirius"; repo = "sectools"; @@ -21,9 +18,9 @@ buildPythonPackage rec { hash = "sha256-P0ixL6zdEcvL7KKbr1LcJyd8mqPZrwklspJmZ/KokEA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ ldap3 ]; + dependencies = [ ldap3 ]; # Module has no tests doCheck = false; @@ -34,7 +31,7 @@ buildPythonPackage rec { description = "Library containing functions to write security tools"; homepage = "https://github.com/p0dalirius/sectools"; changelog = "https://github.com/p0dalirius/sectools/releases/tag/${src.tag}"; - license = with licenses; [ gpl3Only ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; } From c9d7971cb259c1309978712436c9a687d00fc47b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 14:01:22 +0000 Subject: [PATCH 088/202] igraph: 0.10.16 -> 0.10.17 --- pkgs/by-name/ig/igraph/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ig/igraph/package.nix b/pkgs/by-name/ig/igraph/package.nix index 0b6525f6e774..89400f253c05 100644 --- a/pkgs/by-name/ig/igraph/package.nix +++ b/pkgs/by-name/ig/igraph/package.nix @@ -25,13 +25,13 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !bla stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.16"; + version = "0.10.17"; src = fetchFromGitHub { owner = "igraph"; repo = "igraph"; rev = finalAttrs.version; - hash = "sha256-Qs2WXAiAQhQ077KEtkapr8ckw6Jlbxj6qwyiplsEaLY="; + hash = "sha256-NzLn2GXpMgwE8fY1vp5SU0Y7EfyVpQfphGdqU6sQGW4="; }; postPatch = '' From fc3ae8d201be187f509ed555bea28f044e1288b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 14:25:00 +0000 Subject: [PATCH 089/202] terraform-providers.htpasswd: 1.2.1 -> 1.5.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 dec3523a35d4..6ca3d057cb18 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -615,13 +615,13 @@ "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=" }, "htpasswd": { - "hash": "sha256-Kc3L8oqQOP+k8PZAWkRApDj+3LRgs3P3mm4vX2QcUdg=", + "hash": "sha256-ALTyTTVyS2HHenmk8HVwtQenCmJX05kyXifJTzzmnHE=", "homepage": "https://registry.terraform.io/providers/loafoe/htpasswd", "owner": "loafoe", "repo": "terraform-provider-htpasswd", - "rev": "v1.2.1", + "rev": "v1.5.0", "spdx": "MIT", - "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs=" + "vendorHash": "sha256-6+ZQVWc4/2RoNjQLzetLTl9L8AdbFu2uFmqJ9Kxcc7Q=" }, "http": { "hash": "sha256-IXqKZ9RQP0kZVxc9OfaWglF8GeycSAl5DATdqc8n35g=", From a96681e3b2376a40ec2bf0d5348a00ab2857d419 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 19 Sep 2025 15:15:30 +0000 Subject: [PATCH 090/202] mujoco: 3.3.5 -> 3.3.6 Diff: https://github.com/google-deepmind/mujoco/compare/3.3.5...3.3.6 Changelog: https://mujoco.readthedocs.io/en/3.3.6/changelog.html --- pkgs/by-name/mu/mujoco/package.nix | 8 ++++---- pkgs/development/python-modules/mujoco/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index 5a0ee6c7f2cb..3451f9429615 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -18,8 +18,8 @@ let abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "76bb24329e8bf5f39704eb10d21b9a80befa7c81"; - hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk="; + rev = "987c57f325f7fa8472fa84e1f885f7534d391b0d"; + hash = "sha256-6Ro7miql9+wcArsOKTjlyDSyD91rmmPsIfO5auk9kiI="; }; benchmark = fetchFromGitHub { owner = "google"; @@ -86,7 +86,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mujoco"; - version = "3.3.5"; + version = "3.3.6"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "google-deepmind"; repo = "mujoco"; tag = finalAttrs.version; - hash = "sha256-HykExdosK5XpAOQeic/jsc6yYxjdoiaP8rRkA/yAfuU="; + hash = "sha256-6lZ36XFMsjzck/ouSSiX47+dxbEzXgrMhw1Mi3PEnq4="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index 1174baa5a92b..91020733522d 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-+fxlUPye2XaCI9stezzDK1oC656IcoK0DkUcJmrxakY="; + hash = "sha256-Emv7DbRC62QHd23E+Yx8AilUlHkx4Dw5XsRfpYRj+14="; }; nativeBuildInputs = [ cmake ]; From bc3a2f25a9d412396d9273ae38994be66d779940 Mon Sep 17 00:00:00 2001 From: uncenter Date: Fri, 19 Sep 2025 10:47:28 -0500 Subject: [PATCH 091/202] monolith: fix build on darwin --- pkgs/by-name/mo/monolith/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mo/monolith/package.nix b/pkgs/by-name/mo/monolith/package.nix index 7a5bab5489eb..628467cb92f6 100644 --- a/pkgs/by-name/mo/monolith/package.nix +++ b/pkgs/by-name/mo/monolith/package.nix @@ -24,12 +24,13 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; checkFlags = [ "--skip=tests::cli" ]; @@ -41,7 +42,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Y2Z/monolith"; license = licenses.cc0; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ Br1ght0ne ]; }; } From a55dc077c19465d122c1522266ee14e803f08074 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 16:01:00 +0000 Subject: [PATCH 092/202] tomcat10: 10.1.44 -> 10.1.46 --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 033db524760c..06ff39d815be 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -65,8 +65,8 @@ in }; tomcat10 = common { - version = "10.1.44"; - hash = "sha256-4CDC+oZJ8d6au8LdznDdYemX0O0WHuAqMN5LIhJjvpw="; + version = "10.1.46"; + hash = "sha256-RenV71YatGt0x19AwzuD9J4T556Z9zbf+OiUhVfpaNo="; }; tomcat11 = common { From 9498d55a7c84b043de6348950fb5eedda8fbc3a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 16:36:56 +0000 Subject: [PATCH 093/202] openasar: 0-unstable-2025-07-15 -> 0-unstable-2025-09-17 --- pkgs/by-name/op/openasar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index fb9a69acdb16..fe71005c1b3b 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openasar"; - version = "0-unstable-2025-07-15"; + version = "0-unstable-2025-09-17"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "92abbb0e3efc39e553fd24e9125c42cdba1318ec"; - hash = "sha256-9PTseQdQ6YbeuBbcBnPr+OXP5wNYDJgv8s9sn8hGSgk="; + rev = "bf8a71e2fcf1c77761092b7b899839164e3a596c"; + hash = "sha256-gKaqLIlEJUUTbXBQ0E97bHS6Z1HFdmEt8jsvkQH4hI8="; }; postPatch = '' From 1fe3b70525597cbb912cbb61bbdd04ad21d6f24b Mon Sep 17 00:00:00 2001 From: eljamm Date: Fri, 19 Sep 2025 17:24:40 +0000 Subject: [PATCH 094/202] linux_xanmod: 6.12.47 -> 6.12.48 - Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.48-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.47-xanmod1..6.12.48-xanmod1?from_project_id=51590166 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index bdfee03e92e8..bff16bde9941 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,8 +15,8 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.47"; - hash = "sha256-jR1VqFE1jF5mTRAp+Xxswmh9bMIolJtCk4QgMHzIhao="; + version = "6.12.48"; + hash = "sha256-2dtsMOAqTOgYE7FAMX6XDieI4IfXngnYcUg0JKoQrBs="; isLTS = true; }; # ./update-xanmod.sh main From a0fdef5e2b05ed59582ce95b9c5a9efb6cfa8763 Mon Sep 17 00:00:00 2001 From: eljamm Date: Fri, 19 Sep 2025 17:29:30 +0000 Subject: [PATCH 095/202] linux_xanmod_latest: 6.16.7 -> 6.16.8 - Changelog: https://dl.xanmod.org/changelog/6.16/ChangeLog-6.16.8-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.16.7-xanmod1..6.16.8-xanmod1?from_project_id=51590166 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index bff16bde9941..d13533e15739 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -21,8 +21,8 @@ let }; # ./update-xanmod.sh main main = { - version = "6.16.7"; - hash = "sha256-/CFSGaDbK0pZgGGOOxixwOQgeD1OsbUhtRss4VbXHxE="; + version = "6.16.8"; + hash = "sha256-8CMzqXKbd605TU4XhPqUHVECrmW0OYbazZ4RpSji974="; }; }; From 2436bc8128f6f4d0a094572647230597daf45bf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Sep 2025 20:18:38 +0200 Subject: [PATCH 096/202] crowdsec: 1.6.11 -> 1.7.0 Diff: https://github.com/crowdsecurity/crowdsec/compare/v1.6.11...v1.7.0 Changelog: https://github.com/crowdsecurity/crowdsec/releases/tag/v1.7.0 --- pkgs/by-name/cr/crowdsec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 57a6d4f060ba..94a6c7cfd0fc 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.6.11"; + version = "1.7.0"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = "crowdsec"; tag = "v${version}"; - hash = "sha256-fHnd/pnmVAPvCtae4aRS66tXmMp6DgNagqWNrT9hcw8="; + hash = "sha256-ILGvHSDONyq6O1V/xm4lanSTmkdkMAwvvhoUtM2b7Gc="; }; - vendorHash = "sha256-ImrXOD3kIlNsEZOTeMA6UFvMZCnfMOTZOXtY3ger8YI="; + vendorHash = "sha256-B9VZlNks7/ozay5+di++sbLwIKN98P7U+o6knVaKlqo="; nativeBuildInputs = [ installShellFiles ]; From fde105e11f279cca6b8937d81d5c9a8575232ff5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 18:40:29 +0000 Subject: [PATCH 097/202] gitlab-ci-local: 4.61.1 -> 4.62.0 --- pkgs/by-name/gi/gitlab-ci-local/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 147140ad9f37..ba682b859429 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.61.1"; + version = "4.62.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-zHYUe5fAjK34zCjTYkg4pvvjRsaeuCyu7Gelcqki8P0="; + hash = "sha256-JcCfrrb/xAvILfHgnKoRxjWG4fvi4kVg0W+s+y25A6Y="; }; - npmDepsHash = "sha256-eLT2ejLOtEI7eqWikBc/wFrStCuvYHvlZk9JiMPfuUI="; + npmDepsHash = "sha256-J/my72RPPwg1r1t4vO3CgMnGDP7H/Cc3apToypaK1YI="; nativeBuildInputs = [ makeBinaryWrapper From df297289f6728eea23ff8b85c0c1ba0d19338910 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 18:43:17 +0000 Subject: [PATCH 098/202] xan: 0.52.0 -> 0.53.0 --- pkgs/by-name/xa/xan/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix index c8d54d8fd162..8e6301e6d52a 100644 --- a/pkgs/by-name/xa/xan/package.nix +++ b/pkgs/by-name/xa/xan/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "xan"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "medialab"; repo = "xan"; tag = version; - hash = "sha256-Enjtp/35rhSsndLFaQw8sGsO43mOes3Se8ElbdcSv0E="; + hash = "sha256-gQqZrN8v5edgTKMmNGS3Pp0xdWH1awSa+dZaBNX7EX4="; }; - cargoHash = "sha256-m3aiX34W6GHgnT6kkb1CsLXyVH5FnxSOh5etCCJJsAs="; + cargoHash = "sha256-CCCBF1ZvRZAtPNOfoU3Im7/wIpFakIbBFH0UjWb3tD0="; # FIXME: tests fail and I do not have the time to investigate. Temporarily disable # tests so that we can manually run and test the package for packaging purposes. From b4de54f51cc6ea56fa2b1f3f80e5a7e64d8a4821 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Sep 2025 21:15:19 +0200 Subject: [PATCH 099/202] osv-scanner: 2.2.1 -> 2.2.2 Diff: https://github.com/google/osv-scanner/compare/v2.2.1...v2.2.2 Changelog: https://github.com/google/osv-scanner/releases/tag/v2.2.2 --- pkgs/by-name/os/osv-scanner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index ca0fc8341a53..f5f8b696368c 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; tag = "v${version}"; - hash = "sha256-6s399GG2k0bkaLTwtMpt87BszzpS+GD4glt2/52Cb3A="; + hash = "sha256-gleQ/Bh+oLYy3iP6FsqtihoLz4jerRnx14dB2cBbf60="; }; - vendorHash = "sha256-Ph7ukPx2BD2GKnxooWqH2jYoHoeTow+ta9ZaY+3dIX4="; + vendorHash = "sha256-F1QioqSFQvSJd7JByyUakjn9QSpF2hqEkyx10ei/sKk="; subPackages = [ "cmd/osv-scanner" From cec8a9230d83a469c9f8ca79f2360b9fed8c40b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 19:33:42 +0000 Subject: [PATCH 100/202] easytier: 2.4.3 -> 2.4.4 --- pkgs/by-name/ea/easytier/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 7e416ec9fffe..984377fb1926 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "easytier"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "EasyTier"; repo = "EasyTier"; tag = "v${version}"; - hash = "sha256-0TuRNxf8xDhwUjBXJsv7dhgeYjr/voIt+/0tinImUhA="; + hash = "sha256-89uRsLeSNR2I+QX0k1VJ0sMrUYLbApEJClk3aFr0faY="; }; # remove if rust 1.89 merged @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace-fail 'rust-version = "1.89.0"' "" ''; - cargoHash = "sha256-FQC3JD051fEZQO9UriNzJPrxE0QcSQ8p3VTk3tQGPBc="; + cargoHash = "sha256-rioo3Eg5xGg4PI4beXWheeymVNq+zZP9uhbfU584u0g="; nativeBuildInputs = [ protobuf From f686d372a0a9f7bb890d84939b02253ab2168d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 19 Sep 2025 16:37:02 -0300 Subject: [PATCH 101/202] iconpack-obsidian: run preInstall and postInstall hooks --- pkgs/by-name/ic/iconpack-obsidian/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ic/iconpack-obsidian/package.nix b/pkgs/by-name/ic/iconpack-obsidian/package.nix index d0bc17752aff..bf82309f6a84 100644 --- a/pkgs/by-name/ic/iconpack-obsidian/package.nix +++ b/pkgs/by-name/ic/iconpack-obsidian/package.nix @@ -31,6 +31,8 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out/share/icons mv Obsidian* $out/share/icons @@ -49,6 +51,8 @@ stdenvNoCC.mkDerivation rec { rm -f "$broken_symlink" ln -s "$target_svg" "$broken_symlink" fi + + runHook postInstall ''; meta = with lib; { From a90976867094a9836831ce8fbe8686e773b96a11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 19:49:09 +0000 Subject: [PATCH 102/202] amp-cli: 0.0.1757347273-geb1b63 -> 0.0.1758297686-ge5ccb5 --- pkgs/by-name/am/amp-cli/package-lock.json | 472 +--------------------- pkgs/by-name/am/amp-cli/package.nix | 6 +- 2 files changed, 8 insertions(+), 470 deletions(-) diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 10e19510338b..85d16bbd509f 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,36 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1757347273-geb1b63" - } - }, - "node_modules/@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "license": "MIT", - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/@dabh/diagnostics": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", - "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", - "license": "MIT", - "dependencies": { - "colorspace": "1.1.x", - "enabled": "2.0.x", - "kuler": "^2.0.0" - } - }, - "node_modules/@msgpack/msgpack": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz", - "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==", - "license": "ISC", - "engines": { - "node": ">= 10" + "@sourcegraph/amp": "^0.0.1758297686-ge5ccb5" } }, "node_modules/@napi-rs/keyring": { @@ -257,18 +228,11 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1757347273-geb1b63", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1757347273-geb1b63.tgz", - "integrity": "sha512-HGz6ImderQxdxcd1cLkXP27aaiTsrAt5h53M3YMdH+7HHcI/S/YraQp2e0U8Kt+j43dbeKj6/M4/X4xrMnU3RQ==", + "version": "0.0.1758297686-ge5ccb5", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1758297686-ge5ccb5.tgz", + "integrity": "sha512-fU/Lw/yYfeUwF0+1MUuCdDcqZVEygeLwjMPoIFl9kg8R3u2jgZGVqtbfaS8q6MI8CGCVPQTs/rDgP4nVE0jmyg==", "dependencies": { - "@napi-rs/keyring": "^1.1.9", - "commander": "^11.1.0", - "jsonc-parser": "^3.3.1", - "neovim": "^5.3.0", - "open-simplex-noise": "^2.5.0", - "winston": "^3.17.0", - "wrap-ansi": "^9.0.0", - "xdg-basedir": "^5.1.0" + "@napi-rs/keyring": "1.1.9" }, "bin": { "amp": "dist/main.js" @@ -276,432 +240,6 @@ "engines": { "node": ">=20" } - }, - "node_modules/@types/triple-beam": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", - "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", - "license": "MIT" - }, - "node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/async": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "license": "MIT" - }, - "node_modules/color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "license": "MIT" - }, - "node_modules/color-string": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", - "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", - "license": "MIT", - "dependencies": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "node_modules/colorspace": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", - "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", - "license": "MIT", - "dependencies": { - "color": "^3.1.3", - "text-hex": "1.0.x" - } - }, - "node_modules/commander": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", - "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", - "license": "MIT", - "engines": { - "node": ">=16" - } - }, - "node_modules/emoji-regex": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", - "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", - "license": "MIT" - }, - "node_modules/enabled": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", - "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", - "license": "MIT" - }, - "node_modules/fecha": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", - "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", - "license": "MIT" - }, - "node_modules/fn.name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", - "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", - "license": "MIT" - }, - "node_modules/get-east-asian-width": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", - "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==", - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "license": "ISC" - }, - "node_modules/is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "license": "MIT" - }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", - "license": "MIT" - }, - "node_modules/kuler": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", - "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", - "license": "MIT" - }, - "node_modules/logform": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz", - "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==", - "license": "MIT", - "dependencies": { - "@colors/colors": "1.6.0", - "@types/triple-beam": "^1.3.2", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/neovim": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/neovim/-/neovim-5.3.0.tgz", - "integrity": "sha512-32Cypq6qh7vzJ5wuVPPzIsBdOlvwo0do8/3jxLu+RGdneFSJjh5CYi0ScHHAw/2HLtIjRKhRjJMXeze21M+uyw==", - "license": "MIT", - "dependencies": { - "@msgpack/msgpack": "^2.8.0", - "winston": "3.14.1" - }, - "bin": { - "neovim-node-host": "bin/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/neovim/node_modules/winston": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.1.tgz", - "integrity": "sha512-CJi4Il/msz8HkdDfXOMu+r5Au/oyEjFiOZzbX2d23hRLY0narGjqfE5lFlrT5hfYJhPtM8b85/GNFsxIML/RVA==", - "license": "MIT", - "dependencies": { - "@colors/colors": "^1.6.0", - "@dabh/diagnostics": "^2.0.2", - "async": "^3.2.3", - "is-stream": "^2.0.0", - "logform": "^2.6.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "safe-stable-stringify": "^2.3.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.7.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/one-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", - "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", - "license": "MIT", - "dependencies": { - "fn.name": "1.x.x" - } - }, - "node_modules/open-simplex-noise": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/open-simplex-noise/-/open-simplex-noise-2.5.0.tgz", - "integrity": "sha512-co7x8uWxGcgFtsJNBFqI9ylq+5Isotz2hZR7dsD5Sl+RDPGBeMEG41KAfF+5gF10ksi9Pg6DNpMHEoyTKLbejQ==", - "license": "Unlicense" - }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/safe-stable-stringify": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", - "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", - "license": "MIT", - "engines": { - "node": ">=10" - } - }, - "node_modules/simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.3.1" - } - }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", - "license": "MIT" - }, - "node_modules/triple-beam": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", - "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", - "license": "MIT", - "engines": { - "node": ">= 14.0.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT" - }, - "node_modules/winston": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz", - "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==", - "license": "MIT", - "dependencies": { - "@colors/colors": "^1.6.0", - "@dabh/diagnostics": "^2.0.2", - "async": "^3.2.3", - "is-stream": "^2.0.0", - "logform": "^2.7.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "safe-stable-stringify": "^2.3.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.9.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/winston-transport": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz", - "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==", - "license": "MIT", - "dependencies": { - "logform": "^2.7.0", - "readable-stream": "^3.6.2", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/wrap-ansi": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", - "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/xdg-basedir": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", - "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } } } } diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index c5422673c020..72b03dbfa0c7 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1757347273-geb1b63"; + version = "0.0.1758297686-ge5ccb5"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-8bB7sBdKUZMpHFjRQdEg++Ea3Uv4ykIc88ITAfIzzdM="; + hash = "sha256-D2jElEhvrcuuDIzfB+XAI4VCyYAOC6pu/xNMxkn16o4="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-CUoT9JzvYvaPBqQrKo5XESISVzi9jRvPcbBVPHETIF4="; + npmDepsHash = "sha256-dePLix9roMYlnYMqBq1nwRQEHdyXdtSEgvsoo7yD3QQ="; propagatedBuildInputs = [ ripgrep From 8249fdc2c96aca746dc4d89bb29adeea46d93644 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 10 Sep 2025 13:51:31 -0600 Subject: [PATCH 103/202] tandoor-recipes: 2.1.2 -> 2.2.3 https://github.com/TandoorRecipes/recipes/releases/tag/2.2.3 Diff: https://github.com/TandoorRecipes/recipes/compare/2.1.2...2.2.3 --- pkgs/by-name/ta/tandoor-recipes/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index 7bd01e8df11e..3ae948f604f0 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "2.1.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; tag = version; - hash = "sha256-FCCXzWaWjmsWidg1MgUIJtH+KN/gA1d7KBLRj3/1Fec="; + hash = "sha256-ezjeUOlbVoPWfUBs865ixBKet3U6O7UwfvqJY4v1hwQ="; }; - yarnHash = "sha256-vwPwJK+nGuhjJC5BdijAKOv7sgrdev63PWhuZXMD1E0="; + yarnHash = "sha256-1p79Bdsn6KDApYKz9BAwrA97svbB8ub+Wl49MTIumW8="; meta = { homepage = "https://tandoor.dev/"; From b4795a78f47c986cb17e7efb9b3c047ce128a26f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 20:32:17 +0000 Subject: [PATCH 104/202] vue-language-server: 3.0.6 -> 3.0.7 --- pkgs/by-name/vu/vue-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index a120e28a8f23..0eed375eb902 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -9,19 +9,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "vuejs"; repo = "language-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-APzsrj/Ap6bSVw6atKYK4mndw2JJLZ8aNlaZL+GYLSM="; + hash = "sha256-oiQUEUBOZrTB7BhRmc4HEGTpbOGGSCiTlO/Cn0sBNtU="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-cgFA2yhq/gjjJFrTzg5QKdk8Lt+BYUo/qFpe6ZSon+k="; + hash = "sha256-BKiTGANch9phNN+zVpPzA+E4MtpM/G3yLiEQObtKLmI="; }; nativeBuildInputs = [ From 1cf35eabae20f57a66d3cdc40471c7ad2f41b12e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 19 Sep 2025 20:36:18 +0000 Subject: [PATCH 105/202] python3Packages.ray: 2.49.1 -> 2.49.2 Changelog: https://github.com/ray-project/ray/releases/tag/ray-2.49.2 --- .../python-modules/ray/default.nix | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 4ef02cb89b6a..e9d48ee56f23 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -64,7 +64,7 @@ let pname = "ray"; - version = "2.49.1"; + version = "2.49.2"; in buildPythonPackage rec { inherit pname version; @@ -85,28 +85,28 @@ buildPythonPackage rec { # Results are in ./ray-hashes.nix hashes = { x86_64-linux = { - cp310 = "sha256-k4TScFnK+Go4y7y0Iqthto3oczN4S/GyJyLXT9ugHvY="; - cp311 = "sha256-yKA5RHwwSeM226+f8WcylDr/i959U3Y5C8W3HrCMuZY="; - cp312 = "sha256-SEBk/KAnMuC29KCdrQ0ftqvUykttm/fCareheiiHzQk="; - cp313 = "sha256-147zp65IgZ1kD8BQBr8qfKq0ixXFZ6U6ecAV89AFSz0="; + cp310 = "sha256-dFZodq979OSOpLmzt1s02wU9EGTMTUsWcNxM549olK8="; + cp311 = "sha256-VAd93jOMX/ujSaSrYbcjUqPDvmnqW08bQ22Y1AsxJ2M="; + cp312 = "sha256-LsqqUfWIzN2ithVjqL44Q79l36qoOiQFiKMH9Ou4JHE="; + cp313 = "sha256-t9ghTP+G3wRP7HJ+7qvMw7/JsCcdKNYbqSwJ8NEn0B0="; }; aarch64-linux = { - cp310 = "sha256-jzmr4eTqXk3eJWfn5697QffrU/apw9PRy4APt6NlIQQ="; - cp311 = "sha256-y2/eQS5jT5MzPGRrEInk0xhLx/y3/AKBiJGygagCQNI="; - cp312 = "sha256-z2O5FuOZwqTUhCSWEals7ig87zLlRBJhFaStPocsNOs="; - cp313 = "sha256-lOHFBoiXxjVG0J6iY6iETOFjxtgM4wsa863HU3CL5jw="; + cp310 = "sha256-6uB7P+1F9bBBqL+Xlc0m+tJGS+USbv1EfkSEkFoptnc="; + cp311 = "sha256-6tqd2JzNpkOjxsLLpwFrWYmEMtEm4Qs4/tUtdBZTZPQ="; + cp312 = "sha256-3Q2NhkHRQvr+bYPofTwZvVY30h40YI0/9prXHqPi9GI="; + cp313 = "sha256-tMeGlojFGOkC97Yojt7CNlq00opGQpHm0KcEDH0Btfc="; }; x86_64-darwin = { - cp310 = "sha256-mQhrS7MgOL1jt1dWZ/3BQly3Ua/gQ07Q0Vjj0+4Mcm8="; - cp311 = "sha256-Wx4ACGFWodWJZk0ezOPUWJsInLqwnXuHgDYOWzSukHo="; - cp312 = "sha256-+TZd46mmYczwid+qwByLaLoAyYRDMw72eODAJIJyxyI="; - cp313 = "sha256-D7LijIDkWZ/+w6NOkmubASrRw1D0nNuNiJLderk7R4k="; + cp310 = "sha256-PkQb8qzX82jPRRMnUgZsXDuD2IzV+Fdi5wN3S7pPK20="; + cp311 = "sha256-ns6VehOYX3u/QHf0/wIEMU1+malB+V3/Kha0U9U3bcM="; + cp312 = "sha256-Z4TgduRBgiLvjuO2qL/rhn2Hl4A7Jbz8zjvzvFQUvvE="; + cp313 = "sha256-svTw/tk2+vaI6H/9zJNWwDRRPAAlmi8ahYnjRfz728A="; }; aarch64-darwin = { - cp310 = "sha256-+OEt19uCFahu9xg6LJwiECiA4OzQj5Sx0XrZ5gfko1k="; - cp311 = "sha256-lDJtsMg/fzkTUrE1s3qOynN8Gt3xiQKrGQvmuGCKgDk="; - cp312 = "sha256-96cVhV0XnB3Wri6LX4kZY4zeN5pbFXljoL100ReLi1o="; - cp313 = "sha256-XRnlaKjPvM8Si/NPnOSLy9EenwuU2xkEBPa+tVrkldI="; + cp310 = "sha256-CL7EZ1drwDDYvQY4AE4bjgdViJKTSREpiKS9SShoTow="; + cp311 = "sha256-T7n5v2L9XJLSLaIM0qrLSt4fsjAzdl+pJ08KDFC8QvY="; + cp312 = "sha256-1tYS3lxjQbd2/HXt7uW2mLtK9+6Eov8wVSsyqebkp3I="; + cp313 = "sha256-Li/iD6kFYuc2MNqf95MtPtZQfnMpHE2b31ZlN66d7d8="; }; }; in From 15a0152b3d5ad8ad36045e980f08ed2991363b8a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 19 Sep 2025 20:43:52 +0000 Subject: [PATCH 106/202] python3Packages.ray: delete binary-hashes.nix before writing into it --- pkgs/development/python-modules/ray/prefetch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ray/prefetch.sh b/pkgs/development/python-modules/ray/prefetch.sh index e91ca7d77f8f..459cdd8b1acf 100755 --- a/pkgs/development/python-modules/ray/prefetch.sh +++ b/pkgs/development/python-modules/ray/prefetch.sh @@ -3,7 +3,7 @@ outfile="ray-hashes.nix" # Clear file -echo "" >$outfile +rm -f $outfile prefetch() { package_attr="python${1}Packages.ray" From 6ef26e9bf5048c94e9ecc763093d22f9cfb2aac8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 19 Sep 2025 20:45:09 +0000 Subject: [PATCH 107/202] python3Packages.ray: format prefetch script --- .../python-modules/ray/prefetch.sh | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/ray/prefetch.sh b/pkgs/development/python-modules/ray/prefetch.sh index 459cdd8b1acf..56722c405849 100755 --- a/pkgs/development/python-modules/ray/prefetch.sh +++ b/pkgs/development/python-modules/ray/prefetch.sh @@ -6,23 +6,23 @@ outfile="ray-hashes.nix" rm -f $outfile prefetch() { - package_attr="python${1}Packages.ray" - echo "Fetching hash for $package_attr on $2" + package_attr="python${1}Packages.ray" + echo "Fetching hash for $package_attr on $2" - expr="(import { system = \"$2\"; }).$package_attr.src.url" - url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r) + expr="(import { system = \"$2\"; }).$package_attr.src.url" + url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r) - sha256=$(nix-prefetch-url "$url") - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sha256") + sha256=$(nix-prefetch-url "$url") + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sha256") - echo -e " cp${1} = \"${hash}\";" >>$outfile - echo + echo -e " cp${1} = \"${hash}\";" >>$outfile + echo } for system in "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"; do - echo "${system} = {" >>$outfile - for python_version in "310" "311" "312" "313"; do - prefetch "$python_version" "$system" - done - echo "};" >>$outfile + echo "${system} = {" >>$outfile + for python_version in "310" "311" "312" "313"; do + prefetch "$python_version" "$system" + done + echo "};" >>$outfile done From ec923b65ee39a1a7d599a903edab305784a5925b Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Fri, 19 Sep 2025 23:00:49 +0200 Subject: [PATCH 108/202] teleport: Re-add possibility for overrides The interface for the overrides `withRdpClient` and `extPatches` was removed with #411095. --- pkgs/by-name/te/teleport_16/package.nix | 4 +++- pkgs/by-name/te/teleport_17/package.nix | 4 +++- pkgs/by-name/te/teleport_18/package.nix | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix index a72616e3ffc7..0d8fdc114401 100644 --- a/pkgs/by-name/te/teleport_16/package.nix +++ b/pkgs/by-name/te/teleport_16/package.nix @@ -2,6 +2,8 @@ buildTeleport, buildGoModule, wasm-bindgen-cli_0_2_95, + withRdpClient ? true, + extPatches ? [ ], }: buildTeleport rec { version = "16.5.15"; @@ -11,5 +13,5 @@ buildTeleport rec { cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; - inherit buildGoModule; + inherit buildGoModule withRdpClient extPatches; } diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index 0da2cbc8e850..3213a864918b 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -2,6 +2,8 @@ buildTeleport, buildGoModule, wasm-bindgen-cli_0_2_95, + withRdpClient ? true, + extPatches ? [ ], }: buildTeleport rec { @@ -12,5 +14,5 @@ buildTeleport rec { pnpmHash = "sha256-ZONs8z8mgBBQBmqaDGJKqhmtUKBrxE8BGYppbAqpQmg="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; - inherit buildGoModule; + inherit buildGoModule withRdpClient extPatches; } diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix index f0c459886425..96081e9578d7 100644 --- a/pkgs/by-name/te/teleport_18/package.nix +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -2,6 +2,8 @@ buildTeleport, buildGo124Module, wasm-bindgen-cli_0_2_99, + withRdpClient ? true, + extPatches ? [ ], }: buildTeleport rec { @@ -13,4 +15,5 @@ buildTeleport rec { wasm-bindgen-cli = wasm-bindgen-cli_0_2_99; buildGoModule = buildGo124Module; + inherit withRdpClient extPatches; } From a9e48feca6fa4b80f206f3c65ba1fb52741564fa Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Fri, 19 Sep 2025 23:09:50 +0200 Subject: [PATCH 109/202] btop: 1.4.4 -> 1.4.5 Changelog: https://github.com/aristocratos/btop/releases/tag/v1.4.5 Diff: https://github.com/aristocratos/btop/compare/v1.4.4...v1.4.5 --- pkgs/by-name/bt/btop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix index 041fc92998af..066c7b2535fb 100644 --- a/pkgs/by-name/bt/btop/package.nix +++ b/pkgs/by-name/bt/btop/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "aristocratos"; repo = "btop"; rev = "v${version}"; - hash = "sha256-4H9UjewJ7UFQtTQYwvHZL3ecPiChpfT6LEZwbdBCIa0="; + hash = "sha256-ZLT+Hc1rvBFyhey+imbgGzSH/QaVxIh/jvDKVSmDrA0="; }; nativeBuildInputs = [ From 8b1245cfd9cf1c9ca025212854ad87bf51388622 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 22:01:31 +0000 Subject: [PATCH 110/202] python3Packages.systembridgemodels: 4.2.5 -> 5.1.1 --- .../development/python-modules/systembridgemodels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix index c4d522841d2f..4ee187884243 100644 --- a/pkgs/development/python-modules/systembridgemodels/default.nix +++ b/pkgs/development/python-modules/systembridgemodels/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "systembridgemodels"; - version = "4.2.5"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = "system-bridge-models"; tag = version; - hash = "sha256-k7QENmfw27qxacB6j1F8ywYfZyQC27PvnkWWQayk310="; + hash = "sha256-Yh16la+3zk+igdMyHov4rf2M1yAT3JYYe/0IYu/SmVY="; }; build-system = [ setuptools ]; From 13e11d05c3188f5f7e53767f16eb5c7606e94d43 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 19 Sep 2025 16:01:44 +0000 Subject: [PATCH 111/202] python3Packages.datafusion: 40.1.0 -> 48.0.0 Diff: https://github.com/apache/arrow-datafusion-python/compare/40.1.0...48.0.0 Changelog: https://github.com/apache/arrow-datafusion-python/blob/48.0.0/CHANGELOG.md --- .../python-modules/datafusion/default.nix | 78 ++++++++----------- 1 file changed, 31 insertions(+), 47 deletions(-) diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index 9ea5b128e10d..c9c796b66eb5 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -1,40 +1,28 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, rustPlatform, - pytestCheckHook, - libiconv, - numpy, - protobuf, + + # nativeBuildInputs protoc, + + # buildInputs + protobuf, + + # dependencies pyarrow, typing-extensions, - pythonOlder, + + # tests + numpy, + pytest-asyncio, + pytestCheckHook, }: -let - arrow-testing = fetchFromGitHub { - name = "arrow-testing"; - owner = "apache"; - repo = "arrow-testing"; - rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c"; - hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o="; - }; - - parquet-testing = fetchFromGitHub { - name = "parquet-testing"; - owner = "apache"; - repo = "parquet-testing"; - rev = "50af3d8ce206990d81014b1862e5ce7380dc3e08"; - hash = "sha256-edyv/r5olkj09aHtm8LHZY0b3jUtLNUcufwI41qKYaY="; - }; -in - buildPythonPackage rec { pname = "datafusion"; - version = "40.1.0"; + version = "48.0.0"; pyproject = true; src = fetchFromGitHub { @@ -42,13 +30,14 @@ buildPythonPackage rec { owner = "apache"; repo = "arrow-datafusion-python"; tag = version; - hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg="; + # Fetch arrow-testing and parquet-testing (tests assets) + fetchSubmodules = true; + hash = "sha256-9IOkb31f4nFo9mWTr+z5ZG8xSXIZSgW3vCBgLaGxpfI="; }; cargoDeps = rustPlatform.fetchCargoVendor { - name = "datafusion-cargo-deps"; - inherit src; - hash = "sha256-xUpchV4UFEX1HkCpClOwxnEfGLVlOIX4UmzYKiUth9U="; + inherit pname src version; + hash = "sha256-P9NFvhHAGgYIi36CHEPZPr8hmMNp5zrCcmE7NHx51k4="; }; nativeBuildInputs = with rustPlatform; [ @@ -59,9 +48,6 @@ buildPythonPackage rec { buildInputs = [ protobuf - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv ]; dependencies = [ @@ -70,28 +56,26 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook numpy + pytest-asyncio + pytestCheckHook ]; - pythonImportsCheck = [ "datafusion" ]; - - pytestFlags = [ - "--pyargs" - pname + pythonImportsCheck = [ + "datafusion" + "datafusion._internal" ]; preCheck = '' - pushd $TMPDIR - ln -s ${arrow-testing} ./testing - ln -s ${parquet-testing} ./parquet + rm -rf python/datafusion ''; - postCheck = '' - popd - ''; + disabledTests = [ + # Exception: DataFusion error (requires internet access) + "test_register_http_csv" + ]; - meta = with lib; { + meta = { description = "Extensible query execution framework"; longDescription = '' DataFusion is an extensible query execution framework, written in Rust, @@ -99,7 +83,7 @@ buildPythonPackage rec { ''; homepage = "https://arrow.apache.org/datafusion/"; changelog = "https://github.com/apache/arrow-datafusion-python/blob/${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ cpcloud ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ cpcloud ]; }; } From 192a1b856a7168d74dcf312774ca1a1ced5f3f59 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 19 Sep 2025 15:39:17 +0000 Subject: [PATCH 112/202] rerun: 0.24.1 -> 0.25.1 Diff: https://github.com/rerun-io/rerun/compare/0.24.1...0.25.1 Changelog: https://github.com/rerun-io/rerun/blob/0.25.1/CHANGELOG.md --- pkgs/by-name/re/rerun/package.nix | 6 +++--- pkgs/development/python-modules/rerun-sdk/default.nix | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index acf6d0799335..24d03ffe4464 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -34,13 +34,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = "rerun-io"; repo = "rerun"; tag = finalAttrs.version; - hash = "sha256-unPgvQcYhshdx5NGCl/pLh8UdJ9T6B8Fd0s8G1NSBmE="; + hash = "sha256-YppVNVfVqOATLCoUvpeYYrhivKBb6f4G1JCG1Bl+cjc="; }; # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' ''; - cargoHash = "sha256-zdq8djnmH8srSd9sml7t6wsbxpTaT3x5/7hkDRgelbg="; + cargoHash = "sha256-jUn7b6t5hS7KjdymxTTP8mKLT671QgKrv7R9uiOkmJU="; cargoBuildFlags = [ "--package rerun-cli" ]; cargoTestFlags = [ "--package rerun-cli" ]; diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index c42d58374018..c0b2e143a8fb 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -18,6 +18,7 @@ typing-extensions, # tests + datafusion, pytestCheckHook, torch, }: @@ -64,6 +65,7 @@ buildPythonPackage { pythonImportsCheck = [ "rerun" ]; nativeCheckInputs = [ + datafusion pytestCheckHook torch ]; @@ -74,6 +76,9 @@ buildPythonPackage { disabledTestPaths = [ # "fixture 'benchmark' not found" "tests/python/log_benchmark/test_log_benchmark.py" + + # ConnectionError: Connection error: transport error + "rerun_py/tests/unit/test_datafusion_tables.py" ]; meta = { From 62dcfaa4b6e2b98c087a91afc7405a9a1d0f434f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Sep 2025 01:10:08 +0200 Subject: [PATCH 113/202] python3Packages.bluetooth-auto-recovery: 1.5.2 -> 1.5.3 https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/releases/tag/v1.5.3 --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 19d60975fb10..5ba6a6b19caf 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-auto-recovery"; tag = "v${version}"; - hash = "sha256-9FwQNauWnWQ7BQoKMwYEEc96/iP6iH9SfvHxlZtePOQ="; + hash = "sha256-xnEEq3NVScMbMjZWb4lI+kpy2zr6WlXx3XcBhzN1rZ4="; }; build-system = [ poetry-core ]; From a69fa19d255d7ec423808188f0243e725c3ec65b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Sep 2025 01:17:26 +0200 Subject: [PATCH 114/202] python3Packages.holidays: 0.80 -> 0.81 https://github.com/vacanza/python-holidays/releases/tag/v0.81 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index f88a39d4e957..00496fcc251e 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.80"; + version = "0.81"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-zKsJ85dd+SE2OL0t/5aHtXoHsz2WuTkg11mo2wlmeTM="; + hash = "sha256-p1+/BRi/4QG524nT9lns1AGc6jeO9KTJNJ2rljkrmko="; }; build-system = [ From e97f29afd75bf8c8ae7e633190078a2a29d6ce1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Sep 2025 01:20:24 +0200 Subject: [PATCH 115/202] python3Packages.opower: 0.15.4 -> 0.15.5 https://github.com/tronikos/opower/releases/tag/v0.15.5 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 7253c4116ad2..3d4bb2a2a5e2 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "opower"; - version = "0.15.4"; + version = "0.15.5"; pyproject = true; src = fetchFromGitHub { owner = "tronikos"; repo = "opower"; tag = "v${version}"; - hash = "sha256-+y2lQnF48b2PKocQw6eEDPNTqZSB4aOALMfNOIVS+Yg="; + hash = "sha256-K0GYXubMKh2B7KYhZOaecBWArTBayl/Wq5Ha3jJyixE="; }; build-system = [ setuptools ]; From 32b363cf877144915d35a02b973a2b1271afafb9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Sep 2025 01:25:27 +0200 Subject: [PATCH 116/202] python3Packages.py-melissa-climate: 2.1.2 -> 2.1.4 https://github.com/kennedyshead/py-melissa-climate/compare/2.1.2...2.1.4 --- .../python-modules/py-melissa-climate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/py-melissa-climate/default.nix b/pkgs/development/python-modules/py-melissa-climate/default.nix index 019b84bbf9fc..dc66538400e2 100644 --- a/pkgs/development/python-modules/py-melissa-climate/default.nix +++ b/pkgs/development/python-modules/py-melissa-climate/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "py-melissa-climate"; - version = "2.1.2"; + version = "2.1.4"; pyproject = true; src = fetchFromGitHub { owner = "kennedyshead"; repo = "py-melissa-climate"; - tag = "V${version}"; - hash = "sha256-Z1A0G3g8dyoG+zUxUTqI/OxczvUVy2kSI04YP0WeXso="; + tag = version; + hash = "sha256-zYr+nKdO+lCLLYGSvY16MUs8TxbWcyaoQk9cwNQ704Y="; }; postPatch = '' From d0e0f63b7bcdcbe1b33a5d5fc533d84411d3457c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Sep 2025 01:45:20 +0200 Subject: [PATCH 117/202] python3Packages.pyemoncms: 0.1.2 -> 0.1.3 https://github.com/Open-Building-Management/pyemoncms/releases/tag/v0.1.3 --- pkgs/development/python-modules/pyemoncms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyemoncms/default.nix b/pkgs/development/python-modules/pyemoncms/default.nix index 8651b61f8863..d1faa4e4863f 100644 --- a/pkgs/development/python-modules/pyemoncms/default.nix +++ b/pkgs/development/python-modules/pyemoncms/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyemoncms"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "Open-Building-Management"; repo = "pyemoncms"; tag = "v${version}"; - hash = "sha256-61i7VKmPSMUrUSgnDtKROdDdM0QDqOTsqnLjGLkgGII="; + hash = "sha256-Bvcnl3av9SF0CNUjg/QDdvENIEgPg26fAJ522jBrL7Q="; }; build-system = [ setuptools ]; From afd43edecd6418cc6befa3f94d4d8677f93be437 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Sep 2025 01:47:23 +0200 Subject: [PATCH 118/202] python3Packages.pylamarzocco: 2.0.11 -> 2.1.0 https://github.com/zweckj/pylamarzocco/releases/tag/v2.1.0 --- pkgs/development/python-modules/pylamarzocco/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index e895eb3180ac..2a05a85a4e14 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -4,6 +4,7 @@ aioresponses, bleak, buildPythonPackage, + cryptography, fetchFromGitHub, mashumaro, pytest-asyncio, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "pylamarzocco"; - version = "2.0.11"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pylamarzocco"; tag = "v${version}"; - hash = "sha256-g0qhNBhcU7Dogcw9WiEk+APk2McU7woXBqgeUS9D8iQ="; + hash = "sha256-dUFjbht0QGrWtSl3JIx1dx4UQs5gFNqKw+UObgH25pk="; }; build-system = [ setuptools ]; @@ -32,6 +33,7 @@ buildPythonPackage rec { dependencies = [ aiohttp bleak + cryptography mashumaro ]; From 22bdff5f92e4c21bb388cbcef387dbcf3a2907b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Sep 2025 01:48:28 +0200 Subject: [PATCH 119/202] python3Packages.waterfurnace: 1.1.0 -> 1.2.0 https://github.com/sdague/waterfurnace/blob/v1.2.0/HISTORY.rst --- pkgs/development/python-modules/waterfurnace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index 7ec4a8f21af1..696506272078 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "waterfurnace"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sdague"; repo = "waterfurnace"; tag = "v${version}"; - sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf"; + sha256 = "sha256-lix8dU9PxlsXIzKNFuUJkd80cUYXfTXSnFLu1ULACkE="; }; postPatch = '' From c3f8bcfd7400ecf44b8c8795b9d72aa9afb34e0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Sep 2025 01:48:46 +0200 Subject: [PATCH 120/202] home-assistant: 2025.9.3 -> 2025.9.4 https://github.com/home-assistant/core/releases/tag/2025.9.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d4bcf116c8ea..e5679a63fa1c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.9.3"; + version = "2025.9.4"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a41322917e92..4376780501bf 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -358,7 +358,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.9.3"; + hassVersion = "2025.9.4"; in python.pkgs.buildPythonApplication rec { @@ -379,13 +379,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-iGOpLZMrEu0z+VdQMn1OeI1rw4x3WawQemyOdt7j124="; + hash = "sha256-d2lsyW2yAkIbq7wx/pLu4Qzroblh/TYDx08r6im8cI8="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-iw5RNM6VoiGfCmGgqfqMQot9ArPlKk/tXJUJZNs7Kzg="; + hash = "sha256-mq2cjct4YrURV/T51w/skukwEsUV4iwDphuOftFOUdw="; }; build-system = with python.pkgs; [ From a3b1f1c196168ac8ad334ba8d46bd282f50f8fea Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 20 Sep 2025 00:06:46 +0000 Subject: [PATCH 121/202] wofi-power-menu: 0.3.1 -> 0.3.2 Changelog: https://github.com/szaffarano/wofi-power-menu/releases/tag/v0.3.2 Diff: https://github.com/szaffarano/wofi-power-menu/compare/v0.3.1...v0.3.2 --- pkgs/by-name/wo/wofi-power-menu/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix index a30b9e7bad72..e1188885c8ea 100644 --- a/pkgs/by-name/wo/wofi-power-menu/package.nix +++ b/pkgs/by-name/wo/wofi-power-menu/package.nix @@ -6,30 +6,22 @@ wofi, versionCheckHook, nix-update-script, - yq, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wofi-power-menu"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "szaffarano"; repo = "wofi-power-menu"; tag = "v${finalAttrs.version}"; - hash = "sha256-3m4zTmjYn1WGdW5dY4tzYxOxdw0spwYxZFRhdBwWf2I="; + hash = "sha256-EQHmi530ePlYRdjj/b+iF5edQFolZF0oVjSpyOE1Uk8="; }; - postPatch = '' - tomlq -ti '.package.version = "0.3.1"' Cargo.toml - ''; + cargoHash = "sha256-anArTkPkgYj7B2uKFRTN+aotLpdNSBdlkYERGJc0Xbo="; - cargoHash = "sha256-5txhSjCXlGqTmeG9EO1AUbt4syrTD62g4LtfO6nhAes="; - - nativeBuildInputs = [ - makeBinaryWrapper - yq # for `tomlq` - ]; + nativeBuildInputs = [ makeBinaryWrapper ]; postInstall = '' wrapProgram $out/bin/wofi-power-menu \ From 8d9fb1bcc76e5d0986ce009b3cf05922a7c6da90 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 20 Sep 2025 00:06:55 +0000 Subject: [PATCH 122/202] xh: 0.24.1 -> 0.25.0 Changelog: https://github.com/ducaale/xh/blob/v0.25.0/CHANGELOG.md Diff: https://github.com/ducaale/xh/compare/v0.24.1...v0.25.0 --- pkgs/by-name/xh/xh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index 3155b5fc14d9..47e4e14ce9dd 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xh"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; tag = "v${finalAttrs.version}"; - hash = "sha256-2c96O5SL6tcPSbxx8NYxG8LDX3ZgyxEMmEeJnKDwb38="; + hash = "sha256-UuWNLsJAoSjDPs/8VzW2vics3A/nsXWR5xmjMqTmYvQ="; }; - cargoHash = "sha256-oncf3Hd85LgKn8KSDIBHXLJ3INzfp0X/Ng9OjAltLB4="; + cargoHash = "sha256-SsJSBkOdQSpbEbFPK+qscSBePUKMLM1UpajpvpR2ZEo="; buildFeatures = lib.optional withNativeTls "native-tls"; From 6a3c66c52ddd54af8b7202d902881910e044adca Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 19 Sep 2025 17:22:48 -0700 Subject: [PATCH 123/202] frugally-deep: 0.15.24-p0 -> 0.18.2-unstable-2025-06-16 Bump required for CMake 4 compat. Upstream haven't tagged since supporting CMake 4. --- pkgs/by-name/fr/frugally-deep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix index 7435378c68f4..4f2d31f0e634 100644 --- a/pkgs/by-name/fr/frugally-deep/package.nix +++ b/pkgs/by-name/fr/frugally-deep/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "frugally-deep"; - version = "0.15.24-p0"; + version = "0.18.2-unstable-2025-06-16"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "frugally-deep"; - rev = "v${finalAttrs.version}"; - hash = "sha256-yg2SMsYOOSOgsdwIH1bU3iPM45z6c7WeIrgOddt3um4="; + rev = "30a4ce4c932ca810a5a77c4ab943a520bb1048fe"; + hash = "sha256-tcwCRSHhN61ZFDFVQ/GItvgSSjeLSbFDoNMqwswtvto="; }; nativeBuildInputs = [ From d1356793bb1edd43c2db262b180eb8dbcb1663d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 01:12:09 +0000 Subject: [PATCH 124/202] python3Packages.pyemoncms: 0.1.2 -> 0.1.3 --- pkgs/development/python-modules/pyemoncms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyemoncms/default.nix b/pkgs/development/python-modules/pyemoncms/default.nix index 8651b61f8863..d1faa4e4863f 100644 --- a/pkgs/development/python-modules/pyemoncms/default.nix +++ b/pkgs/development/python-modules/pyemoncms/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyemoncms"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "Open-Building-Management"; repo = "pyemoncms"; tag = "v${version}"; - hash = "sha256-61i7VKmPSMUrUSgnDtKROdDdM0QDqOTsqnLjGLkgGII="; + hash = "sha256-Bvcnl3av9SF0CNUjg/QDdvENIEgPg26fAJ522jBrL7Q="; }; build-system = [ setuptools ]; From 9eb76e6d8777b9ff228ae734e60624f8e7cc3786 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Fri, 19 Sep 2025 21:03:58 -0400 Subject: [PATCH 125/202] restish: 0.20.0 -> 0.21.0 Diff: https://github.com/danielgtaylor/restish/compare/refs/tags/v0.20.0...refs/tags/v0.21.0 Changelog: https://github.com/danielgtaylor/restish/releases/tag/v0.21.0 --- pkgs/by-name/re/restish/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix index 09c9a0eeac7a..d46bc3718038 100644 --- a/pkgs/by-name/re/restish/package.nix +++ b/pkgs/by-name/re/restish/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "restish"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "danielgtaylor"; repo = "restish"; tag = "v${version}"; - hash = "sha256-a0ObgFgWEsLYjGmCCi/py2PADAWJ0By+AZ4wh+Yeam4="; + hash = "sha256-eLbeH6i+QbW59DMOHf83olrO8R7Ji975KkJKs621Xi0="; }; - vendorHash = "sha256-qeArar0WnMACUnKBlC+PcFeJPzofwbK440A4M/rQ04U="; + vendorHash = "sha256-bO0z+LCiF/Dp0hKNulBmCgk16NzCCoY32P2/Ieq8y+c="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 @@ -41,6 +41,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = restish; + command = "HOME=$(mktemp -d) restish --version"; }; meta = { From 61145dceb0f5590813596788a2bb64d3a1ea6a2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 01:19:52 +0000 Subject: [PATCH 126/202] home-assistant-custom-lovelace-modules.universal-remote-card: 4.7.2 -> 4.8.0 --- .../universal-remote-card/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index 109e59fab9e4..490ab6a94803 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.7.2"; + version = "4.8.0"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-/c9hheiNJX3DBeLayX0fBAHBG3AxXHIwAVG6VlmrhnM="; + hash = "sha256-t70Nm695FBBsxnZ2wxPjo86OQ7X2/NLKkhePQ23xj/4="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-uPR26V9o8xnaXhNGnRqIwYtnHPoFznEG2wT+q4ByR1c="; + npmDepsHash = "sha256-TFfyq6wCQ6kAOHn75YqOTOrT17ASvOSnO2mr7qnc+Zw="; installPhase = '' runHook preInstall From aa4e1bc9f8a894a9b8c16165be2a4db00c2dc039 Mon Sep 17 00:00:00 2001 From: botnk Date: Sat, 20 Sep 2025 01:29:19 +0000 Subject: [PATCH 127/202] zed-editor: 0.204.2 -> 0.204.3 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.204.3 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 2f08efa307b1..189522135f64 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.204.2"; + version = "0.204.3"; outputs = [ "out" @@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-WYdSWyWkCberMBJlow/V7FGQTL0ww1SQ5L0zNsnNg58="; + hash = "sha256-nEaV6VQk294zlkkooe1Xh78GHBNzRizopiN9TjRoZNU="; }; patches = [ @@ -143,7 +143,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}' ''; - cargoHash = "sha256-cDlcwbxE+52YAHLPb+ijJZE9zQwvtm7glfru0qyQWwA="; + cargoHash = "sha256-vbnFXLWgKljlkdQg30tPOX6Kz8EXZoj0I8diwFh//3s="; nativeBuildInputs = [ cmake From 1edaeecd325fa2d5e73809c4732ef2c86aafddbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 01:41:20 +0000 Subject: [PATCH 128/202] misconfig-mapper: 1.14.5 -> 1.14.9 --- pkgs/by-name/mi/misconfig-mapper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index 515893a91bd3..b1f6d2d8e615 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.14.5"; + version = "1.14.9"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${version}"; - hash = "sha256-faIjS3B019eYefOIklJMuUVcCzkM3bHu/HJ1kaERtUA="; + hash = "sha256-4d7/RxL8+ZJXnoU2zOl6W6f5/KsuqrS95IYttC81zVA="; }; - vendorHash = "sha256-mh66gH4ln/D2OWaD+VISTysszjpPGg2dHF29BD1i6z8="; + vendorHash = "sha256-2DlhNr1P6NEeV5IIum19LWufFlOcXxfLH93k3jkwnDA="; ldflags = [ "-s" From 8ffab6685a7aa5a60a58958c261a544e2f167343 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 02:03:18 +0000 Subject: [PATCH 129/202] ord: 0.23.2 -> 0.23.3 --- pkgs/by-name/or/ord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index 01fe1ccef7ea..217144492e6d 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ord"; - version = "0.23.2"; + version = "0.23.3"; src = fetchFromGitHub { owner = "ordinals"; repo = "ord"; rev = version; - hash = "sha256-p9WjZ8QsY5fvL91zPUKnK8p0ZJvAxzmPbN/UVWSNjqk="; + hash = "sha256-+e5l+ez/cDqoyqF05jv6bs1l82pHTMtGFdMEtUln/qM="; }; - cargoHash = "sha256-c3+yM7jJyIl2XpSOeqdeQP2OdRc7/t/epDTMoOa/66A="; + cargoHash = "sha256-LPClIma05n+e+mDy0ycaap84yzmDR+VnrT3RqGnfBLA="; nativeBuildInputs = [ pkg-config From db173f4a35bd8e0f76bd965879e8abb67ca26bfc Mon Sep 17 00:00:00 2001 From: Nathan Regner Date: Thu, 18 Sep 2025 16:42:49 -0600 Subject: [PATCH 130/202] mvnd: 1.0.2 -> 1.0.3 --- pkgs/by-name/mv/mvnd/package.nix | 40 ++++++++++--------- ...roovy-for-compatibility-with-Java-24.patch | 34 ---------------- 2 files changed, 21 insertions(+), 53 deletions(-) delete mode 100644 pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix index d651ff1dd103..b95960a857f5 100644 --- a/pkgs/by-name/mv/mvnd/package.nix +++ b/pkgs/by-name/mv/mvnd/package.nix @@ -1,8 +1,8 @@ { + lib, fetchFromGitHub, graalvmPackages, installShellFiles, - lib, makeWrapper, maven, mvnd, @@ -24,18 +24,17 @@ in maven.buildMavenPackage rec { pname = "mvnd"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "apache"; repo = "maven-mvnd"; rev = version; - sha256 = "sha256-c1jD7m4cOdPWQEoaUMcNap2zvvX7H9VaWQv8JSgAnRU="; + sha256 = "sha256-vlJG2uDY93iri1X7SYPRufAIN4fhAjCd8gCeCdz/QDE="; }; - patches = [ ./patches/0001-update-groovy-for-compatibility-with-Java-24.patch ]; # need graalvm at build-time for the `native-image` tool mvnJdk = graalvmPackages.graalvm-ce; - mvnHash = "sha256-/Ful6v3hfm+0aa0vBQhqMK6VE+93L3o7pwZ6wmeXzQY="; + mvnHash = "sha256-n6ZKEXDzyzMfUZt3WHkwCDB68gm30UGrFecffFy7ytA="; nativeBuildInputs = [ graalvmPackages.graalvm-ce @@ -44,22 +43,25 @@ maven.buildMavenPackage rec { ]; mvnDepsParameters = mvnParameters; - mvnParameters = lib.concatStringsSep " " [ - "-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository - "-Drat.skip=true" # skip license checks; they require manaul approval and should have already been run upstream - "-Dspotless.skip=true" # skip formatting checks + mvnParameters = lib.concatStringsSep " " ( + [ + "-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository + "-Drat.skip=true" # skip license checks; they require manaul approval and should have already been run upstream + "-Dspotless.skip=true" # skip formatting checks - # skip tests that fail in the sandbox - "-pl" - "!integration-tests" - "-Dtest=!org.mvndaemon.mvnd.client.OsUtilsTest,!org.mvndaemon.mvnd.cache.impl.CacheFactoryTest" - "-Dsurefire.failIfNoSpecifiedTests=false" + # skip tests that fail in the sandbox + "-pl" + "!integration-tests" + "-Dtest=!org.mvndaemon.mvnd.client.OsUtilsTest,!org.mvndaemon.mvnd.cache.impl.CacheFactoryTest,!org.mvndaemon.mvnd.client.NoDaemonTest" + "-Dsurefire.failIfNoSpecifiedTests=false" - "-Pnative" - # propagate linker args required by the darwin build - # see `buildGraalvmNativeImage` - ''-Dgraalvm-native-static-opt="-H:-CheckToolchain $(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)"'' - ]; + "-Pnative" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # see `buildGraalvmNativeImage` + "-DbuildArgs=-H:-CheckToolchain" + ] + ); installPhase = '' runHook preInstall diff --git a/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch b/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch deleted file mode 100644 index 8bbf9dbd41ab..000000000000 --- a/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4d92b26f6cfc7c5f164caf11c1d5325815058624 Mon Sep 17 00:00:00 2001 -From: Nathan Regner -Date: Fri, 16 May 2025 23:28:13 -0600 -Subject: [PATCH] build: update groovy for compatibility with Java 24 - ---- - pom.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pom.xml b/pom.xml -index c1cec38b..7534ffd5 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -80,7 +80,7 @@ - - 24.0.2 - 0.10.2 -- 4.0.22 -+ 4.0.24 - 1.0 - 3.26.3 - 3.9.9 -@@ -91,7 +91,7 @@ - - - 3.2.0 -- 3.0.2 -+ 4.2.0 - 1.6.0 - 1.10.3 - 1.0.25 --- -2.49.0 - From 53a24b0c99506f1314b1c0c7984bcbb9734b9733 Mon Sep 17 00:00:00 2001 From: Haylin Moore Date: Fri, 19 Sep 2025 19:20:15 -0700 Subject: [PATCH 131/202] mako: move homepage to github The current homepage https://wayland.emersion.fr/mako/ just redirects to the Github at https://github.com/emersion/mako. This redirect is via meta refresh element so you have to wait after page load for it to actually redirect and that makes me sad. --- pkgs/by-name/ma/mako/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix index de44821b8b94..bdc8c3f4e988 100644 --- a/pkgs/by-name/ma/mako/package.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight Wayland notification daemon"; - homepage = "https://wayland.emersion.fr/mako/"; + homepage = "https://github.com/emersion/mako"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dywedir From 019cef79ed07ca133b8689791f42e57b4e55fabe Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 20 Sep 2025 10:29:33 +0800 Subject: [PATCH 132/202] luau: 0.691 -> 0.692 --- pkgs/by-name/lu/luau/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index ecacacb73c0b..dc2d3f80a703 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.691"; + version = "0.692"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-rqdxnwrvzCWU+A6+VFiffNvUV76s6gIJ//IbhB1BFos="; + hash = "sha256-GMpSXCiM9QznRAfAsGF+UuzyqS84vGkEy6EZPObRUMk="; }; nativeBuildInputs = [ cmake ]; From 0ae083b339093c4e5b0e773b76bc6d5458fc2417 Mon Sep 17 00:00:00 2001 From: azey Date: Sat, 20 Sep 2025 04:47:58 +0200 Subject: [PATCH 133/202] maintainers: rename romner-set to azey7f transed my gender --- maintainers/maintainer-list.nix | 20 ++++++++------------ pkgs/by-name/vp/vpp/package.nix | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 465a7f392869..22d939271ac0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2703,6 +2703,14 @@ githubId = 426541; name = "Tim Kleinschmidt"; }; + azey7f = { + email = "me@azey.net"; + github = "azey7f"; + githubId = 41077433; + name = "azey"; + # assuming my nameservers are up: gpg --auto-key-locate clear,nodefault,cert,dane --locate-keys me@azey.net + keys = [ { fingerprint = "2CCB 3403 43FE 8A2B 91CE 7F75 F94F 4A71 C5C2 1E8F"; } ]; + }; azuwis = { email = "azuwis@gmail.com"; github = "azuwis"; @@ -22254,18 +22262,6 @@ githubId = 1217934; name = "José Romildo Malaquias"; }; - romner-set = { - email = "admin@cynosure.red"; - github = "romner-set"; - githubId = 41077433; - name = "romner-set"; - keys = [ - { - # uploaded to https://keys.openpgp.org - fingerprint = "4B75 244B 0279 9598 FF3B C21F 95FC 58F1 8CFD FAB0"; - } - ]; - }; ronanmacf = { email = "macfhlar@tcd.ie"; github = "RonanMacF"; diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix index 08756a76a320..89216bc71e7f 100644 --- a/pkgs/by-name/vp/vpp/package.nix +++ b/pkgs/by-name/vp/vpp/package.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { description = "Fast, scalable layer 2-4 multi-platform network stack running in user space"; homepage = "https://s3-docs.fd.io/vpp/${version}/"; license = [ lib.licenses.asl20 ]; - maintainers = with lib.maintainers; [ romner-set ]; + maintainers = with lib.maintainers; [ azey7f ]; mainProgram = "vpp"; platforms = lib.platforms.linux; }; From fd8819a656b3bdc7e5fefb05fa27e8d8f45a22e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 02:52:08 +0000 Subject: [PATCH 134/202] telegraf: 1.35.4 -> 1.36.1 --- pkgs/by-name/te/telegraf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index dd9909881ce2..f81328763f31 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.35.4"; + version = "1.36.1"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-4/7lhqdK8JgIpMHFHRajNT/Lz3E1SShYB99PxoeGuz8="; + hash = "sha256-WuxQP0ogbCYuwuIUA8U8UD8usGXuPM2iTCms+yPU8vM="; }; - vendorHash = "sha256-NfkZutoa2LH3q/kYQCVvd3ExtV7RMu0sXKX/RNJLkPU="; + vendorHash = "sha256-wIf8Mo4IkR3CC6PnoGL+Jj5XGDpom3RnXmVLobs6DoM="; proxyVendor = true; ldflags = [ From 627b79c1d3cd85488ad4ba34e1e24e0168b02ac3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 03:19:59 +0000 Subject: [PATCH 135/202] python3Packages.yara-x: 1.6.0 -> 1.7.1 --- pkgs/development/python-modules/yara-x/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix index f3eb04f87c5b..ff7ded208f81 100644 --- a/pkgs/development/python-modules/yara-x/default.nix +++ b/pkgs/development/python-modules/yara-x/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "yara-x"; - version = "1.6.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-x"; tag = "v${version}"; - hash = "sha256-LpdpdzUof+Buz5QQcWUr23AsSyfvUQYPp7RhHWXRb+I="; + hash = "sha256-Ux7BA5LH1HN7Kq84UQw7n7Ad/LmHekdWkLaUIxvp5g8="; }; buildAndTestSubdir = "py"; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-IO8ER92vWO3Q9MntaGwdhEFgy9G35Q3LOG5GU5rJpQY="; + hash = "sha256-o9m1zPDhn5ZxBonQMTFp19jUYMInwW9r/O8UwQpExqk="; }; nativeBuildInputs = [ From 7e95c2d1cf92facf2ea6d40bbd7a0aec0e3927b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 03:24:57 +0000 Subject: [PATCH 136/202] python3Packages.llama-stack-client: 0.2.20 -> 0.2.22 --- .../development/python-modules/llama-stack-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-stack-client/default.nix b/pkgs/development/python-modules/llama-stack-client/default.nix index 3212702eb680..449fdb9d3b30 100644 --- a/pkgs/development/python-modules/llama-stack-client/default.nix +++ b/pkgs/development/python-modules/llama-stack-client/default.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { pname = "llama-stack-client"; - version = "0.2.20"; + version = "0.2.22"; pyproject = true; src = fetchPypi { pname = "llama_stack_client"; inherit version; - hash = "sha256-NWJX8KS7tkIF+J4RPXFZJYU9XjTsdE5yRm2nJ5C6QVs="; + hash = "sha256-mgvHVrkevVOYWO6vHyMcXlxpAOHqT8ztcmxnF/PSfKc="; }; postPatch = '' From 2851c728eef384241611abbc7e8136ae17603233 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 03:25:05 +0000 Subject: [PATCH 137/202] python3Packages.llama-index-node-parser-docling: 0.4.0 -> 0.4.1 --- .../llama-index-node-parser-docling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix b/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix index 8d6b4774997e..96d199750176 100644 --- a/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix +++ b/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "llama-index-node-parser-docling"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchPypi { pname = "llama_index_node_parser_docling"; inherit version; - hash = "sha256-3D2X5sKAaweJG5w5qVeCEMgvKPZVUdI4/GsSwB9zfQ4="; + hash = "sha256-1Nauru9zoHaUvDiAQ2ZPwGXjwLQj2ztBaCpEHsr3YfM="; }; build-system = [ hatchling ]; From c221a99361871225dc85cb4978df956ac47deadb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 03:26:51 +0000 Subject: [PATCH 138/202] python3Packages.llama-index-vector-stores-milvus: 0.9.1 -> 0.9.2 --- .../llama-index-vector-stores-milvus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix index e1b95f532a69..d1738cbb470b 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-milvus"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_milvus"; inherit version; - hash = "sha256-8alWmT1CglPpvDqbav7AoahIOcabchsiUmrAbBeOyZI="; + hash = "sha256-qIGFmmiet1VXkQLyy72l2ub5ePyYwozTzisVhQkWmoY="; }; build-system = [ hatchling ]; From 548ed262ce47523c9062960fbb0da2b2d60a2af1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 03:34:25 +0000 Subject: [PATCH 139/202] python3Packages.llama-index-readers-docling: 0.4.0 -> 0.4.1 --- .../python-modules/llama-index-readers-docling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-docling/default.nix b/pkgs/development/python-modules/llama-index-readers-docling/default.nix index fdad8918d170..508bfcacb95f 100644 --- a/pkgs/development/python-modules/llama-index-readers-docling/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-docling/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-readers-docling"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_docling"; inherit version; - hash = "sha256-b9UxJWlh/KnfTIOcKe9jiWCD1VknqeJH2hQjrDNmsOg="; + hash = "sha256-Et17yfWK+SSeWZymN26J4PjKx4FimGaJmMZaXazq5B0="; }; build-system = [ hatchling ]; From 58a66b7e08f921de3d55596ea3ed028d8f22978c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 04:16:02 +0000 Subject: [PATCH 140/202] python3Packages.wgpu-py: 0.23.0 -> 0.24.0 --- pkgs/development/python-modules/wgpu-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix index 0760ef3f2270..bcf1f70b0227 100644 --- a/pkgs/development/python-modules/wgpu-py/default.nix +++ b/pkgs/development/python-modules/wgpu-py/default.nix @@ -38,14 +38,14 @@ }: buildPythonPackage rec { pname = "wgpu-py"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; src = fetchFromGitHub { owner = "pygfx"; repo = "wgpu-py"; tag = "v${version}"; - hash = "sha256-z9MRnhPSI+9lGS0UQ5VnSwdCGdYdNnqlDQmb8JAqmyc="; + hash = "sha256-t6ILhMeDl8pdOKXkDpJPnXZRrKD+pIgS6BWurhGMalk="; }; postPatch = From 4e2bf7265d4355f90401a2240703ae5a2a2a44e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 04:32:15 +0000 Subject: [PATCH 141/202] python3Packages.pyiskra: 0.1.26 -> 0.1.27 --- pkgs/development/python-modules/pyiskra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix index 2d2126f8076a..1cac801430c7 100644 --- a/pkgs/development/python-modules/pyiskra/default.nix +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyiskra"; - version = "0.1.26"; + version = "0.1.27"; pyproject = true; src = fetchFromGitHub { owner = "Iskramis"; repo = "pyiskra"; tag = "v${version}"; - hash = "sha256-RUMMXlLdG4cqBrNOK5f1jv0jSU8n/P3XrvA7l1hij1g="; + hash = "sha256-qPyspRYXolndNMLHG2Ln6eL0emRCYYr/00WhrX876k0="; }; build-system = [ setuptools ]; From e85d49e5bce4627418777667fd7ca05be004d93a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 20 Sep 2025 14:37:41 +1000 Subject: [PATCH 142/202] maintainers: remove dpflug github account seems to have been deleted years ago --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/tq/tqsl/package.nix | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 465a7f392869..7ff999d31b18 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6839,12 +6839,6 @@ githubId = 349909; name = "David Percy"; }; - dpflug = { - email = "david@pflug.email"; - github = "dpflug"; - githubId = 108501; - name = "David Pflug"; - }; dr460nf1r3 = { email = "root@dr460nf1r3.org"; github = "dr460nf1r3"; diff --git a/pkgs/by-name/tq/tqsl/package.nix b/pkgs/by-name/tq/tqsl/package.nix index ad01f8e85ea3..6abdc4ea8d53 100644 --- a/pkgs/by-name/tq/tqsl/package.nix +++ b/pkgs/by-name/tq/tqsl/package.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://www.arrl.org/tqsl-download"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = [ maintainers.dpflug ]; + maintainers = [ ]; }; } From f199f6e7fbadc7989b9df6dd2e3fec81494acbb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 04:46:20 +0000 Subject: [PATCH 143/202] ni: 25.0.0 -> 26.0.1 --- pkgs/by-name/ni/ni/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index a12f3c2b610b..514ee9b68ef2 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -13,19 +13,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ni"; - version = "25.0.0"; + version = "26.0.1"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "ni"; tag = "v${finalAttrs.version}"; - hash = "sha256-kYV6pvxqpFAxlefUApmKODa+mqnio43YvjQvM4o1Wl0="; + hash = "sha256-R4X6X9Yys7zq8+3vGj0vamVsqLM0i/NO9HLTDlofX54="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-Xa515YJW6LNp0QAiAhL4Tt/PDdWWBKWDB357brzU478="; + hash = "sha256-eeZGLwiN8uu0GL8CGCAHsV2JepaZDcfnBipaLLWdXzw="; }; nativeBuildInputs = [ From e4941ba4925fb62fbeca4658ff3771ac3ea745df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 04:57:01 +0000 Subject: [PATCH 144/202] python3Packages.pytest-reverse: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/pytest-reverse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-reverse/default.nix b/pkgs/development/python-modules/pytest-reverse/default.nix index 7f12878b07ff..5a59c3595284 100644 --- a/pkgs/development/python-modules/pytest-reverse/default.nix +++ b/pkgs/development/python-modules/pytest-reverse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-reverse"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = "pytest-reverse"; rev = version; - hash = "sha256-JEJwl/4RL1THQ7cGaS/84KdhIQHB9eLTY5uV+84ald8="; + hash = "sha256-d9wx4N3RnPbOk+dZuJaCdbtXfQQwjGo5MwVNrNVGtlo="; }; nativeBuildInputs = [ setuptools ]; From fa3ff6a01a6b01bf83fb1e32413b3d4f3620203e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 05:39:31 +0000 Subject: [PATCH 145/202] postgresqlPackages.pg_roaringbitmap: 0.5.4 -> 0.5.5 --- pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix index 39b4c422675b..e8778ca26b10 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix @@ -7,13 +7,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_roaringbitmap"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "ChenHuajun"; repo = "pg_roaringbitmap"; tag = "v${finalAttrs.version}"; - hash = "sha256-E6vqawnsRsAIajGDgJcTUWV1H8GFFboTjhmVfemUGbs="; + hash = "sha256-5tThowu8k7R33rD/SXINOmzfgSkc4P3lVJ35BeCinZw="; }; meta = { From 147a14b31568890559848b255ae5d0123daf974e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 06:27:42 +0000 Subject: [PATCH 146/202] avalonia: 11.3.5 -> 11.3.6 --- pkgs/by-name/av/avalonia/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 4fc892085bae..93918899894f 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -46,14 +46,14 @@ stdenvNoCC.mkDerivation ( } rec { pname = "Avalonia"; - version = "11.3.5"; + version = "11.3.6"; src = fetchFromGitHub { owner = "AvaloniaUI"; repo = "Avalonia"; tag = version; fetchSubmodules = true; - hash = "sha256-o3KMfHNFDksz+8WO5TPoHPxVvjwuSZrwmB7kl+rvGDw="; + hash = "sha256-ulGaYlhWxSWKLMh6Hy6gzFuDl4rmF3NDlcAL12YYtAg="; }; patches = [ From d9f4b1b2a74994ec964287a0d731c584f0c8b745 Mon Sep 17 00:00:00 2001 From: L-Trump Date: Sat, 20 Sep 2025 14:56:58 +0800 Subject: [PATCH 147/202] easytier: add shell completions --- pkgs/by-name/ea/easytier/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 984377fb1926..8d9da626e16d 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -6,6 +6,7 @@ protobuf, nixosTests, nix-update-script, + installShellFiles, withQuic ? false, # with QUIC protocol support }: @@ -33,11 +34,19 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf rustPlatform.bindgenHook + installShellFiles ]; buildNoDefaultFeatures = stdenv.hostPlatform.isMips; buildFeatures = lib.optional stdenv.hostPlatform.isMips "mips" ++ lib.optional withQuic "quic"; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd easytier \ + --bash <($out/bin/easytier-cli gen-autocomplete bash) \ + --fish <($out/bin/easytier-cli gen-autocomplete fish) \ + --zsh <($out/bin/easytier-cli gen-autocomplete zsh) + ''; + doCheck = false; # tests failed due to heavy rely on network passthru = { From 8c2ae63b13f1be79c27508150025130b9d52d9b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 09:07:25 +0200 Subject: [PATCH 148/202] python313Packages.aioshelly: 13.9.0 -> 13.10.0 Diff: https://github.com/home-assistant-libs/aioshelly/compare/13.9.0...13.10.0 Changelog: https://github.com/home-assistant-libs/aioshelly/releases/tag/13.10.0 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index d7c62e7c3143..f4c3e6a2fbd5 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "13.9.0"; + version = "13.10.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-G8iZmgrTR+hqrRLoEdnJnqzU8GFQUrOrGenL6hkjtps="; + hash = "sha256-sN8Qr+ZgKBaZbTgQSGujdZmA3N0fBMFEPnUIWiBkPhg="; }; build-system = [ setuptools ]; From b1a9a35c3ce98f6d8ab2ebc2782d289c76d71f68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 07:12:51 +0000 Subject: [PATCH 149/202] python3Packages.msgraph-core: 1.3.5 -> 1.3.8 --- pkgs/development/python-modules/msgraph-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index c673d7e14421..3f98a1df1209 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.3.5"; + version = "1.3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; tag = "v${version}"; - hash = "sha256-0ey8sV0JDuOjdrOeO/hRxZ847DMcWai0B/YUWZ1VJ48="; + hash = "sha256-6M1C2Y0jYec/yKjigtbaaZiEL23csQAFtuUVMTlaiXk="; }; build-system = [ setuptools ]; From 1c212601aa3db56198e3d1d8c386ccae3dd0cefa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 09:25:40 +0200 Subject: [PATCH 150/202] python313Packages.gwcs: 0.25.2 -> 0.26.0 Diff: https://github.com/spacetelescope/gwcs/compare/0.25.2...0.26.0 Changelog: https://github.com/spacetelescope/gwcs/blob/0.26.0/CHANGES.rst --- pkgs/development/python-modules/gwcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gwcs/default.nix b/pkgs/development/python-modules/gwcs/default.nix index 7d73a5aa4ce5..2c5767f5cf5a 100644 --- a/pkgs/development/python-modules/gwcs/default.nix +++ b/pkgs/development/python-modules/gwcs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "gwcs"; - version = "0.25.2"; + version = "0.26.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "spacetelescope"; repo = "gwcs"; tag = version; - hash = "sha256-Pj/Ly/qMJdhdY8C/ZPaEV+hsYEh//ARvHitvlkjI8sM="; + hash = "sha256-cJfNVX7rdJASQA3NmZt7d4pvYh6GAteR22jat0kccoo="; }; build-system = [ From 14cac1bb77ad9407688e5edc3b1cab250747de8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 09:27:17 +0200 Subject: [PATCH 151/202] python313Packages.pytest-reverse: modernize --- .../python-modules/pytest-reverse/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytest-reverse/default.nix b/pkgs/development/python-modules/pytest-reverse/default.nix index 5a59c3595284..964cc1ad72d9 100644 --- a/pkgs/development/python-modules/pytest-reverse/default.nix +++ b/pkgs/development/python-modules/pytest-reverse/default.nix @@ -5,24 +5,21 @@ setuptools, pytest, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pytest-reverse"; version = "1.9.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = "pytest-reverse"; - rev = version; + tag = version; hash = "sha256-d9wx4N3RnPbOk+dZuJaCdbtXfQQwjGo5MwVNrNVGtlo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ pytest ]; @@ -33,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to reverse test order"; homepage = "https://github.com/adamchainz/pytest-reverse"; - changelog = "https://github.com/adamchainz/pytest-reverse/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/adamchainz/pytest-reverse/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ mbalatsko ]; }; From a78d4603b6ba48d426df424c0dcc7c08be931b88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 09:50:25 +0200 Subject: [PATCH 152/202] checkov: 3.2.461 -> 3.2.471 Diff: https://github.com/bridgecrewio/checkov/compare/3.2.461...3.2.471 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.471 --- pkgs/by-name/ch/checkov/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 86fc0a9a84f4..a68926cbab21 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -37,14 +37,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.461"; + version = "3.2.471"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-CKsQn5IAbfVR/j+wHs1rohFvwNO3f2FZ7UBps5ic5Rk="; + hash = "sha256-dAUokMpBvd2lAKNQJJqAthBUNoI3S1C7gat4Jda7bZk="; }; pythonRelaxDeps = [ From 70e6c17404cfbd3314337fc4199dfdedd7ff0aed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 07:50:31 +0000 Subject: [PATCH 153/202] libpinyin: 2.10.2 -> 2.10.3 --- pkgs/by-name/li/libpinyin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libpinyin/package.nix b/pkgs/by-name/li/libpinyin/package.nix index d82d0f5f52e9..3805e616ca9a 100644 --- a/pkgs/by-name/li/libpinyin/package.nix +++ b/pkgs/by-name/li/libpinyin/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libpinyin"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "libpinyin"; repo = "libpinyin"; tag = finalAttrs.version; - hash = "sha256-EexmZFGvuMextbiMZ6mSV58UUUjVVGMQubtS6DzoBs0="; + hash = "sha256-g3DgRYmLrXqAGxbyiI96UKT1gsJxLlx14K+2HzWR7nI="; }; postUnpack = '' From 8203384a393532d2adb29bb9981246de724d5525 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 20 Sep 2025 10:02:46 +0200 Subject: [PATCH 154/202] cdrkit: 1.1.11-3.5 -> 1.1.11-4 --- pkgs/by-name/cd/cdrkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cd/cdrkit/package.nix b/pkgs/by-name/cd/cdrkit/package.nix index 38f7594874df..604a502e464c 100644 --- a/pkgs/by-name/cd/cdrkit/package.nix +++ b/pkgs/by-name/cd/cdrkit/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdrkit"; - version = "1.1.11-3.5"; + version = "1.1.11-4"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "cdrkit"; rev = "debian/9%${finalAttrs.version}"; - hash = "sha256-T7WhztbpVvGegF6rTHGTkEALq+mcAtTerzDQ3f6Cq78="; + hash = "sha256-oOqvSA2MAURf0YOrWM5Ft6Ln43gXw7SEvNxxRrDs8sI="; }; nativeBuildInputs = [ From 62c5ee3c4471c792d08fee97b264220fda217c1a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 19 Sep 2025 21:17:25 +0000 Subject: [PATCH 155/202] python3Packages.dm-control: 1.0.31 -> 1.0.34 Diff: https://github.com/google-deepmind/dm_control/compare/1.0.31...1.0.34 Changelog: https://github.com/google-deepmind/dm_control/releases/tag/1.0.34 --- pkgs/development/python-modules/dm-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index fdc933f1bca7..b05ea253034f 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.31"; + version = "1.0.34"; pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; repo = "dm_control"; tag = version; - hash = "sha256-myrOrbKjBz+qN61WX54CqIaHsidUUBhgHezsdZvQFJA="; + hash = "sha256-AESUqrUw8EEUKNtZJ5M/dD7xDr+6VGi4yYacJw0q8Ls="; }; build-system = [ From 6b97ee62eb6000250b9fc5ebdb2e6b9feee22345 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 20 Sep 2025 10:07:01 +0200 Subject: [PATCH 156/202] cdrkit: apply patch for cmake 4 --- pkgs/by-name/cd/cdrkit/cmake-4.patch | 9 +++++++++ pkgs/by-name/cd/cdrkit/package.nix | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/by-name/cd/cdrkit/cmake-4.patch diff --git a/pkgs/by-name/cd/cdrkit/cmake-4.patch b/pkgs/by-name/cd/cdrkit/cmake-4.patch new file mode 100644 index 000000000000..ce46355e8e6d --- /dev/null +++ b/pkgs/by-name/cd/cdrkit/cmake-4.patch @@ -0,0 +1,9 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57edba6..f28af86 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,4 @@ ++CMAKE_MINIMUM_REQUIRED(VERSION 3.10) + PROJECT (cdrkit C) + SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit) + diff --git a/pkgs/by-name/cd/cdrkit/package.nix b/pkgs/by-name/cd/cdrkit/package.nix index 604a502e464c..7a98a58240ae 100644 --- a/pkgs/by-name/cd/cdrkit/package.nix +++ b/pkgs/by-name/cd/cdrkit/package.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-oOqvSA2MAURf0YOrWM5Ft6Ln43gXw7SEvNxxRrDs8sI="; }; + patches = [ + ./cmake-4.patch + ]; + nativeBuildInputs = [ cmake quilt From 8c14a2e9ef7ad269f126441576897967594ed227 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 08:07:56 +0000 Subject: [PATCH 157/202] weaver: 0.17.1 -> 0.18.0 --- pkgs/by-name/we/weaver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index 6921b3798077..aa8a0bd7f52b 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "weaver"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; tag = "v${finalAttrs.version}"; - hash = "sha256-9IPs8XIHPpYO6ukrzHw7qvuogNUj74tn6Jb4UTMTGFo="; + hash = "sha256-kEGz6alm+P6zKR4vxzsyZ67R99tVBjEIK0OEx6SzdvQ="; }; - cargoHash = "sha256-ow6huWumG0xz4AAM/D2v0MaZ0SzmbUnrEkL5ieNS4Io="; + cargoHash = "sha256-//nPXBUi7swKPusaamSJdsUTObnyh+wNc7i8CoyGWrU="; checkFlags = [ # Skip tests requiring network From e4cbbcc4008b4b37a56834a59b0ef1420893712a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 10:10:18 +0200 Subject: [PATCH 158/202] pip-audit: relax cyclonedx-python-lib --- pkgs/by-name/pi/pip-audit/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix index 721a9a8fd921..dbe14b1af7c6 100644 --- a/pkgs/by-name/pi/pip-audit/package.nix +++ b/pkgs/by-name/pi/pip-audit/package.nix @@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-j8ZKqE7PEwaCTUNnJunqM0A2eyuWfx8zG5i3nmZERow="; }; + pythonRelaxDeps = [ "cyclonedx-python-lib" ]; + build-system = with python3.pkgs; [ flit-core ]; dependencies = From fd45b6078f249370ad1f8113d5f8037d1cb69c1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 10:11:03 +0200 Subject: [PATCH 159/202] pip-audit: modernize --- pkgs/by-name/pi/pip-audit/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix index dbe14b1af7c6..2f4e7b3d56d3 100644 --- a/pkgs/by-name/pi/pip-audit/package.nix +++ b/pkgs/by-name/pi/pip-audit/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; version = "2.9.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "trailofbits"; From 6dc8602fea03fb69a0dfd5bd32aa8fb703f5bdca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 10:17:41 +0200 Subject: [PATCH 160/202] python313Packages.tagoio-sdk: modernize --- .../python-modules/tagoio-sdk/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/tagoio-sdk/default.nix b/pkgs/development/python-modules/tagoio-sdk/default.nix index efc9fff18e22..b7f8944e682e 100644 --- a/pkgs/development/python-modules/tagoio-sdk/default.nix +++ b/pkgs/development/python-modules/tagoio-sdk/default.nix @@ -3,21 +3,20 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, pytestCheckHook, python-dateutil, python-socketio, - pythonOlder, requests, requests-mock, + requests-toolbelt, + sseclient-py, }: buildPythonPackage rec { pname = "tagoio-sdk"; version = "5.0.3"; - format = "pyproject"; - - disabled = pythonOlder "3.9"; + pyproject = true; src = fetchFromGitHub { owner = "tago-io"; @@ -28,15 +27,15 @@ buildPythonPackage rec { pythonRelaxDeps = [ "requests" ]; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp python-dateutil python-socketio requests + requests-toolbelt + sseclient-py ]; nativeCheckInputs = [ From c4bf8c39a2a657a53ca7ca883d285a37b1eece46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 10:20:12 +0200 Subject: [PATCH 161/202] tunnelgraf: update changelog entry --- pkgs/by-name/tu/tunnelgraf/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix index 7a479b098ba5..a3d99cafec35 100644 --- a/pkgs/by-name/tu/tunnelgraf/package.nix +++ b/pkgs/by-name/tu/tunnelgraf/package.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool to manage SSH tunnel hops to many endpoints"; homepage = "https://github.com/denniswalker/tunnelgraf"; - changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/v${version}"; + changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "tunnelgraf"; From 141956d4d6fa2caf9c171746c06ad49e7076f17e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 09:04:32 +0000 Subject: [PATCH 162/202] gale: 1.9.6 -> 1.9.7 --- pkgs/by-name/ga/gale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index 155f2301fb6f..124107d22a61 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gale"; - version = "1.9.6"; + version = "1.9.7"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-zgwxr04MGs8EqrZBY5y8F1GNiaJbJUvpND52oLXtCrk="; + hash = "sha256-XEc8h7A1q+WfPl2HojFt2oIlAnNswq3X0o6jMZrEjCQ="; }; postPatch = '' @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-+ZZwYpYvIYmZFg9PA7kD/mBU1TrpEQIsoMmHSWyX+Xc="; + cargoHash = "sha256-zaTbb1+JK9mA9Tvnatw8lse5PBhKknDM48mN/sWLQ6w="; nativeBuildInputs = [ jq From 641a4592788f912c6ee0aee3bf48751dc0c449b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 09:41:12 +0000 Subject: [PATCH 163/202] libretro.snes9x: 0-unstable-2025-08-11 -> 0-unstable-2025-09-18 --- pkgs/applications/emulators/libretro/cores/snes9x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix index 5eca08b9f684..effe46dde609 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x"; - version = "0-unstable-2025-08-11"; + version = "0-unstable-2025-09-18"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "b33f2afb33c61d675aaf0319bd3b8cc8d6924d49"; - hash = "sha256-hhe52Ob+WC+wktXIYUoEfOq/FKyKGfeeX+BYyQ3xgXE="; + rev = "b43619754a595ec6feb089a387638118037ef74b"; + hash = "sha256-b6YC4qisHPdJtM1IEsrwUjCBZ6JElZuKvakApOLGGvY="; }; makefile = "Makefile"; From aeb3a0032cefb7d399fff727f18284501fc0b41f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 11:42:33 +0200 Subject: [PATCH 164/202] python313Packages.sshtunnel: disable failing test --- pkgs/development/python-modules/sshtunnel/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 59a2bbd6243c..1cec6aca987b 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { "test_get_keys" "connect_via_proxy" "read_ssh_config" + # Test doesn't work with paramiko < 4.0.0 and the patch above + "test_read_private_key_file" ]; meta = with lib; { From 2fad2a73081b28fd2c3b977750832be5af06b800 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 11:43:09 +0200 Subject: [PATCH 165/202] tunnelgraf: override paramiko --- pkgs/by-name/tu/tunnelgraf/package.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix index a3d99cafec35..254bffb5859d 100644 --- a/pkgs/by-name/tu/tunnelgraf/package.nix +++ b/pkgs/by-name/tu/tunnelgraf/package.nix @@ -1,10 +1,28 @@ { lib, fetchFromGitHub, + fetchPypi, python3, }: -python3.pkgs.buildPythonApplication rec { +let + py = python3.override { + packageOverrides = self: super: { + + # Doesn't work with latest paramiko + paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec { + version = "3.4.0"; + src = fetchPypi { + pname = "paramiko"; + inherit version; + hash = "sha256-qsCPJqMdxN/9koIVJ9FoLZnVL572hRloEUqHKPPCdNM="; + }; + doCheck = false; + }); + }; + }; +in +py.pkgs.buildPythonApplication rec { pname = "tunnelgraf"; version = "1.0.6"; pyproject = true; @@ -19,14 +37,14 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "click" "deepmerge" - "paramiko" "psutil" "pydantic" + "python-hosts" ]; - build-system = with python3.pkgs; [ hatchling ]; + build-system = with py.pkgs; [ hatchling ]; - dependencies = with python3.pkgs; [ + dependencies = with py.pkgs; [ click deepmerge paramiko From 4fab32231089f5cdb09ee5f6f268bab5b432ac36 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 11:52:56 +0200 Subject: [PATCH 166/202] python313Packages.rtsp-to-webrtc: remove rtsp-to-webrtc is no longer maintained and archived --- .../python-modules/rtsp-to-webrtc/default.nix | 44 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/development/python-modules/rtsp-to-webrtc/default.nix diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix deleted file mode 100644 index b889b4826a16..000000000000 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - aiohttp, - buildPythonPackage, - fetchFromGitHub, - pytest-aiohttp, - pytestCheckHook, - pythonOlder, - setuptools, -}: - -buildPythonPackage rec { - pname = "rtsp-to-webrtc"; - version = "0.6.1"; - pyproject = true; - - disabled = pythonOlder "3.10"; - - src = fetchFromGitHub { - owner = "allenporter"; - repo = "rtsp-to-webrtc-client"; - tag = version; - hash = "sha256-D022d2CDKtHTuvEGo8GkOGWHi5sV4g6UwNB9xS2xxIs="; - }; - - build-system = [ setuptools ]; - - dependencies = [ aiohttp ]; - - nativeCheckInputs = [ - pytest-aiohttp - pytestCheckHook - ]; - - pythonImportsCheck = [ "rtsp_to_webrtc" ]; - - meta = with lib; { - description = "Module for RTSPtoWeb and RTSPtoWebRTC"; - homepage = "https://github.com/allenporter/rtsp-to-webrtc-client"; - changelog = "https://github.com/allenporter/rtsp-to-webrtc-client/releases/tag/${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 869086c0154a..2f8e85a9e66a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -730,6 +730,7 @@ mapAliases ({ ROPGadget = ropgadget; # added 2021-07-06 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 rtslib = rtslib-fb; # added 2025-03-14 + rtsp-to-webrtc = throw "rtsp-to-webrtc has been removed because it is unmaintained"; # added 2025-09-20 ruamel_base = ruamel-base; # added 2021-11-01 ruamel_yaml = ruamel-yaml; # added 2021-11-01 ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40c1e29a051a..119600cd1428 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16121,8 +16121,6 @@ self: super: with self; { rtslib-fb = callPackage ../development/python-modules/rtslib-fb { }; - rtsp-to-webrtc = callPackage ../development/python-modules/rtsp-to-webrtc { }; - ruamel-base = callPackage ../development/python-modules/ruamel-base { }; ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { }; From 187ca9338684919a8eaf18830f7c2ca1377a7383 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 11:58:20 +0200 Subject: [PATCH 167/202] python313Packages.rki-covid-parser: remove rki-covid-parser is unmaintained --- .../rki-covid-parser/default.nix | 52 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/development/python-modules/rki-covid-parser/default.nix diff --git a/pkgs/development/python-modules/rki-covid-parser/default.nix b/pkgs/development/python-modules/rki-covid-parser/default.nix deleted file mode 100644 index 655767690105..000000000000 --- a/pkgs/development/python-modules/rki-covid-parser/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - aiohttp, - aioresponses, - buildPythonPackage, - fetchFromGitHub, - pytest-aiohttp, - pytestCheckHook, - pythonOlder, - setuptools, -}: - -buildPythonPackage rec { - pname = "rki-covid-parser"; - version = "1.3.3"; - pyproject = true; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "thebino"; - repo = "rki-covid-parser"; - tag = "v${version}"; - hash = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ aiohttp ]; - - nativeCheckInputs = [ - aioresponses - pytest-aiohttp - pytestCheckHook - ]; - - disabledTestPaths = [ - # Tests require network access - "tests/test_districts.py" - "tests/test_endpoint_availibility.py" - ]; - - pythonImportsCheck = [ "rki_covid_parser" ]; - - meta = with lib; { - description = "Python module for working with data from the Robert-Koch Institut"; - homepage = "https://github.com/thebino/rki-covid-parser"; - changelog = "https://github.com/thebino/rki-covid-parser/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 68c0ebc5d27b..0c632ff6cd1f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -733,6 +733,7 @@ mapAliases ({ retworkx = rustworkx; # added 2023-05-14 rig = throw "rig has been removed because it was pinned to python 2.7 and 3.5, failed to build and is otherwise unmaintained"; # added 2022-11-28 rising = throw "rising has been removed because it was abandoned and archived by upstream"; # added 2024-11-15 + rki-covid-parser = throw "rki-covid-parser has been removed because it is unmaintained and broken"; # added 2025-09-20 rl-coach = "rl-coach was removed because the project is discontinued and was archived by upstream"; # added 2023-05-03 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59d1335b3327..678ca0fc3c47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16025,8 +16025,6 @@ self: super: with self; { rjsmin = callPackage ../development/python-modules/rjsmin { }; - rki-covid-parser = callPackage ../development/python-modules/rki-covid-parser { }; - rkm-codes = callPackage ../development/python-modules/rkm-codes { }; rlax = callPackage ../development/python-modules/rlax { }; From 8eef4a2436910519fd9e9da33d70d4ee9cd0dbd2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Sep 2025 12:03:54 +0200 Subject: [PATCH 168/202] python313Packages.elasticsearch8: add missing inputs --- .../development/python-modules/elasticsearch8/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index de8d5ebb3730..185993a39f13 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -6,8 +6,10 @@ fetchPypi, hatchling, orjson, + python-dateutil, pythonOlder, requests, + typing-extensions, }: buildPythonPackage rec { @@ -24,7 +26,11 @@ buildPythonPackage rec { build-system = [ hatchling ]; - dependencies = [ elastic-transport ]; + dependencies = [ + elastic-transport + python-dateutil + typing-extensions + ]; optional-dependencies = { async = [ aiohttp ]; From 1cac88e0757531b9b929f553b8d63a02e594eb67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 10:05:04 +0000 Subject: [PATCH 169/202] home-assistant-custom-components.solis-sensor: 3.13.1 -> 3.13.2 --- .../home-assistant/custom-components/solis-sensor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix index f5a83ee9965b..b5b9d84e6e4f 100644 --- a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "hultenvp"; domain = "solis"; - version = "3.13.1"; + version = "3.13.2"; src = fetchFromGitHub { owner = "hultenvp"; repo = "solis-sensor"; rev = "v${version}"; - hash = "sha256-BhZqJVzNTCZ6XmqR7i6a7bMqk/6V+HXvtqOX4HiYqok="; + hash = "sha256-ny7nnBFDZyStoXMzmegKNzN9Gj1XNYETFXpNzUOs9Qc="; }; dependencies = [ aiofiles ]; From 23cea282babbe60caf9bfd08464932b5e8b2207d Mon Sep 17 00:00:00 2001 From: Pascal Jungblut Date: Sat, 20 Sep 2025 12:09:26 +0200 Subject: [PATCH 170/202] go-ios: fix build on darwin Since e03feee6e00e6867b243a1138565a4d841e1c2cf, the package applies patches to replace paths for Linux utilities. However, these are not available for Darwin. --- pkgs/by-name/go/go-ios/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix index 7c23051c394a..65e818f74680 100644 --- a/pkgs/by-name/go/go-ios/package.nix +++ b/pkgs/by-name/go/go-ios/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, nix-update-script, @@ -27,7 +28,7 @@ buildGoModule rec { "restapi" ]; - postPatch = '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace ncm/linux_commands.go \ --replace-fail "ip " "${lib.getExe' iproute2 "ip"} " From 48abfa54ee1f96c8ce4c287f0b4729ab8b8402a2 Mon Sep 17 00:00:00 2001 From: mmkaram Date: Sat, 20 Sep 2025 13:16:15 +0300 Subject: [PATCH 171/202] vimPlugins.git-dashboard-nvim: init at 2025-01-02 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b00565a89bb3..da7c279a1ed2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5555,6 +5555,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + git-dashboard-nvim = buildVimPlugin { + pname = "git-dashboard-nvim"; + version = "2025-01-02"; + src = fetchFromGitHub { + owner = "juansalvatore"; + repo = "git-dashboard-nvim"; + rev = "c54fa2faf8ebe1c4091cc0c17c840835534943a6"; + sha256 = "0b7b6glp89pqyff21fnhhbh1r7iwdn7w3f0wklmxvl1cai49mh1y"; + }; + meta.homepage = "https://github.com/juansalvatore/git-dashboard-nvim/"; + meta.hydraPlatforms = [ ]; + }; + git-messenger-vim = buildVimPlugin { pname = "git-messenger.vim"; version = "2025-05-30"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e0414406be83..88cb69727cbc 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -425,6 +425,7 @@ https://github.com/ndmitchell/ghcid/,, https://github.com/eagletmt/ghcmod-vim/,, https://github.com/f-person/git-blame.nvim/,, https://github.com/akinsho/git-conflict.nvim/,HEAD, +https://github.com/juansalvatore/git-dashboard-nvim/,HEAD, https://github.com/rhysd/git-messenger.vim/,, https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD, https://github.com/polarmutex/git-worktree.nvim/,HEAD, From 64418cb26af0e918ce3d19759afe4d00ee729d38 Mon Sep 17 00:00:00 2001 From: Lisa Gnedt Date: Sat, 30 Aug 2025 20:03:58 +0200 Subject: [PATCH 172/202] nixos/malloc: fix Scudo library path The commit 01e8f570c67955ab92be0ef352066f16b63940f2 unpinned the LLVM version, which led to building errors similar to this when Scudo is used: building the system configuration... error: builder for '/nix/store/1f9z73haq6avvv19glifalfnmpw3gsbx-malloc-provider-scudo.drv' failed with exit code 1; last 1 log lines: > cp: cannot stat '/nix/store/s43991isxhvknqmk53q7pqmkdrfvj1p4-compiler-rt-libc-19.1.7/lib/linux/libclang_rt.scudo-x86_64.so': No such file or directory For full logs, run: nix log /nix/store/1f9z73haq6avvv19glifalfnmpw3gsbx-malloc-provider-scudo.drv It seems in the new LLVM version the Scudo library was moved: $ ls /nix/store/*-compiler-rt-libc-20.1.8/lib/linux/libclang_rt.scudo* /nix/store/z98mwyi0w8f4kgk3rw6av946azh28hc9-compiler-rt-libc-20.1.8/lib/linux/libclang_rt.scudo_standalone_cxx-x86_64.a /nix/store/z98mwyi0w8f4kgk3rw6av946azh28hc9-compiler-rt-libc-20.1.8/lib/linux/libclang_rt.scudo_standalone-x86_64.a /nix/store/z98mwyi0w8f4kgk3rw6av946azh28hc9-compiler-rt-libc-20.1.8/lib/linux/libclang_rt.scudo_standalone-x86_64.so This commit adjusts the library path. Co-authored-by: CUB3D --- nixos/modules/config/malloc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix index bc02fa5010d3..8959a99f7b7b 100644 --- a/nixos/modules/config/malloc.nix +++ b/nixos/modules/config/malloc.nix @@ -52,7 +52,7 @@ let or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}"); in { - libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so"; + libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo_standalone-${systemPlatform}.so"; description = '' A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator, which aims at providing additional mitigations against heap based From 753af06dab0561b180b8d9e274a9f6c41e5107ee Mon Sep 17 00:00:00 2001 From: Lisa Gnedt Date: Thu, 18 Sep 2025 21:19:48 +0200 Subject: [PATCH 173/202] treewide: fix Scudo options The commit 01e8f570c67955ab92be0ef352066f16b63940f2 unpinned the LLVM version, which led to the following warnings whenever Scudo is loaded (basically whenever a command is started when used system-wide): Scudo WARNING: found 3 unrecognized flag(s): DeleteSizeMismatch=0:DeallocationTypeMismatch=0 DeallocationTypeMismatch=0 ZeroContents=1 According to the current Scudo documentation [1] the options are now spelled differently. This commit keeps all existing options and only updates the spelling. [1] https://llvm.org/docs/ScudoHardenedAllocator.html Reported-by: CUB3D --- nixos/modules/profiles/hardened.nix | 2 +- pkgs/development/compilers/llvm/common/compiler-rt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 06e5644f76e9..e12eb19b13d8 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -39,7 +39,7 @@ in nix.settings.allowed-users = mkDefault [ "@users" ]; environment.memoryAllocator.provider = mkDefault "scudo"; - environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1"; + environment.variables.SCUDO_OPTIONS = mkDefault "zero_contents=true"; security.lockKernelModules = mkDefault true; diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 9e67b2bff8e9..482185111994 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { env = { NIX_CFLAGS_COMPILE = toString ( [ - "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + "-DSCUDO_DEFAULT_OPTIONS=delete_size_mismatch=false:dealloc_type_mismatch=false" ] ++ lib.optionals (!haveLibc) [ # The compiler got stricter about this, and there is a usellvm patch below From 887f04e208e1dcc4bdbd9fbc3180a9ca9515e10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Sep 2025 04:34:48 -0700 Subject: [PATCH 174/202] python3Packages.waterfurnace: modernize --- .../python-modules/waterfurnace/default.nix | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index 696506272078..04c15bf09326 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -3,19 +3,16 @@ buildPythonPackage, click, fetchFromGitHub, - mock, pytestCheckHook, requests, - pythonOlder, + setuptools, websocket-client, }: buildPythonPackage rec { pname = "waterfurnace"; version = "1.2.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "sdague"; @@ -24,30 +21,26 @@ buildPythonPackage rec { sha256 = "sha256-lix8dU9PxlsXIzKNFuUJkd80cUYXfTXSnFLu1ULACkE="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ click requests websocket-client ]; nativeCheckInputs = [ - mock pytestCheckHook ]; pythonImportsCheck = [ "waterfurnace" ]; - meta = with lib; { + meta = { description = "Python interface to waterfurnace geothermal systems"; - mainProgram = "waterfurnace-debug"; + mainProgram = "waterfurnace"; homepage = "https://github.com/sdague/waterfurnace"; - changelog = "https://github.com/sdague/waterfurnace/blob/v${version}/HISTORY.rst"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/sdague/waterfurnace/blob/${src.tag}/HISTORY.rst"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } From 6d71b6bacdf2fa5c10d954464b97ae984e0efc73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 12:11:30 +0000 Subject: [PATCH 175/202] plasma-panel-colorizer: 5.0.0 -> 5.0.1 --- pkgs/by-name/pl/plasma-panel-colorizer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 70b50afc9c85..f719ae5e3e41 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sz6vYG/aqoA3Smu9EDlElvPfE1gcLoUWPT25d//3t4g="; + hash = "sha256-E6VX2naAS2xof5sdnuaSuKueIKecW0fi9SycgLVRQVU="; }; nativeBuildInputs = [ From 52d706c4b4dd31ed9e4bae04fe3d078158c7881c Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 20 Sep 2025 14:41:24 +0200 Subject: [PATCH 176/202] forgejo: 12.0.3 -> 12.0.4 Contains 1 security fix. https://codeberg.org/forgejo/forgejo/releases/tag/v12.0.4 https://codeberg.org/forgejo/forgejo/src/commit/177c711b80576b19b14bbefae563763c66804738/release-notes-published/12.0.4.md --- pkgs/by-name/fo/forgejo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 764186bdc75c..87ddff6892ee 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "12.0.3"; - hash = "sha256-3uXGDX1uKxXehiMBG1cMIttJFRACIm3UE8U2OtUWjOQ="; + version = "12.0.4"; + hash = "sha256-g6PNJYiGR7tUpurVL1gvGzJzDoMCLmkGiLLsSZfkbYQ="; npmDepsHash = "sha256-V8FUoL9y36bagkg8Scttv/IzKg+MIIqp7witvT8bSWA="; vendorHash = "sha256-GE3trnaWuAVSEfi11tZo5JXedWOYOMzcHQ3GFyISVTQ="; lts = false; From 62310174dc8054399a2b6ba626e51173a5886f3d Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 20 Sep 2025 14:44:31 +0200 Subject: [PATCH 177/202] forgejo-lts: 11.0.5 -> 11.0.6 Contains 1 security fix. https://codeberg.org/forgejo/forgejo/releases/tag/v11.0.6 https://codeberg.org/forgejo/forgejo/src/commit/177c711b80576b19b14bbefae563763c66804738/release-notes-published/11.0.6.md --- pkgs/by-name/fo/forgejo/lts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index 8572f2b421d5..86d29a924da5 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "11.0.5"; - hash = "sha256-r1PR2WfJUvt+5K9RQi+9+xJmhtpqP6cGzEk77DiZUlE="; + version = "11.0.6"; + hash = "sha256-7rX0B1db0HbZa/em3hX+yzAi4rqsDysJPx3dIInGxpY="; npmDepsHash = "sha256-1lY08jBTx3DRhoaup02076EL9n85y57WCsS/cNcM4aw="; vendorHash = "sha256-Jh8u+iCBhYdKcLj4IzcKtJBnzvclvUeYbR/hjMN+cPs="; lts = true; From cf392d4ca163bb0cb13e7ccb423c68ead01fa53d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 13:00:19 +0000 Subject: [PATCH 178/202] discord: 0.0.108 -> 0.0.110 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index d6436ac072dd..c5987aabec27 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.108"; + stable = "0.0.110"; ptb = "0.0.160"; canary = "0.0.756"; development = "0.0.85"; @@ -26,7 +26,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-hKFhylEovj89WxpTexkzR9C6tN47V9iDKQYpCjgojvw="; + hash = "sha256-WwMEtpMlaR5psraDsvTNOb4nPwnGnVif4DgmdE9gCtc="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From ba891586c5859bfaed3088b4389426126ed2b68f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 13:10:01 +0000 Subject: [PATCH 179/202] theforceengine: 1.22.410 -> 1.22.420 --- pkgs/by-name/th/theforceengine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix index f80ad5c53823..1a9f13363f42 100644 --- a/pkgs/by-name/th/theforceengine/package.nix +++ b/pkgs/by-name/th/theforceengine/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "theforceengine"; - version = "1.22.410"; + version = "1.22.420"; src = fetchFromGitHub { owner = "luciusDXL"; repo = "TheForceEngine"; tag = "v${finalAttrs.version}"; - hash = "sha256-ydZ/S6u3UQNeVRTfzjshlNzLRc1y3FXsTY2NXbUoJBA="; + hash = "sha256-8JhaCIJgyaikoDLesshKiIhOO6OFis0xBYDq4vio4F4="; }; nativeBuildInputs = [ From b8f5011752296c2652599c0db4571cb5a57f2173 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 20 Sep 2025 15:23:56 +0200 Subject: [PATCH 180/202] esptool: 5.0.2 -> 5.1.0 --- pkgs/by-name/es/esptool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix index 1625973a4feb..4b726bd6d9f0 100644 --- a/pkgs/by-name/es/esptool/package.nix +++ b/pkgs/by-name/es/esptool/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "esptool"; - version = "5.0.2"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; tag = "v${version}"; - hash = "sha256-oRvtEBp88tmgjjIuoQS5ySm4I0aD/Zs8VLRUZo0sh/I="; + hash = "sha256-pdkL/QfrrTs/NdXlsr+2Yo+r8UTFLkxw4E6XGDAt1yE="; }; postPatch = '' From c4775988acdb3a20bbd379fa197611b9898d4337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 20 Sep 2025 20:53:09 +0700 Subject: [PATCH 181/202] =?UTF-8?q?h2o:=202.3.0-rolling-2025-09-12=20?= =?UTF-8?q?=E2=86=92=202.3.0-rolling-2025-09-20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index bb778644aef3..2df272959a36 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2025-09-12"; + version = "2.3.0-rolling-2025-09-20"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "0a240b56de6c49940ec8b16fe2c224528b17e4b1"; - hash = "sha256-Mn9BSIPp/PZZA6+q1msdhlpuJ9A8Wk11oAWe3Jzioug="; + rev = "c3930f0fd75cc1f232b9298592d88b35b648e999"; + hash = "sha256-pSWEPXhXTe+El1OwcJFzqHosqrCkKxVs38TeiI/3kRI="; }; outputs = [ From d78ce0ec3e483c8282245cb568b52d8b711850c4 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 20 Sep 2025 04:46:04 -0700 Subject: [PATCH 182/202] Revert "frugally-deep: 0.15.24-p0 -> 0.18.2-unstable-2025-06-16" This reverts commit 6a3c66c52ddd54af8b7202d902881910e044adca. --- pkgs/by-name/fr/frugally-deep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix index 4f2d31f0e634..7435378c68f4 100644 --- a/pkgs/by-name/fr/frugally-deep/package.nix +++ b/pkgs/by-name/fr/frugally-deep/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "frugally-deep"; - version = "0.18.2-unstable-2025-06-16"; + version = "0.15.24-p0"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "frugally-deep"; - rev = "30a4ce4c932ca810a5a77c4ab943a520bb1048fe"; - hash = "sha256-tcwCRSHhN61ZFDFVQ/GItvgSSjeLSbFDoNMqwswtvto="; + rev = "v${finalAttrs.version}"; + hash = "sha256-yg2SMsYOOSOgsdwIH1bU3iPM45z6c7WeIrgOddt3um4="; }; nativeBuildInputs = [ From c8888cdd662a5f87d3d364164bb770e3434a4b86 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 20 Sep 2025 06:55:50 -0700 Subject: [PATCH 183/202] frugally-deep: backport CMake 4 compat can't bump yet, will break MIOpen --- pkgs/by-name/fr/frugally-deep/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix index 7435378c68f4..6482993d2caf 100644 --- a/pkgs/by-name/fr/frugally-deep/package.nix +++ b/pkgs/by-name/fr/frugally-deep/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchFromGitHub, gitUpdater, cmake, @@ -14,6 +15,8 @@ stdenv.mkDerivation (finalAttrs: { pname = "frugally-deep"; + # be careful bumping this, frugally-deep may change its model metadata format + # in ways that only fail at runtime version = "0.15.24-p0"; src = fetchFromGitHub { @@ -23,6 +26,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yg2SMsYOOSOgsdwIH1bU3iPM45z6c7WeIrgOddt3um4="; }; + patches = [ + (fetchpatch { + # Backport CMake 4 compat so we can stay on 0.15 for now + name = "update-minimum-cmake4-huntergate.patch"; + url = "https://github.com/Dobiasd/frugally-deep/commit/30a4ce4c932ca810a5a77c4ab943a520bb1048fe.patch"; + hash = "sha256-J5z+jQis8N2mzWu2Qm7J0fPkrplpjgDCOAJT7binz04="; + }) + ]; + nativeBuildInputs = [ cmake ] From 1abfa4cc885faa2b54b2419a43700e2f7b85967c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 14:08:03 +0000 Subject: [PATCH 184/202] libretro.thepowdertoy: 0-unstable-2024-09-30 -> 0-unstable-2025-09-16 --- pkgs/applications/emulators/libretro/cores/thepowdertoy.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix b/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix index 791877778ebb..a5df2346dbd7 100644 --- a/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix +++ b/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "thepowdertoy"; - version = "0-unstable-2024-09-30"; + version = "0-unstable-2025-09-16"; src = fetchFromGitHub { owner = "libretro"; repo = "ThePowderToy"; - rev = "5d9c749780063b87bd62ddb025dee4241f196f26"; - hash = "sha256-BYeQ2WZgyvjDH5+akrVP5TlLq6Go3NKXB7zeR9oaaJ8="; + rev = "cb3cd4c2e5beddb98b34e6b800fa24e8f96322d9"; + hash = "sha256-k3XWkkSuQC3IBhhI96qkTrlGH/oJu941HaAvR28V5i0="; }; extraNativeBuildInputs = [ cmake ]; From 1200498671a7b4c4cf7d733dd2ecc7c3be5d5e0d Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 20 Sep 2025 07:00:44 -0700 Subject: [PATCH 185/202] frugally-deep,rocmPackages.miopen: add regression test for .model load failure ensures frugally-deep is able to load frugally-deep .json files in its source tree https://github.com/ROCm/rocm-libraries/issues/889 --- pkgs/by-name/fr/frugally-deep/package.nix | 12 +++- .../rocm-modules/6/miopen/default.nix | 12 ++++ .../test-frugally-deep-model-loading.cpp | 55 +++++++++++++++++++ .../test-frugally-deep-model-loading.nix | 49 +++++++++++++++++ 4 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp create mode 100644 pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix index 6482993d2caf..aff222f77b68 100644 --- a/pkgs/by-name/fr/frugally-deep/package.nix +++ b/pkgs/by-name/fr/frugally-deep/package.nix @@ -8,15 +8,18 @@ functionalplus, eigen, nlohmann_json, - doctest, python3Packages, buildTests ? false, # Needs tensorflow + # for tests + doctest, + rocmPackages, }: stdenv.mkDerivation (finalAttrs: { pname = "frugally-deep"; # be careful bumping this, frugally-deep may change its model metadata format - # in ways that only fail at runtime + # in ways that only fail at runtime. MIOpen is currently the only package + # relying on this, run passthru.tests.miopen-can-load-models to check version = "0.15.24-p0"; src = fetchFromGitHub { @@ -55,6 +58,11 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = lib.optionals buildTests [ "-DFDEEP_BUILD_UNITTEST=ON" ]; + passthru.tests.miopen-can-load-models = + rocmPackages.miopen.passthru.tests.can-load-models.override + { + frugally-deep = finalAttrs.finalPackage; + }; passthru.updateScript = gitUpdater; meta = with lib; { diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix index 3a24c267ffaf..d3d64b2605be 100644 --- a/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/pkgs/development/rocm-modules/6/miopen/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + callPackage, fetchFromGitHub, fetchpatch, rocmUpdateScript, @@ -297,6 +298,17 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; + passthru.tests = { + # Ensure all .tn.model files can be loaded by whatever version of frugally-deep we have + # This is otherwise hard to verify as MIOpen will only use these models on specific, + # expensive Instinct GPUs + # If MIOpen stops embedding .tn.model files the test will also fail, and can be deleted, + # likely along with the frugally-deep dependency + can-load-models = callPackage ./test-frugally-deep-model-loading.nix { + inherit (finalAttrs) src version; + inherit frugally-deep nlohmann_json; + }; + }; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; inherit (finalAttrs.src) owner; diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp new file mode 100644 index 000000000000..6b64b8099985 --- /dev/null +++ b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp @@ -0,0 +1,55 @@ +#include +#include +#include +#include +#include + +int main() { + std::vector model_files; + std::string src_dir = std::getenv("SRC_DIR") ? std::getenv("SRC_DIR") : "."; + + // collect *tn.model files except _metadata + try { + for (const auto& entry : std::filesystem::recursive_directory_iterator(src_dir)) { + if (entry.is_regular_file()) { + std::string path = entry.path().string(); + if (path.find("tn.model") != std::string::npos && path.find("_metadata.") == std::string::npos) { + model_files.push_back(path); + } + } + } + } catch (const std::exception& e) { + std::cerr << "Error scanning directory: " << e.what() << std::endl; + return 1; + } + + if (model_files.empty()) { + std::cout << "No *.tn.model files found in " << src_dir << std::endl; + return 1; + } + + std::cout << "Found " << model_files.size() << " model files to test" << std::endl; + + int failed_count = 0; + for (const auto& model_file : model_files) { + std::cout << "Loading: " << model_file << " ... "; + std::cout.flush(); + + try { + const auto model = fdeep::load_model(model_file); + std::cout << "OK" << std::endl; + } catch (const std::exception& e) { + std::cout << "FAILED: " << e.what() << std::endl; + failed_count++; + } + } + + if (failed_count > 0) { + std::cerr << "\n" << failed_count << " out of " << model_files.size() + << " models failed to load" << std::endl; + return 1; + } + + std::cout << "\nAll " << model_files.size() << " models loaded successfully!" << std::endl; + return 0; +} diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix new file mode 100644 index 000000000000..36cadd774a65 --- /dev/null +++ b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + eigen, + frugally-deep, + functionalplus, + nlohmann_json, + src, + version, +}: + +stdenv.mkDerivation { + pname = "miopen-frugally-deep-model-test"; + inherit version src; + + dontConfigure = true; + dontInstall = true; + doCheck = true; + + buildPhase = '' + runHook preBuild + + $CXX -std=c++20 \ + -I${lib.getDev eigen}/include/eigen3 \ + -I${lib.getDev functionalplus}/include \ + -I${lib.getDev frugally-deep}/include \ + -I${lib.getDev nlohmann_json}/include \ + ${./test-frugally-deep-model-loading.cpp} \ + -o test_models + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + echo "Running model loading tests..." + SRC_DIR="${src}" ./test_models + mkdir -p $out + + runHook postCheck + ''; + + meta = { + description = "Test that frugally-deep can load MIOpen model files"; + maintainers = with lib.teams; [ rocm ]; + platforms = lib.platforms.linux; + }; +} From 41212d7dfff88c08e39f2bd2ed38ec8fca1e24ae Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 3 Sep 2025 08:08:20 +0200 Subject: [PATCH 186/202] rcu: 4.0.26 -> 4.0.27 --- pkgs/by-name/rc/rcu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 6ce7d03ac7b9..2ff56b3e7cc6 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -23,7 +23,7 @@ let in python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "4.0.26"; + version = "4.0.27"; format = "other"; @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { let src-tarball = requireFile { name = "rcu-${version}-source.tar.gz"; - hash = "sha256-yY3OFZVHxhVurfjSEeR+UUNHQdpc08jhgaDEvMWRsLA="; + hash = "sha256-3ablHXkvcFu1/VMUMvxbOWZhDGN+G+5MNLl8ZK9oJ5M="; url = "https://www.davisr.me/projects/rcu/"; }; in From 376179991ebbcb40be0f9be0ff6eddfb6dd321a6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 20 Sep 2025 16:19:41 +0200 Subject: [PATCH 187/202] rcu: 4.0.27 -> 4.0.29 --- pkgs/by-name/rc/rcu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 2ff56b3e7cc6..e9c9d63dedf7 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -23,7 +23,7 @@ let in python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "4.0.27"; + version = "4.0.29"; format = "other"; @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { let src-tarball = requireFile { name = "rcu-${version}-source.tar.gz"; - hash = "sha256-3ablHXkvcFu1/VMUMvxbOWZhDGN+G+5MNLl8ZK9oJ5M="; + hash = "sha256-qbHjRKH9GOwBduyod8AOm2SYOjGUH1mYSpCTifOehVM="; url = "https://www.davisr.me/projects/rcu/"; }; in From 0c307041f90ccb4b908d253cf1bc7796c8483be2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 20 Sep 2025 16:21:28 +0200 Subject: [PATCH 188/202] rcu: Disable auto-added updateScript from python ecosystem Has no chance of ever succeeding, just stops my update.nix runs from succeeding. --- pkgs/by-name/rc/rcu/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index e9c9d63dedf7..e07b3c89ef38 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -182,6 +182,9 @@ python3Packages.buildPythonApplication rec { lib.strings.substring versionSuffixPos 1 rcu.version })"; }; + + # Python stuff automatically adds an updateScript that just fails + updateScript = null; }; meta = { From 93d376245232c8294f98def979d809f8277bef52 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Sat, 20 Sep 2025 10:33:06 -0400 Subject: [PATCH 189/202] forgejo-runner: 11.1.0 -> 11.1.1 changelog: https://code.forgejo.org/forgejo/runner/releases/tag/v11.1.1 --- pkgs/by-name/fo/forgejo-runner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index e2623b4148a3..8175f086deb8 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -41,14 +41,14 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "11.1.0"; + version = "11.1.1"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-2vR2M0OU0d5AXE5ujXeb4Aol568mDqH/v40Z8P+5ZCI="; + hash = "sha256-gItynq665YLHdSXcUrtgIp282t/TBjThDgAYyVYesx0="; }; vendorHash = "sha256-eVOmUozNLHRiNwIhbf7ebVNdRiMAtLMdYI7pnALvl8U="; From 1753e8b61ae3eb33f7a2402202d0fcce115d9da6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Sep 2025 16:49:57 +0200 Subject: [PATCH 190/202] nixos/wyoming/piper: fix cudaSupport reference This needs to reference the config attribute set from the package set. Fixes: #444597 --- nixos/modules/services/home-automation/wyoming/piper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/home-automation/wyoming/piper.nix b/nixos/modules/services/home-automation/wyoming/piper.nix index 250d46c76bbd..c43f7ab1e00f 100644 --- a/nixos/modules/services/home-automation/wyoming/piper.nix +++ b/nixos/modules/services/home-automation/wyoming/piper.nix @@ -103,8 +103,8 @@ in useCUDA = mkOption { type = bool; - default = config.cudaSupport; - defaultText = literalExpression "config.cudaSupport"; + default = pkgs.config.cudaSupport; + defaultText = literalExpression "pkgs.config.cudaSupport"; description = '' Whether to accelerate the underlying onnxruntime library with CUDA. ''; From 4abba235ca04f6b834b6e95ba622feb13f4897e6 Mon Sep 17 00:00:00 2001 From: Henrique Oliveira Date: Sat, 20 Sep 2025 16:39:55 +0200 Subject: [PATCH 191/202] rcu: add co-maintainer --- pkgs/by-name/rc/rcu/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 6ce7d03ac7b9..84d75189df4f 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -189,7 +189,10 @@ python3Packages.buildPythonApplication rec { description = "All-in-one offline/local management software for reMarkable e-paper tablets"; homepage = "http://www.davisr.me/projects/rcu/"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ OPNA2608 ]; + maintainers = with lib.maintainers; [ + OPNA2608 + m0streng0 + ]; hydraPlatforms = [ ]; # requireFile used as src }; } From 5119cafc5927bd366a002e89addb416ea5b34d77 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 20 Sep 2025 17:53:06 +0300 Subject: [PATCH 192/202] Revert "various: fix Scudo allocator due to LLVM update" --- nixos/modules/config/malloc.nix | 2 +- nixos/modules/profiles/hardened.nix | 2 +- pkgs/development/compilers/llvm/common/compiler-rt/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix index 8959a99f7b7b..bc02fa5010d3 100644 --- a/nixos/modules/config/malloc.nix +++ b/nixos/modules/config/malloc.nix @@ -52,7 +52,7 @@ let or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}"); in { - libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo_standalone-${systemPlatform}.so"; + libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so"; description = '' A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator, which aims at providing additional mitigations against heap based diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index e12eb19b13d8..06e5644f76e9 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -39,7 +39,7 @@ in nix.settings.allowed-users = mkDefault [ "@users" ]; environment.memoryAllocator.provider = mkDefault "scudo"; - environment.variables.SCUDO_OPTIONS = mkDefault "zero_contents=true"; + environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1"; security.lockKernelModules = mkDefault true; diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 482185111994..9e67b2bff8e9 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { env = { NIX_CFLAGS_COMPILE = toString ( [ - "-DSCUDO_DEFAULT_OPTIONS=delete_size_mismatch=false:dealloc_type_mismatch=false" + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ] ++ lib.optionals (!haveLibc) [ # The compiler got stricter about this, and there is a usellvm patch below From 6df082c53730035bd6921e1d13586f1a40ebd495 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 22 Aug 2025 09:50:26 -0400 Subject: [PATCH 193/202] edk2: 202505 -> 202508 Changelog: https://github.com/tianocore/edk2/releases/tag/edk2-stable202508 --- .../fix-cross-compilation-antlr-dlg.patch | 27 +++++++++++++++++++ pkgs/by-name/ed/edk2/package.nix | 23 ++++++++-------- 2 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 pkgs/by-name/ed/edk2/fix-cross-compilation-antlr-dlg.patch diff --git a/pkgs/by-name/ed/edk2/fix-cross-compilation-antlr-dlg.patch b/pkgs/by-name/ed/edk2/fix-cross-compilation-antlr-dlg.patch new file mode 100644 index 000000000000..3667d324a269 --- /dev/null +++ b/pkgs/by-name/ed/edk2/fix-cross-compilation-antlr-dlg.patch @@ -0,0 +1,27 @@ +diff --git i/BaseTools/Source/C/VfrCompile/GNUmakefile w/BaseTools/Source/C/VfrCompile/GNUmakefile +index ad6c350876..bc30e25cd3 100644 +--- i/BaseTools/Source/C/VfrCompile/GNUmakefile ++++ w/BaseTools/Source/C/VfrCompile/GNUmakefile +@@ -32,6 +32,9 @@ LINKER = $(CXX) + + EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h + ++CC_FOR_BUILD ?= $(CC) ++CXX_FOR_BUILD ?= $(CXX) ++ + MAKEROOT ?= ../.. + + include $(MAKEROOT)/Makefiles/header.makefile +@@ -61,10 +64,10 @@ VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg + Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg + + Pccts/antlr/antlr: +- $(MAKE) -C Pccts/antlr ++ $(MAKE) -C Pccts/antlr CC=$(CC_FOR_BUILD) CXX=$(CXX_FOR_BUILD) + + Pccts/dlg/dlg: +- $(MAKE) -C Pccts/dlg ++ $(MAKE) -C Pccts/dlg CC=$(CC_FOR_BUILD) CXX=$(CXX_FOR_BUILD) + + ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp + $(CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@ diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index df99f6598093..781d71ef3078 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -33,14 +33,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "edk2"; - version = "202505"; + version = "202508"; srcWithVendoring = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; tag = "edk2-stable${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-VuiEqVpG/k7pfy0cOC6XmY+8NBtU/OHdDB9Y52tyNe8="; + hash = "sha256-YZcjPGPkUQ9CeJS9JxdHBmpdHsAj7T0ifSZWZKyNPMk="; }; src = applyPatches { @@ -53,12 +53,8 @@ stdenv.mkDerivation (finalAttrs: { url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch"; hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; }) - # https://github.com/tianocore/edk2/pull/5658 - (fetchpatch { - name = "fix-cross-compilation-antlr-dlg.patch"; - url = "https://github.com/tianocore/edk2/commit/a34ff4a8f69a7b8a52b9b299153a8fac702c7df1.patch"; - hash = "sha256-u+niqwjuLV5tNPykW4xhb7PW2XvUmXhx5uvftG1UIbU="; - }) + + ./fix-cross-compilation-antlr-dlg.patch ]; # FIXME: unvendor OpenSSL again once upstream updates @@ -86,10 +82,13 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "-C BaseTools" ]; - env.NIX_CFLAGS_COMPILE = - "-Wno-return-type" - + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" - + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; + env = { + NIX_CFLAGS_COMPILE = + "-Wno-return-type" + + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" + + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; + PYTHON_COMMAND = lib.getExe pythonEnv; + }; hardeningDisable = [ "format" From c3950db2bbfd73e386e05b43e77070d142b0673d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 15:31:37 +0000 Subject: [PATCH 194/202] inputplumber: 0.62.2 -> 0.64.0 --- 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 c60c6b1e1d55..2a6650de5dd2 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.62.2"; + version = "0.64.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-dtRQeB2E/setGm0DEM/ikywU0LIRhOOjyRV0yuvuJQU="; + hash = "sha256-Ai2mozqw8n+L6Yv04OLyiADmXBT4k573qzazePsmfP4="; }; - cargoHash = "sha256-EGIBBriAhqeAUQqlWPcAGdBAYWmYYnvc3ncYGc0ir3o="; + cargoHash = "sha256-oiEBOFDiOKPFsqZcW98hi1xiKEbo2YNXv5Cw1jCg5vw="; nativeBuildInputs = [ pkg-config From 14549df818995c2a465556682097fe5a77f57332 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 13 Sep 2025 11:51:26 -0400 Subject: [PATCH 195/202] maintainers: remove benwbooth Inactive on nixpkgs in 2025 despite the 10 pull requests that requested their review. --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/jb/jbrowse/package.nix | 2 +- pkgs/by-name/jx/jxplorer/package.nix | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 465a7f392869..243f1e883389 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3198,12 +3198,6 @@ githubId = 442623; name = "Ben Pye"; }; - benwbooth = { - email = "benwboooth@gmail.com"; - github = "benwbooth"; - githubId = 75972; - name = "Ben Booth"; - }; benwis = { name = "Ben Wishovich"; email = "ben@benw.is"; diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix index daef63642506..c1a005d67606 100644 --- a/pkgs/by-name/jb/jbrowse/package.nix +++ b/pkgs/by-name/jb/jbrowse/package.nix @@ -36,7 +36,7 @@ appimageTools.wrapType2 { mainProgram = "jbrowse-desktop"; homepage = "https://jbrowse.org/jb2/"; license = licenses.asl20; - maintainers = with maintainers; [ benwbooth ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/jx/jxplorer/package.nix b/pkgs/by-name/jx/jxplorer/package.nix index e0e324fb3ab8..eded0c62f9f2 100644 --- a/pkgs/by-name/jx/jxplorer/package.nix +++ b/pkgs/by-name/jx/jxplorer/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "Java Ldap Browser"; homepage = "https://sourceforge.net/projects/jxplorer/"; license = lib.licenses.asl11; - maintainers = with maintainers; [ benwbooth ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "jxplorer"; }; From 4e90880ee69f0d8f975191041ce4a3fe3bf59fcb Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 20 Sep 2025 18:04:19 +0200 Subject: [PATCH 196/202] nixf-diagnose: 0.1.3 -> 0.1.4 Release Notes: https://github.com/inclyc/nixf-diagnose/releases/tag/0.1.4 --- pkgs/by-name/ni/nixf-diagnose/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixf-diagnose/package.nix b/pkgs/by-name/ni/nixf-diagnose/package.nix index 52f6f55ce003..6ff2f797a510 100644 --- a/pkgs/by-name/ni/nixf-diagnose/package.nix +++ b/pkgs/by-name/ni/nixf-diagnose/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nixf-diagnose"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "inclyc"; repo = "nixf-diagnose"; tag = finalAttrs.version; - hash = "sha256-8kcA2/ZMREKtXUM5rlAWRQL/C8+JNocZegq2ZHqbiSA="; + hash = "sha256-vHW2AnUxBuG9mlpMB0f9eK4M1VlJPm5YtwjXksx/uik="; }; env.NIXF_TIDY_PATH = lib.getExe nixf; - cargoHash = "sha256-9rWQfoaMXFs83cYHtJPL0ogA9hPh7q3mK1DG4Q4CCq0="; + cargoHash = "sha256-L6wiYUzlzginjhu23EBPAteZ2nTIqUE6mC2q1yfKWs4="; passthru.updateScript = nix-update-script { }; From 0894f50e10c4f89c041006e04da2e9379c710b3d Mon Sep 17 00:00:00 2001 From: suiiii Date: Sat, 20 Sep 2025 18:51:47 +0200 Subject: [PATCH 197/202] vimPlugins.oil-git-nvim: init at 2025-09-03 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index da7c279a1ed2..ae1974398da2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -12024,6 +12024,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + oil-git-nvim = buildVimPlugin { + pname = "oil-git.nvim"; + version = "2025-09-03"; + src = fetchFromGitHub { + owner = "benomahony"; + repo = "oil-git.nvim"; + rev = "d1f27a5982df35b70fb842aa6bbfac10735c7265"; + sha256 = "03pl0n7qs51kbqgzfwkcyinmnbl9wyfbbd6ihqzr06mr9xrgf221"; + }; + meta.homepage = "https://github.com/benomahony/oil-git.nvim/"; + meta.hydraPlatforms = [ ]; + }; + oil-git-status-nvim = buildVimPlugin { pname = "oil-git-status.nvim"; version = "2025-04-03"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d0544c3f74af..c24cdcbc1e70 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2789,6 +2789,10 @@ assertNoAdditions { ]; }; + oil-git-nvim = super.oil-git-nvim.overrideAttrs { + dependencies = [ self.oil-nvim ]; + }; + oil-git-status-nvim = super.oil-git-status-nvim.overrideAttrs { dependencies = [ self.oil-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 88cb69727cbc..626164676424 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -924,6 +924,7 @@ https://github.com/nvimdev/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, https://github.com/refractalize/oil-git-status.nvim/,HEAD, +https://github.com/benomahony/oil-git.nvim/,HEAD, https://github.com/eero-lehtinen/oklch-color-picker.nvim/,HEAD, https://github.com/nomnivore/ollama.nvim/,HEAD, https://github.com/yonlu/omni.vim/,, From 9f7f75f801a99e15a1f9d559a93e25265c269834 Mon Sep 17 00:00:00 2001 From: Fabian Cholewinski <219463492+fabiancholewinski1234@users.noreply.github.com> Date: Sat, 20 Sep 2025 17:28:13 +0000 Subject: [PATCH 198/202] privoxy: Allow multiple listen-address options Change type of services.privoxy.settings.listen-address from str to either str (listOf str). The latter allows providing a list which results in multiple list-address entries in privoxy.conf. --- nixos/modules/services/networking/privoxy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index 64ceb30d0fa5..35ad8a4efae7 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -145,7 +145,7 @@ in freeformType = configType; options.listen-address = mkOption { - type = types.str; + type = types.either types.str (types.listOf types.str); default = "127.0.0.1:8118"; description = "Pair of address:port the proxy server is listening to."; }; From 4eba7aebe063d7f48fa573ceb40e7d2a8208324c Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 20 Sep 2025 13:37:25 -0400 Subject: [PATCH 199/202] steamcontroller: drop --- doc/release-notes/rl-2511.section.md | 2 + pkgs/by-name/st/steamcontroller/package.nix | 43 --------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 pkgs/by-name/st/steamcontroller/package.nix diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 2ae1b246f392..38d5e8876153 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -119,6 +119,8 @@ - `fetchtorrent`, when using the "rqbit" backend, erroneously started fetching files into a subdirectory in Nixpkgs 24.11. The original behaviour – which matches the behaviour using the "transmission" backend – has now been restored. Users reliant on the erroneous behaviour can temporarily maintain it by adding `flatten = false` to the `fetchtorrent` arguments; Nix will produce an evaluation warning for anyone using `backend = "rqbit"` without `flatten = true`. +- `steamcontroller` has been removed due to lack of upstream maintenance. Consider using `sc-controller` instead. + - `linux` and all other Linux kernel packages have moved all in-tree kernel modules into a new `modules` output. - `webfontkitgenerator` has been renamed to `webfont-bundler`, following the rename of the upstream project. diff --git a/pkgs/by-name/st/steamcontroller/package.nix b/pkgs/by-name/st/steamcontroller/package.nix deleted file mode 100644 index 564b04fb4171..000000000000 --- a/pkgs/by-name/st/steamcontroller/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3Packages, - libusb1, - linuxHeaders, -}: - -with python3Packages; - -buildPythonApplication { - pname = "steamcontroller"; - version = "2017-08-11"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "ynsta"; - repo = "steamcontroller"; - rev = "80928ce237925e0d0d7a65a45b481435ba6b931e"; - sha256 = "0lv9j2zv8fmkmc0x9r7fa8zac2xrwfczms35qz1nfa1hr84wniid"; - }; - - postPatch = '' - substituteInPlace src/uinput.py --replace \ - "/usr/include" "${linuxHeaders}/include" - ''; - - buildInputs = [ libusb1 ]; - propagatedBuildInputs = [ - psutil - python3Packages.libusb1 - ]; - doCheck = false; - pythonImportsCheck = [ "steamcontroller" ]; - - meta = with lib; { - description = "Standalone Steam controller driver"; - homepage = "https://github.com/ynsta/steamcontroller"; - license = licenses.mit; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 043041e28f8f..a30a122bbfa3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2355,6 +2355,7 @@ mapAliases { starpls-bin = starpls; # Added 2024-10-30 starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 station = throw "station has been removed from nixpkgs, as there were no committers among its maintainers to unblock security issues"; # added 2025-06-16 + steamcontroller = throw "'steamcontroller' has been removed due to lack of upstream maintenance. Consider using 'sc-controller' instead."; # Added 2025-09-20 steamPackages = { steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; # Added 2024-10-16 steam = lib.warnOnInstantiate "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; # Added 2024-10-16 From 874c7c19312c57940b3bca723bdc332ff653026b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Sep 2025 18:04:24 +0000 Subject: [PATCH 200/202] argocd: 3.1.1 -> 3.1.6 --- pkgs/by-name/ar/argocd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 726f34680caf..3b8b9108386e 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "argocd"; - version = "3.1.1"; + version = "3.1.6"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-+StoJfRlWOnXBAt+D9cxaAc9gn9V4h9QWogtMPf3V+A="; + hash = "sha256-RdqMkyQBJaAJv660bCe+C84BFQNu06t3AaYSz4aMlBA="; }; ui = stdenv.mkDerivation { @@ -45,7 +45,7 @@ buildGoModule rec { }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-tYHA1WlziKWOvv3uF3tTSrvqDoHBVRhUnKZXOxT1rMk="; + vendorHash = "sha256-oI0N6V8enziJK21VCgQ4KUOWqbC5TcZd3QnWiTTeTHQ="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile From 886fdecdc4bd8765fa0117aab51759862f061a14 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 20 Sep 2025 16:03:17 -0400 Subject: [PATCH 201/202] nixos/incus: avoid restart on switch for incus-startup This service exists to avoid extra instance restarts. While its dependencies are slim, there are still some, so disable restartIfChanged to avoid any switches from affecting instances. --- nixos/modules/virtualisation/incus.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 3b6b88766400..8d4ff2aae9a8 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -449,6 +449,9 @@ in requires = [ "incus.socket" ]; wantedBy = config.systemd.services.incus.wantedBy; + # restarting this service will affect instances + restartIfChanged = false; + serviceConfig = { ExecStart = "${incus-startup} start"; ExecStop = "${incus-startup} stop"; From a1f7894b5c430ac5f981327f723e2cda163cfe47 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 20 Sep 2025 22:01:34 +0000 Subject: [PATCH 202/202] python3Packages.scanpy: skip failing test --- pkgs/development/python-modules/scanpy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/scanpy/default.nix b/pkgs/development/python-modules/scanpy/default.nix index 44d3f8488279..095f5bbf08df 100644 --- a/pkgs/development/python-modules/scanpy/default.nix +++ b/pkgs/development/python-modules/scanpy/default.nix @@ -165,6 +165,9 @@ buildPythonPackage rec { # fails to find the trivial test script for some reason: "test_external" + + # AssertionError: Not equal to tolerance rtol=1e-07, atol=0 + "test_connectivities_euclidean" ]; pythonImportsCheck = [