From f441c08dc04b1a3c7f6b379c19bfbd0f80c84348 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Aug 2025 10:53:21 +0000 Subject: [PATCH 01/60] python3Packages.pyogrio: 0.11.0 -> 0.11.1 --- pkgs/development/python-modules/pyogrio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix index 8c3ed073d9f0..330fcd31225c 100644 --- a/pkgs/development/python-modules/pyogrio/default.nix +++ b/pkgs/development/python-modules/pyogrio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyogrio"; - version = "0.11.0"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "pyogrio"; tag = "v${version}"; - hash = "sha256-3XrP3/sqGRtA+sfaoOV/ByGAtfpGZB5RYRr5lyYZUj0="; + hash = "sha256-F6XfkihN3k2xquYS8jJMlqtLXzaTORaduJ2Q9LhSQGM="; }; postPatch = '' @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = { description = "Vectorized spatial vector file format I/O using GDAL/OGR"; homepage = "https://pyogrio.readthedocs.io/"; - changelog = "https://github.com/geopandas/pyogrio/blob/${src.rev}/CHANGES.md"; + changelog = "https://github.com/geopandas/pyogrio/blob/${src.tag}/CHANGES.md"; license = lib.licenses.mit; teams = [ lib.teams.geospatial ]; }; From 7bd253891f24b0013b78efa852b153b4a2314e03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Aug 2025 14:43:31 +0000 Subject: [PATCH 02/60] python3Packages.h5netcdf: 1.6.3 -> 1.6.4 --- pkgs/development/python-modules/h5netcdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 21ba08cf7142..97577acf567f 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "1.6.3"; + version = "1.6.4"; pyproject = true; src = fetchFromGitHub { owner = "h5netcdf"; repo = "h5netcdf"; tag = "v${version}"; - hash = "sha256-frKnnUh5OFeQGAhf/y5idMWGb0ufHznz4u5A8FRJSuA="; + hash = "sha256-SFlea/ABP78GQgGkh7hscAlGfpKVnXN2zr99D9LCpeQ="; }; build-system = [ From 5ebd2a09758a93fa14a9c970503a9cc7e696f210 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Aug 2025 08:11:47 +0000 Subject: [PATCH 03/60] ark-pixel-font: 2025.07.21 -> 2025.08.11 --- pkgs/by-name/ar/ark-pixel-font/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix index 8f62e274427f..01dfa0e346ff 100644 --- a/pkgs/by-name/ar/ark-pixel-font/package.nix +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -7,14 +7,14 @@ python312Packages.buildPythonPackage rec { pname = "ark-pixel-font"; - version = "2025.07.21"; + version = "2025.08.11"; pyproject = false; src = fetchFromGitHub { owner = "TakWolf"; repo = "ark-pixel-font"; tag = version; - hash = "sha256-NnkXKe4qlWl4lDHNcO5aVJWwyeSrHoHxqlla+RMgtQw="; + hash = "sha256-Rcn2zlZyMoziYd1b3wjjh1tYpm6A0qYGiKEg+Wd+0m8="; }; dependencies = with python312Packages; [ From b1b15e7260789ce6538eb9bbd17e501ae21d6ddc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Aug 2025 21:08:30 +0000 Subject: [PATCH 04/60] python3Packages.bidsschematools: 1.0.13 -> 1.0.14 --- pkgs/development/python-modules/bidsschematools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix index 27de1694bfb4..015bf64f8832 100644 --- a/pkgs/development/python-modules/bidsschematools/default.nix +++ b/pkgs/development/python-modules/bidsschematools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bidsschematools"; - version = "1.0.13"; + version = "1.0.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "bidsschematools"; inherit version; - hash = "sha256-l9DN68kf1HwE0Th6XBuLxlikAyaARIEK/jwE6/mC0Vo="; + hash = "sha256-Kj3vxue6dGdFV2gzYr6SBa3D1s/X+KV/izWR6kMKOKE="; }; build-system = [ From fad64d2ef6c52d0a34e0f1f328b1e5750dd6eb82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Aug 2025 21:19:06 +0000 Subject: [PATCH 05/60] python3Packages.types-html5lib: 1.1.11.20250708 -> 1.1.11.20250809 --- pkgs/development/python-modules/types-html5lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix index 992b8e7496ac..d6da09620f5b 100644 --- a/pkgs/development/python-modules/types-html5lib/default.nix +++ b/pkgs/development/python-modules/types-html5lib/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-html5lib"; - version = "1.1.11.20250708"; + version = "1.1.11.20250809"; pyproject = true; src = fetchPypi { pname = "types_html5lib"; inherit version; - hash = "sha256-JDIXIP26xxzuUNWkvsm3RISVtyF5dM/+P88e3k7vev4="; + hash = "sha256-eXbsdCa7AJmX3F4HK8o+2YjddH0Mv+CTx9+9PV7Iv1c="; }; nativeBuildInputs = [ setuptools ]; From 0ab3524135f0dabb087e36d898efeb29feb3689b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Aug 2025 22:02:19 +0000 Subject: [PATCH 06/60] python3Packages.mkdocs-material: 9.6.16 -> 9.6.17 --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 15096b38df84..2a8d5318af06 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.6.16"; + version = "9.6.17"; pyproject = true; src = fetchFromGitHub { owner = "squidfunk"; repo = "mkdocs-material"; tag = version; - hash = "sha256-wGzrlDf6bJFIfJXlCMlOQvRlpOcDXeMVY2/GRjOG1H4="; + hash = "sha256-yl5bc037gr3oAUH01uNvNj7fIe8ca2jH+yfWlgMImZE="; }; nativeBuildInputs = [ From fce4791b3bcca4c798e934d686cfd1f793616602 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 16:28:03 +0000 Subject: [PATCH 07/60] python3Packages.streamlit: 1.47.1 -> 1.48.1 --- pkgs/development/python-modules/streamlit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index cf0128aa7f32..f31bfe6e060c 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.47.1"; + version = "1.48.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-2u15dj0cr+sDzdgAuRqpx63DaIxrLL9OzCyomaq4Kio="; + hash = "sha256-xuKp8kRxdGu+qlSiiPX9/G4rzzupqXU/3l1J7UJDkfE="; }; build-system = [ From 47d3fcdc2dd2def58a12a8a79ae6e6a5fc473a8c Mon Sep 17 00:00:00 2001 From: Even Brenden Date: Wed, 20 Aug 2025 11:19:57 +0200 Subject: [PATCH 08/60] alsa-utils: wrap all binaries with ALSA_PLUGIN_DIR --- pkgs/by-name/al/alsa-utils/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix index 343fce8dd957..d9d0c959583e 100644 --- a/pkgs/by-name/al/alsa-utils/package.nix +++ b/pkgs/by-name/al/alsa-utils/package.nix @@ -66,7 +66,9 @@ stdenv.mkDerivation (finalAttrs: { procps ] }" - wrapProgram $out/bin/aplay --set-default ALSA_PLUGIN_DIR ${plugin-dir} + for program in $out/bin/*; do + wrapProgram "$program" --set-default ALSA_PLUGIN_DIR "${plugin-dir}" + done ''; postInstall = '' From 782a6308df87bb4961cbd4686ced2117fc736e02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Aug 2025 12:44:47 +0000 Subject: [PATCH 09/60] python3Packages.recoll: 1.43.2 -> 1.43.4 --- pkgs/applications/search/recoll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 92aac25623f1..8e15a73a6757 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -75,11 +75,11 @@ in mkDerivation rec { pname = "recoll"; - version = "1.43.2"; + version = "1.43.4"; src = fetchurl { url = "https://www.recoll.org/${pname}-${version}.tar.gz"; - hash = "sha256-FbDXknumjktcikOfAe4FKtPmggJGGHasq8dpD+8mNzE="; + hash = "sha256-QsciFCPPThcOlMoAx24ykigfHSEopnUtViquHf1kNMs="; }; mesonFlags = [ From b890e55c2eecb88a6497cd392f911b20a6b37852 Mon Sep 17 00:00:00 2001 From: "J. T. Elscott" <78996170+99jte@users.noreply.github.com> Date: Wed, 20 Aug 2025 07:31:15 -0700 Subject: [PATCH 10/60] hashcat: add rocm support Just copy what's already done for CUDA. --- pkgs/by-name/ha/hashcat/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix index c4f8f9f6b295..20764257ffc4 100644 --- a/pkgs/by-name/ha/hashcat/package.nix +++ b/pkgs/by-name/ha/hashcat/package.nix @@ -12,6 +12,8 @@ ocl-icd, perl, python3, + rocmPackages ? { }, + rocmSupport ? config.rocmSupport, xxHash, zlib, libiconv, @@ -43,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals cudaSupport [ + ++ lib.optionals (cudaSupport || rocmSupport) [ addDriverRunpath ]; @@ -102,13 +104,16 @@ stdenv.mkDerivation rec { ++ lib.optionals cudaSupport [ "${cudaPackages_12_4.cudatoolkit}/lib" ] + ++ lib.optionals rocmSupport [ + "${rocmPackages.clr}/lib" + ] ); in '' wrapProgram $out/bin/hashcat \ --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg LD_LIBRARY_PATH} '' - + lib.optionalString cudaSupport '' + + lib.optionalString (cudaSupport || rocmSupport) '' for program in $out/bin/hashcat $out/bin/.hashcat-wrapped; do isELF "$program" || continue addDriverRunpath "$program" From 76b1cd34de2f95f0306052166207e7f7cb595f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 21 Aug 2025 00:12:52 +0200 Subject: [PATCH 11/60] viber: fix libxml2.so.2 not found --- pkgs/by-name/vi/viber/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix index dc12285fcf3a..b470335816c0 100644 --- a/pkgs/by-name/vi/viber/package.nix +++ b/pkgs/by-name/vi/viber/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation { for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath $libPath:$out/opt/viber/lib $file || true + patchelf --set-rpath $libPath:$out/opt/viber/lib:$out/lib $file || true done # qt.conf is not working, so override everything using environment variables @@ -143,6 +143,10 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/viber.desktop \ --replace /opt/viber/Viber $out/opt/viber/Viber \ --replace /usr/share/ $out/share/ + + # Fix libxml2 breakage. See https://github.com/NixOS/nixpkgs/pull/396195#issuecomment-2881757108 + mkdir -p "$out/lib" + ln -s "${lib.getLib libxml2}/lib/libxml2.so" "$out/opt/viber/lib/libxml2.so.2" ''; dontStrip = true; From 299b23c0e130ea890dad51533eeaab52082d6026 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Sat, 19 Jul 2025 19:06:20 +0300 Subject: [PATCH 12/60] python3Packages.pysdl3: 0.9.8b1 -> 0.9.8b9 --- pkgs/development/python-modules/pysdl3/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pysdl3/default.nix b/pkgs/development/python-modules/pysdl3/default.nix index 747458a05187..3df4aab1fd9d 100644 --- a/pkgs/development/python-modules/pysdl3/default.nix +++ b/pkgs/development/python-modules/pysdl3/default.nix @@ -19,18 +19,18 @@ let dochash = if stdenv.hostPlatform.isLinux then - "sha256-+1zLd308zL+m68kLMeOWWxT0wYDgCd6g9cc2hEtaeUs=" + "sha256-d2YQUBWRlDROwiDMJ5mQAR9o+cYsbv1jiulsr1SAaik=" else if stdenv.hostPlatform.isDarwin then - "sha256-2uB9+ABgv5O376LyHb0ShGjM4LHYzMRMxk/k+1LBmv0=" + "sha256-eIzTsn4wYz7TEyWN8QssM7fxpMfz/ENlxDVUMz0Cm4c=" else if stdenv.hostPlatform.isWindows then - "sha256-46bQSPYctycizf2GXichd5V74LjxwIAPhBmklXAJ/Jg=" + "sha256-+iagR5jvpHi8WDh4/DO+GDP6jajEpZ6G1ROhM+zkSiw=" else throw "PySDL3 does not support ${stdenv.hostPlatform.uname.system}"; lib_ext = stdenv.hostPlatform.extensions.sharedLibrary; in buildPythonPackage rec { pname = "pysdl3"; - version = "0.9.8b1"; + version = "0.9.8b9"; pyproject = true; pythonImportsCheck = [ "sdl3" ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Aermoss"; repo = "PySDL3"; tag = "v${version}"; - hash = "sha256-FVUCcqKTq6qdNkYHTYFiUxt2HIaNC5LK0BEUfz8Mue8="; + hash = "sha256-TpfMpp8CGb8lYALCWlMtyucxObDg1VYEvBW+mVHN9JM="; }; docfile = fetchurl { From 60e22fc17e8f153c6bc3ab764898c14b1f086c5e Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Sat, 19 Jul 2025 19:06:57 +0300 Subject: [PATCH 13/60] tauon: 8.0.1 -> 8.1.4 --- pkgs/by-name/ta/tauon/install_mode_true.patch | 15 --------------- pkgs/by-name/ta/tauon/package.nix | 8 ++------ 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/by-name/ta/tauon/install_mode_true.patch diff --git a/pkgs/by-name/ta/tauon/install_mode_true.patch b/pkgs/by-name/ta/tauon/install_mode_true.patch deleted file mode 100644 index e4510e9d2ee1..000000000000 --- a/pkgs/by-name/ta/tauon/install_mode_true.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/tauon/__main__.py b/src/tauon/__main__.py -index 04691586..e48afa02 100755 ---- a/src/tauon/__main__.py -+++ b/src/tauon/__main__.py -@@ -115,8 +115,8 @@ def transfer_args_and_exit() -> None: - if "--no-start" in sys.argv: - transfer_args_and_exit() - --# If we're installed, use home data locations --install_mode = bool(str(install_directory).startswith(("/opt/", "/usr/", "/app/", "/snap/")) or sys.platform in ("darwin", "win32")) -+# Nixpkgs install, use home data dirs. -+install_mode = True - - # Assume that it's a classic Linux install, use standard paths - if str(install_directory).startswith("/usr/") and Path("/usr/share/TauonMusicBox").is_dir(): diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index d302aa1650b2..bdbf27dc97c0 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -48,14 +48,14 @@ let in python3Packages.buildPythonApplication rec { pname = "tauon"; - version = "8.0.1"; + version = "8.1.4"; pyproject = true; src = fetchFromGitHub { owner = "Taiko2k"; repo = "Tauon"; tag = "v${version}"; - hash = "sha256-m94/zdlJu/u/dchIXhqB47bkl6Uej2hVr8R6RNg8Vaw="; + hash = "sha256-AV8B09H/25+2ZOoGux2/A4xP8sBBpRP197JYkS9/awk="; }; postUnpack = '' @@ -66,10 +66,6 @@ python3Packages.buildPythonApplication rec { ln -s ${miniaudio.src} source/src/phazor/miniaudio ''; - patches = [ - ./install_mode_true.patch - ]; - postPatch = '' substituteInPlace src/tauon/t_modules/t_phazor.py \ --replace-fail 'base_path = Path(pctl.install_directory).parent.parent / "build"' 'base_path = Path("${placeholder "out"}/${python3Packages.python.sitePackages}")' From 57d00f085573f1bf3efc6e39481686c5abe86f9c Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 21 Aug 2025 18:10:29 -0400 Subject: [PATCH 14/60] cargo-tauri: cleanup dependencies This removes the {,webkit}gtk dependencies that aren't directly used by the CLI, while explicitly declaring the some dependencies that were previously being pulled in through {,webkit}gtk or just vendored by crates --- pkgs/by-name/ca/cargo-tauri/package.nix | 30 ++++++++++++++--------- pkgs/by-name/ca/cargo-tauri_1/package.nix | 3 +++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 317b40b2735a..f2acfc74c8e1 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -1,14 +1,14 @@ { lib, stdenv, + bzip2, callPackage, rustPlatform, fetchFromGitHub, - gtk4, nix-update-script, - openssl, pkg-config, - webkitgtk_4_1, + xz, + zstd, }: rustPlatform.buildRustPackage rec { @@ -24,19 +24,27 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-nkY1ydc2VewRwY+B5nR68mz8Ff3FK1KoHE4dLzNtPkY="; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - gtk4 - webkitgtk_4_1 + nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ + pkg-config ]; + buildInputs = + # Required for tauri-macos-sign and RPM support in tauri-bundler + lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ + bzip2 + xz + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + zstd + ]; + cargoBuildFlags = [ "--package tauri-cli" ]; cargoTestFlags = cargoBuildFlags; + env = lib.optionalAttrs stdenv.hostPlatform.isLinux { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + passthru = { # See ./doc/hooks/tauri.section.md hook = callPackage ./hook.nix { }; diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 453295d5fa78..cc05adcca3cb 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -8,6 +8,7 @@ gtk3, libsoup_2_4, openssl, + pkg-config, webkitgtk_4_0, }: @@ -36,6 +37,8 @@ cargo-tauri.overrideAttrs ( hash = "sha256-t5sR02qC06H7A2vukwyZYKA2XMVUzJrgIOYuNSf42mE="; }; + nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ]; + buildInputs = [ openssl ] From 91d17ed9d768ca106a92eda767ba2daa4401ae79 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 21 Aug 2025 19:25:50 -0400 Subject: [PATCH 15/60] cargo-tauri: rec -> finalAttrs --- pkgs/by-name/ca/cargo-tauri/package.nix | 14 +++++++------- pkgs/by-name/ca/cargo-tauri_1/package.nix | 5 +---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index f2acfc74c8e1..bf466fd86d9c 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -11,14 +11,14 @@ zstd, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri"; version = "2.7.1"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; - tag = "tauri-cli-v${version}"; + tag = "tauri-cli-v${finalAttrs.version}"; hash = "sha256-0J55AvAvvqTVls4474GcgLPBtSC+rh8cXVKluMjAVBE="; }; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { ]; cargoBuildFlags = [ "--package tauri-cli" ]; - cargoTestFlags = cargoBuildFlags; + cargoTestFlags = finalAttrs.cargoBuildFlags; env = lib.optionalAttrs stdenv.hostPlatform.isLinux { ZSTD_SYS_USE_PKG_CONFIG = true; @@ -47,10 +47,10 @@ rustPlatform.buildRustPackage rec { passthru = { # See ./doc/hooks/tauri.section.md - hook = callPackage ./hook.nix { }; + hook = callPackage ./hook.nix { cargo-tauri = finalAttrs.finalPackage; }; tests = { - hook = callPackage ./test-app.nix { }; + hook = callPackage ./test-app.nix { cargo-tauri = finalAttrs.finalPackage; }; }; updateScript = nix-update-script { @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Build smaller, faster, and more secure desktop applications with a web frontend"; homepage = "https://tauri.app/"; - changelog = "https://github.com/tauri-apps/tauri/releases/tag/${src.tag}"; + changelog = "https://github.com/tauri-apps/tauri/releases/tag/tauri-cli-v${finalAttrs.version}"; license = with lib.licenses; [ asl20 # or mit @@ -76,4 +76,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "cargo-tauri"; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index cc05adcca3cb..03ba763bb62d 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, cargo-tauri, - cargo-tauri_1, gtk3, libsoup_2_4, openssl, @@ -48,9 +47,7 @@ cargo-tauri.overrideAttrs ( webkitgtk_4_0 ]; - passthru = { - hook = cargo-tauri.hook.override { cargo-tauri = cargo-tauri_1; }; - }; + passthru = { inherit (oldAttrs.passthru) hook; }; meta = { inherit (oldAttrs.meta) From ca436e95e26d97efd31bcf748767d291d1bdaf69 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 21 Aug 2025 19:54:47 -0400 Subject: [PATCH 16/60] cargo-tauri: add version test --- pkgs/by-name/ca/cargo-tauri/package.nix | 2 ++ pkgs/by-name/ca/cargo-tauri_1/package.nix | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index bf466fd86d9c..befe5011f2dc 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -7,6 +7,7 @@ fetchFromGitHub, nix-update-script, pkg-config, + testers, xz, zstd, }: @@ -51,6 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { tests = { hook = callPackage ./test-app.nix { cargo-tauri = finalAttrs.finalPackage; }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; }; updateScript = nix-update-script { diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 03ba763bb62d..9c82a73ca686 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -47,7 +47,10 @@ cargo-tauri.overrideAttrs ( webkitgtk_4_0 ]; - passthru = { inherit (oldAttrs.passthru) hook; }; + passthru = { + inherit (oldAttrs.passthru) hook; + tests = { inherit (oldAttrs.passthru.tests) version; }; + }; meta = { inherit (oldAttrs.meta) From 1f9e69f7535e03f12e103bf2a655681a9cca6955 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 21 Aug 2025 19:08:00 -0400 Subject: [PATCH 17/60] cargo-tauri_1: cleanup dependencies This removes the {,webkit}gtk dependencies that aren't directly used by the CLI, while explicitly declaring the some dependencies that were previously being pulled in through {,webkit}gtk or just vendored by crates --- pkgs/by-name/ca/cargo-tauri_1/package.nix | 26 ++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 9c82a73ca686..0facf494764b 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -1,14 +1,13 @@ { lib, stdenv, - rustPlatform, + bzip2, fetchFromGitHub, - cargo-tauri, - gtk3, - libsoup_2_4, - openssl, pkg-config, - webkitgtk_4_0, + rustPlatform, + xz, + zstd, + cargo-tauri, }: cargo-tauri.overrideAttrs ( @@ -39,13 +38,16 @@ cargo-tauri.overrideAttrs ( nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ]; buildInputs = [ - openssl + # Required by `zip` in `tauri-bundler` + bzip2 + zstd ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - gtk3 - libsoup_2_4 - webkitgtk_4_0 - ]; + # Required by `rpm` in `tauri-bundler` + ++ lib.optionals stdenv.hostPlatform.isLinux [ xz ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; passthru = { inherit (oldAttrs.passthru) hook; From e3a9a74a5e3e7fdcdf71a2b79dd7a74dddc7a229 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 21 Aug 2025 19:41:57 -0400 Subject: [PATCH 18/60] cargo-tauri_1: 1.8.1 -> 1.6.6 This appears to be a downgrade, but is actually a upgrade! Previously this package tracked the main `tauri` crate, and not the actual CLI. Oops. Diff: https://github.com/tauri-apps/tauri/compare/tauri-v1.8.1...tauri-cli-v1.6.6 Changelog: https://github.com/tauri-apps/tauri/releases/tag/tauri-cli-v1.6.6 --- pkgs/by-name/ca/cargo-tauri_1/package.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 0facf494764b..fd19b708fdcd 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -2,7 +2,6 @@ lib, stdenv, bzip2, - fetchFromGitHub, pkg-config, rustPlatform, xz, @@ -11,28 +10,25 @@ }: cargo-tauri.overrideAttrs ( - newAttrs: oldAttrs: { - version = "1.8.1"; + finalAttrs: oldAttrs: { + version = "1.6.6"; - src = fetchFromGitHub { - owner = "tauri-apps"; - repo = "tauri"; - rev = "tauri-v${newAttrs.version}"; - hash = "sha256-z8dfiLghN6m95PLCMDgpBMNo+YEvvsGN9F101fAcVF4="; + src = oldAttrs.src.override { + hash = "sha256-UE/mJ0WdbVT4E1YuUCtu80UB+1WR+KRWs+4Emy3Nclc="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 - sourceRoot = "${newAttrs.src.name}/tooling/cli"; + sourceRoot = "${finalAttrs.src.name}/tooling/cli"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (newAttrs) + inherit (finalAttrs) pname version src sourceRoot ; - hash = "sha256-t5sR02qC06H7A2vukwyZYKA2XMVUzJrgIOYuNSf42mE="; + hash = "sha256-kAaq6Kam3e5n8569Y4zdFEiClI8q97XFX1hBD7NkUqw="; }; nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ]; From ab24d5d37808977b7fb7daaf30cb342777e07e37 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Fri, 22 Aug 2025 08:00:50 +0200 Subject: [PATCH 19/60] harper: 0.58.0 -> 0.59.0 Changelog: https://github.com/Automattic/harper/releases/tag/v0.59.0 Diff: https://github.com/Automattic/harper/compare/v0.58.0...v0.59.0 --- pkgs/by-name/ha/harper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 7b43bdab13f5..d4e1ccad0f45 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.58.0"; + version = "0.59.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-KGi/toi02JPDYdNvrhIg9hh+188C5jP41Zk3IKOgO/E="; + hash = "sha256-SUrTdVbxMQ/oPTinYyQD60el6a6Pt3ZDVlFdA+plnnM="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-Er056RhUW33UrRMP412/tj+Qa878Jk+nIcFuF8Ytaes="; + cargoHash = "sha256-tlJ5D1M15QEFmyZ/+FJAVHxKUg9ajfiQxAi+YRz3yk4="; passthru.updateScript = nix-update-script { }; From 56dfb8b617654ae99af09a1db7cddc22ea843978 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 09:02:59 +0000 Subject: [PATCH 20/60] nak: 0.15.2 -> 0.15.3 --- pkgs/by-name/na/nak/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix index 9d5af4fe435f..eac7b61676bd 100644 --- a/pkgs/by-name/na/nak/package.nix +++ b/pkgs/by-name/na/nak/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "nak"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "nak"; tag = "v${finalAttrs.version}"; - hash = "sha256-pYSD6pVp4WRbRzv/voiHpgPKbC9J+PLJGGx6hH813FQ="; + hash = "sha256-PSg+27uTpPIrKlYArWOv92l5muQRQiFZ6Vvu7hDLt5s="; }; - vendorHash = "sha256-Xoi0sepupJK3pT0egbXRYQkPgwc0G2Xgwiz71Tqj8T4="; + vendorHash = "sha256-qwi3awU1DHjT/4scGUrhsdlmXJYwq0g/t4LaZ8FGYB0="; ldflags = [ "-s" From c67491977390eddcda46121190ff7922101a9af8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 10:28:11 +0000 Subject: [PATCH 21/60] python3Packages.reolink: 0053 -> 0.64 --- pkgs/development/python-modules/reolink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 7bb09d8283f7..9658b0890cc9 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0053"; + version = "0.64"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = "reolink"; tag = "v${version}"; - hash = "sha256-DZcTfmzO9rBhhRN2RkgoPwUPE+LPPeZgc8kmhYU9V2I="; + hash = "sha256-3r5BwVlNolji2HIGjqv8gkizx4wWxrKYkiNmSJedKmI="; }; propagatedBuildInputs = [ From c602abd9b9c4509e6c10776dfc0279c7d1ca3a2a Mon Sep 17 00:00:00 2001 From: wrrrzr Date: Fri, 22 Aug 2025 16:26:05 +0300 Subject: [PATCH 22/60] maintainers: add wozrer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c3da2a5e38a4..019b2d8c7f21 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27618,6 +27618,12 @@ githubId = 25372613; name = "Woze Parrot"; }; + wozrer = { + name = "wozrer"; + email = "wozrer@proton.me"; + github = "wrrrzr"; + githubId = 161970349; + }; wr0belj = { name = "Jakub Wróbel"; email = "wrobel.jakub@protonmail.com"; From cf9404b31580f213935838e10312ebcce118d059 Mon Sep 17 00:00:00 2001 From: wrrrzr Date: Fri, 22 Aug 2025 16:30:40 +0300 Subject: [PATCH 23/60] nixos/byedpi: init --- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/byedpi.nix | 53 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 nixos/modules/services/networking/byedpi.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 774d0edbe659..958fc683be72 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -18,6 +18,8 @@ +- [byedpi](https://github.com/hufrea/byedpi), a DPI bypass service. Available as [services.byedpi](#opt-services.byedpi.enable). + - [Overseerr](https://overseerr.dev), a request management and media discovery tool for the Plex ecosystem. Available as [services.overseerr](#opt-services.overseerr.enable). - [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 23e93f20e0cd..4f5224274d1a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1094,6 +1094,7 @@ ./services/networking/bitlbee.nix ./services/networking/blockbook-frontend.nix ./services/networking/blocky.nix + ./services/networking/byedpi.nix ./services/networking/cato-client.nix ./services/networking/centrifugo.nix ./services/networking/cgit.nix diff --git a/nixos/modules/services/networking/byedpi.nix b/nixos/modules/services/networking/byedpi.nix new file mode 100644 index 000000000000..92aed5643dfd --- /dev/null +++ b/nixos/modules/services/networking/byedpi.nix @@ -0,0 +1,53 @@ +{ + lib, + config, + pkgs, + ... +}: + +let + cfg = config.services.byedpi; +in +{ + options.services.byedpi = { + enable = lib.mkEnableOption "the ByeDPI service"; + package = lib.mkPackageOption pkgs "byedpi" { }; + extraArgs = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + example = [ + "--split" + "1" + "--disorder" + "3+s" + "--mod-http=h,d" + "--auto=torst" + "--tlsrec" + "1+s" + ]; + description = "Extra command line arguments."; + }; + }; + config = lib.mkIf cfg.enable { + systemd.services.byedpi = { + description = "ByeDPI"; + wantedBy = [ "default.target" ]; + wants = [ "network-online.target" ]; + after = [ + "network-online.target" + "nss-lookup.target" + ]; + serviceConfig = { + ExecStart = lib.escapeShellArgs ([ (lib.getExe cfg.package) ] ++ cfg.extraArgs); + NoNewPrivileges = "yes"; + StandardOutput = "null"; + StandardError = "journal"; + TimeoutStopSec = "5s"; + PrivateTmp = "true"; + ProtectSystem = "full"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ wozrer ]; +} From eb72906168b24bffe342ee3e03a9149b64916f2f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 21 Aug 2025 23:39:07 +0800 Subject: [PATCH 24/60] spidermonkey_140: init at 140.2.0 --- .../interpreters/spidermonkey/140.nix | 4 ++++ .../interpreters/spidermonkey/common.nix | 23 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/spidermonkey/140.nix diff --git a/pkgs/development/interpreters/spidermonkey/140.nix b/pkgs/development/interpreters/spidermonkey/140.nix new file mode 100644 index 000000000000..48b9a6fb289e --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/140.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "140.2.0"; + hash = "sha512-5Fl8TYOuGoT86SSP5splKvbDYVYH/IlzvZF7/b0qu87Kk3/kxinAzcifoKXIRrXi2KS0Tav3/rIB3rOC3gzMWw=="; +} diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index be2a146097ad..46831d9ec46d 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -24,6 +24,7 @@ # runtime icu75, + icu77, nspr, readline, zlib, @@ -65,6 +66,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://src.fedoraproject.org/rpms/mozjs91/raw/e3729167646775e60a3d8c602c0412e04f206baf/f/0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch"; hash = "sha256-WgDIBidB9XNQ/+HacK7jxWnjOF8PEUt5eB0+Aubtl48="; }) + ] + ++ lib.optionals (lib.versionAtLeast version "140") [ + # mozjs-140.pc does not contain -DXP_UNIX on Linux + # https://bugzilla.mozilla.org/show_bug.cgi?id=1973994 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch"; + hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU="; + }) ]; nativeBuildInputs = [ @@ -89,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - icu75 + (if (lib.versionAtLeast version "140") then icu77 else icu75) nspr readline zlib @@ -120,6 +129,12 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (lib.versionAtLeast version "91") [ "--disable-debug" ] + ++ lib.optionals (lib.versionAtLeast version "140") [ + # For pkgconfig file. + # https://bugzilla.mozilla.org/show_bug.cgi?id=1907030 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1957023 + "--includedir=${placeholder "dev"}/include" + ] ++ [ "--disable-jemalloc" "--disable-strip" @@ -177,6 +192,11 @@ stdenv.mkDerivation (finalAttrs: { configureScript=../js/src/configure ''; + env = lib.optionalAttrs (lib.versionAtLeast version "140") { + # '-Wformat-security' ignored without '-Wformat' + NIX_CFLAGS_COMPILE = "-Wformat"; + }; + # Remove unnecessary static lib preFixup = '' moveToOutput bin/js${lib.versions.major version}-config "$dev" @@ -196,6 +216,7 @@ stdenv.mkDerivation (finalAttrs: { abbradar lostnet catap + bobby285271 ]; broken = stdenv.hostPlatform.isDarwin; # 91 is broken, >=115 requires SDK 13.3 (see #242666). platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c60ad7b5884..3176791f7d24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6545,10 +6545,12 @@ with pkgs; spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { }; spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { }; spidermonkey_128 = callPackage ../development/interpreters/spidermonkey/128.nix { }; + spidermonkey_140 = callPackage ../development/interpreters/spidermonkey/140.nix { }; }) spidermonkey_91 spidermonkey_115 spidermonkey_128 + spidermonkey_140 ; supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { From 3ef40e5b2c9cef34b658e2b3a36c05a5d9fccdd2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Aug 2025 20:39:02 +0200 Subject: [PATCH 25/60] favirecon: 1.0.0 -> 1.0.1 Diff: https://github.com/edoardottt/favirecon/compare/v1.0.0...v1.0.1 Changelog: https://github.com/edoardottt/favirecon/releases/tag/v1.0.1 --- pkgs/by-name/fa/favirecon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/favirecon/package.nix b/pkgs/by-name/fa/favirecon/package.nix index ef142c9a0d66..1b7398048281 100644 --- a/pkgs/by-name/fa/favirecon/package.nix +++ b/pkgs/by-name/fa/favirecon/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "favirecon"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "edoardottt"; repo = "favirecon"; tag = "v${version}"; - hash = "sha256-nL5W4i4NJEjhkiO83hL9qK4XCIT5fnwRshyDkU1fASk="; + hash = "sha256-fxUukhKbxxUUaOMcYxNR29H1nxRb0IWT0Qy5XJNOYjU="; }; - vendorHash = "sha256-PRLXVuqth9z0FkaMqUlEue1BFTI37oiobKOg3JvBYGU="; + vendorHash = "sha256-Xsi4EA6wBgF7jmel38csh1T3I/SQfkMI0g1pR54nwCM="; ldflags = [ "-s" From 34c5aa33a2ebe5ece4254f21674340969f554947 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 18:48:18 +0000 Subject: [PATCH 26/60] liboprf: 0.7.1 -> 0.8.0 --- pkgs/by-name/li/liboprf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/liboprf/package.nix b/pkgs/by-name/li/liboprf/package.nix index 3944080262fb..15a453da8eca 100644 --- a/pkgs/by-name/li/liboprf/package.nix +++ b/pkgs/by-name/li/liboprf/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liboprf"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "stef"; repo = "liboprf"; tag = "v${finalAttrs.version}"; - hash = "sha256-auC6iVTMbLktKCPY8VgOdx2dMI2KDzNgtY1zyNXjM1A="; + hash = "sha256-xDE9UkHDAaA7zC6IxxEIUG7ziS1yYNLJbmVJZLJyL7U="; }; sourceRoot = "${finalAttrs.src.name}/src"; From 757ff4df878de8113ddb95b8365b2afdb1ada596 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Aug 2025 23:09:34 +0200 Subject: [PATCH 27/60] python313Packages.reolink: refactor --- .../python-modules/reolink/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 9658b0890cc9..89d4837c6421 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -6,16 +6,14 @@ fetchFromGitHub, ffmpeg-python, pytestCheckHook, - pythonOlder, requests, + setuptools, }: buildPythonPackage rec { pname = "reolink"; version = "0.64"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + pyproject = true; src = fetchFromGitHub { owner = "fwestenberg"; @@ -24,7 +22,9 @@ buildPythonPackage rec { hash = "sha256-3r5BwVlNolji2HIGjqv8gkizx4wWxrKYkiNmSJedKmI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp ffmpeg-python requests @@ -57,11 +57,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "reolink" ]; + passthru.skipBulkUpdate = true; + meta = with lib; { description = "Module to interact with the Reolink IP camera API"; homepage = "https://github.com/fwestenberg/reolink"; - changelog = "https://github.com/fwestenberg/reolink/releases/tag/v${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/fwestenberg/reolink/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 87f6fc43f10d268c71b10a1f60ded2bbc5e9421f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Aug 2025 23:29:09 +0200 Subject: [PATCH 28/60] azurehound: 2.7.0 -> 2.7.1 Diff: https://github.com/SpecterOps/AzureHound/compare/refs/tags/v2.7.0...refs/tags/v2.7.1 Changelog: https://github.com/SpecterOps/AzureHound/releases/tag/v2.7.1 --- pkgs/by-name/az/azurehound/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index 855f09289ed1..024b29001b65 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "azurehound"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "SpecterOps"; repo = "AzureHound"; tag = "v${version}"; - hash = "sha256-UmEgrADPolWw1Ml1nHobH9xHjG9cIL6Rzup42Bw6GAU="; + hash = "sha256-fCs9C86IO1aTzBFZiA7SaVlk0Zdm/ItWtLhE8Ii2W0A="; }; vendorHash = "sha256-ScFHEIarDvxd9R6eUONdECmtK+5aZRdo71khljLz8c4="; From 33cce4f8c6c3f1b9f54c948fe689da55c4239907 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Aug 2025 23:29:57 +0200 Subject: [PATCH 29/60] vuls: 0.33.2 -> 0.33.3 Diff: https://github.com/future-architect/vuls/compare/v0.33.2...v0.33.3 Changelog: https://github.com/future-architect/vuls/blob/refs/tags/v0.33.3/CHANGELOG.md --- pkgs/by-name/vu/vuls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix index 4cc534718ceb..1c23853533f7 100644 --- a/pkgs/by-name/vu/vuls/package.nix +++ b/pkgs/by-name/vu/vuls/package.nix @@ -6,17 +6,17 @@ buildGo124Module rec { pname = "vuls"; - version = "0.33.2"; + version = "0.33.3"; src = fetchFromGitHub { owner = "future-architect"; repo = "vuls"; tag = "v${version}"; - hash = "sha256-6tpX8pZNKJXJv6ArwNWn9ih19LU3DNeBUXy9U/dHhVc="; + hash = "sha256-sIsdXtvMoVi72eHGuJqGQz9dAb9OqAyYvbDT55dnJb8="; fetchSubmodules = true; }; - vendorHash = "sha256-vZMpQvEswcsfppZ5tIaI4fqrKkwbN53shefRyLR/Sg8="; + vendorHash = "sha256-OjE+j91QgS74FknfYLnkA7RKDSnC8yUZDIRXw3taORA="; ldflags = [ "-s" From 6629b4846ff6a52ef254f9ab8a38344ddac3b485 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 21:34:07 +0000 Subject: [PATCH 30/60] python3Packages.govee-ble: 0.44.0 -> 0.45.0 --- pkgs/development/python-modules/govee-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index fb74554ad83e..ada45324e92c 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.44.0"; + version = "0.45.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "govee-ble"; tag = "v${version}"; - hash = "sha256-19kGgelUFuMuiZxzb0ySkG6L52I/CHsfPQdzSbwucPY="; + hash = "sha256-SUxK4H0Vo8C4GykIv8duFhhiGBA860QofVQDO37Ubdw="; }; build-system = [ poetry-core ]; From d6eb73b5c1d5c5b487c273b098944d4be4bee7e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Aug 2025 23:48:41 +0200 Subject: [PATCH 31/60] python313Packages.arrayqueues: add changelog to meta --- pkgs/development/python-modules/arrayqueues/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index a2bd69bf3a19..abd9eb547d3d 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/portugueslab/arrayqueues"; description = "Multiprocessing queues for numpy arrays using shared memory"; + changelog = "https://github.com/portugueslab/arrayqueues/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tbenst ]; }; From 746b93d7c5fecdda452c3ee6bd9dd36a11a92e7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Aug 2025 23:50:04 +0200 Subject: [PATCH 32/60] python313Packages.arrayqueues: modernize --- pkgs/development/python-modules/arrayqueues/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index abd9eb547d3d..fc21ec2ee587 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -4,12 +4,13 @@ fetchPypi, isPy3k, numpy, + setuptools, }: buildPythonPackage rec { pname = "arrayqueues"; version = "1.4.1"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchPypi { @@ -17,7 +18,9 @@ buildPythonPackage rec { hash = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; meta = { homepage = "https://github.com/portugueslab/arrayqueues"; From 6c42b1f98ee6001a1957845a96f40ffd2298cfcc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Aug 2025 23:50:38 +0200 Subject: [PATCH 33/60] python313Packages.arrayqueues: remove disabled --- pkgs/development/python-modules/arrayqueues/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index fc21ec2ee587..3313a0edaecf 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy3k, numpy, setuptools, }: @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "arrayqueues"; version = "1.4.1"; pyproject = true; - disabled = !isPy3k; src = fetchPypi { inherit pname version; From b8373ee9e185afda971af03f8983428604fc887f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Aug 2025 23:52:41 +0200 Subject: [PATCH 34/60] python313Packages.arrayqueues: switch to Github for the source --- .../development/python-modules/arrayqueues/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index 3313a0edaecf..d9fb2c9bdc93 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, numpy, setuptools, }: @@ -11,9 +11,11 @@ buildPythonPackage rec { version = "1.4.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY="; + src = fetchFromGitHub { + owner = "portugueslab"; + repo = "arrayqueues"; + tag = "v${version}"; + hash = "sha256-tqIfpkwbJNd9jMe0YvAWz9Z8rOO80qxVM2ZcJFeAmwo="; }; build-system = [ setuptools ]; From 257a9da3736e03e3421ffefb5d125d2047dfaca9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Aug 2025 23:54:12 +0200 Subject: [PATCH 35/60] python313Packages.arrayqueues: enable tests and add pythonImportsCheck --- pkgs/development/python-modules/arrayqueues/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index d9fb2c9bdc93..4d7e03fd6913 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, numpy, + pytestCheckHook, setuptools, }: @@ -22,6 +23,10 @@ buildPythonPackage rec { dependencies = [ numpy ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "arrayqueues" ]; + meta = { homepage = "https://github.com/portugueslab/arrayqueues"; description = "Multiprocessing queues for numpy arrays using shared memory"; From 4469fd60bff0f02ee40abc5906fe0519b3598ae7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Aug 2025 00:00:28 +0200 Subject: [PATCH 36/60] autotrash: add changelog to meta --- pkgs/by-name/au/autotrash/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix index ff5a97a4cd64..6e775e86f1a7 100644 --- a/pkgs/by-name/au/autotrash/package.nix +++ b/pkgs/by-name/au/autotrash/package.nix @@ -27,12 +27,12 @@ python3Packages.buildPythonPackage rec { postInstall = "installManPage doc/autotrash.1"; pythonImportsCheck = [ "autotrash" ]; - nativeCheckInputs = [ python3Packages.pytestCheckHook ]; meta = { description = "Tool to automatically purge old trashed files"; license = lib.licenses.gpl3Plus; homepage = "https://bneijt.nl/pr/autotrash"; + changelog = "https://github.com/bneijt/autotrash/releases/tag/${src.tag}"; maintainers = with lib.maintainers; [ sigmanificient mithicspirit From 9fd881d31d65d8be2458c1dd1f70bba7fd17b751 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 22 Aug 2025 14:59:34 -0700 Subject: [PATCH 37/60] ci: add @philiptaron as a reviewer on anything in maintainers that's otherwise not maintained MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > Anyway, I keep picturing all these little kids playing some game in this big field of rye and all. Thousands of little kids, and nobody’s around―nobody big, I mean―except me. And I’m standing on the edge of some crazy cliff. What I have to do, I have to catch everybody if they start to go over the cliff―I mean if they’re running and they don’t look where they’re going I have to come out from somewhere and catch them. That’s all I’d do all day. I’d just be the catcher in the rye and all. I know it’s crazy, but that’s the only thing I’d really like to be. I know it’s crazy. --- ci/OWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/OWNERS b/ci/OWNERS index 856ca93675ca..cb3b2869a9f1 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -19,6 +19,7 @@ /.github/workflows @NixOS/nixpkgs-ci /ci @NixOS/nixpkgs-ci /ci/OWNERS @infinisil @philiptaron +/maintainers @philiptaron # Development support /.editorconfig @Mic92 @zowoq From 3a165d84e3e3db43d577a5e5dbaf8013f704a213 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Aug 2025 00:03:08 +0200 Subject: [PATCH 38/60] autotrash: set version --- pkgs/by-name/au/autotrash/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix index 6e775e86f1a7..e2539fc75f8d 100644 --- a/pkgs/by-name/au/autotrash/package.nix +++ b/pkgs/by-name/au/autotrash/package.nix @@ -17,6 +17,11 @@ python3Packages.buildPythonPackage rec { hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + build-system = [ python3Packages.poetry-core ]; nativeBuildInputs = [ From 84956b5453cd56cb0a90ff133d8c7447e30284c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Aug 2025 00:03:54 +0200 Subject: [PATCH 39/60] autotrash: add blank line between logical sections --- pkgs/by-name/au/autotrash/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix index e2539fc75f8d..8acc2bfc3325 100644 --- a/pkgs/by-name/au/autotrash/package.nix +++ b/pkgs/by-name/au/autotrash/package.nix @@ -5,6 +5,7 @@ pandoc, installShellFiles, }: + python3Packages.buildPythonPackage rec { pname = "autotrash"; version = "0.4.7"; @@ -28,7 +29,9 @@ python3Packages.buildPythonPackage rec { installShellFiles pandoc ]; + postBuild = "make -C doc autotrash.1"; + postInstall = "installManPage doc/autotrash.1"; pythonImportsCheck = [ "autotrash" ]; From 32873aef855a72f807f11477f94839cb78e4c94e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 23:17:13 +0000 Subject: [PATCH 40/60] python3Packages.sharkiq: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/sharkiq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix index 21c72d6c6523..7649d7c7020e 100644 --- a/pkgs/development/python-modules/sharkiq/default.nix +++ b/pkgs/development/python-modules/sharkiq/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "sharkiq"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "JeffResc"; repo = "sharkiq"; tag = "v${version}"; - hash = "sha256-FIPU2D0e0JGcoxFKe5gf5nKZ0T/a18WS9I+LXeig1is="; + hash = "sha256-bojLyL16DOFgbU8rglzBRxcgsHwaTQQAsJQZCaXo5pw="; }; build-system = [ setuptools ]; From 4d129212c4ec9dbb4ed812bd194385683fee4b47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 00:46:18 +0000 Subject: [PATCH 41/60] redocly: 2.0.2 -> 2.0.7 --- pkgs/by-name/re/redocly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index fd6f2a6b5c12..38e3e1339ec6 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "2.0.2"; + version = "2.0.7"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-dIPKvvJpNOvJLQ/tT0EOtRIx9/LfQf0g4+N9JChk37U="; + hash = "sha256-diTs1SudDtATY1sNghnWr4Uel1UT38YVSuJZLdb6sZs="; }; - npmDepsHash = "sha256-nb6QPtCqnXeRA7YEG3+U3ZWWG41v5cpkIplgNYej4dQ="; + npmDepsHash = "sha256-iHfbrX3HYDDol9Nt++vJAhlaBQJDRLypkuVdp0Iwjuc="; npmBuildScript = "prepare"; From 421c51084beac92d96ed11b3a623020f382b8c81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 01:48:26 +0000 Subject: [PATCH 42/60] nvc: 1.17.1 -> 1.17.2 --- pkgs/by-name/nv/nvc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index 053c21e223f0..4c336ac7fce7 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; tag = "r${version}"; - hash = "sha256-5mOw69qqKabvbMCJbLoaIV8WwcRr6m4zc/lM0ssvtEw="; + hash = "sha256-YNbRgqJSf22YV/4e2Sr9CwKFOQcBVhS6ScDNon3yJUM="; }; nativeBuildInputs = [ From 24d2d0fd641e6536518147acd39538b5f373001b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 23 Aug 2025 10:42:29 +0800 Subject: [PATCH 43/60] pantheon.elementary-terminal: 7.1.0 -> 7.1.1 https://github.com/elementary/terminal/compare/7.1.0...7.1.1 --- .../pantheon/apps/elementary-terminal/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index c3c6458927d0..db305cd613e1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nix-update-script, pkg-config, meson, @@ -22,24 +21,15 @@ stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "7.1.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = "terminal"; rev = version; - sha256 = "sha256-IbN01o3rojlwp4rBt8NlIPthxIPMOm/bD1rzD5Taibw="; + sha256 = "sha256-B/VEVS1dJQGJ8+gqgJ/mb3+r29ZPtCSSlur/CAr6BJg="; }; - patches = [ - # Fix incorrect line breaks when pasting/dropping into foreground processes - # https://github.com/elementary/terminal/pull/862 - (fetchpatch { - url = "https://github.com/elementary/terminal/commit/8f93bc77437e45090e59266c7813436a0903d27b.patch"; - hash = "sha256-4xUFnFVUV4EIDZFprEbL+S49j5Maof5/egHPVaJAVg4="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils meson From 47054575df7195756d6e53eb00cb76a1290181b5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 22 Aug 2025 23:14:07 +0800 Subject: [PATCH 44/60] xfce.xfdashboard: 1.0.0-unstable-2025-07-18 -> 1.1.0 http://gitlab.xfce.org/apps/xfdashboard/-/compare/93255940950ef5bc89cab729c8b977a706f98e0c...xfdashboard-1.1.0 --- .../xfce/applications/xfdashboard/default.nix | 62 ++++++++++++++----- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index 54101465e6c0..29df0de640a1 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -1,6 +1,12 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + fetchpatch, + meson, + ninja, + pkg-config, + wrapGAppsHook3, clutter, gettext, libXcomposite, @@ -14,26 +20,48 @@ xfconf, gtk3, glib, - dbus-glib, + gitUpdater, }: -mkXfceDerivation { - category = "apps"; +stdenv.mkDerivation (finalAttrs: { pname = "xfdashboard"; - version = "1.0.0-unstable-2025-07-18"; - # Fix build with gettext 0.25 - rev = "93255940950ef5bc89cab729c8b977a706f98e0c"; - rev-prefix = ""; + version = "1.1.0"; - sha256 = "sha256-Qv0ASuJF0FzPoeLx2D6/kXkxnOJV7mdAFD6PCk+CMac="; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "apps"; + repo = "xfdashboard"; + tag = "xfdashboard-${finalAttrs.version}"; + hash = "sha256-D8Tue+45CO5yy7sxealKQoFQZobCiDUzoxCsDksTTxI="; + }; + + patches = [ + # Exit early if not on X11 + (fetchpatch { + url = "https://gitlab.xfce.org/apps/xfdashboard/-/commit/7452a7074dfc36c5af42c4105aadaac8656c2f60.patch"; + hash = "sha256-u0djTProV3On0uutg89Q+psgmVGJS768KwiYxZ7dhrE="; + }) + + # build: Fix version/so_version inversion + (fetchpatch { + url = "https://gitlab.xfce.org/apps/xfdashboard/-/commit/20f23e62576d186fada6688af3bb05bc7f223f44.patch"; + hash = "sha256-C2oIBi9tfoQF123Ez3YbFUs8vX2DeYdr3BDc85ExTgQ="; + }) + ]; + + strictDeps = true; nativeBuildInputs = [ gettext + glib # glib-genmarshal + meson + ninja + pkg-config + wrapGAppsHook3 ]; buildInputs = [ clutter - dbus-glib garcon glib gtk3 @@ -47,8 +75,14 @@ mkXfceDerivation { xfconf ]; - meta = with lib; { - description = "Gnome shell like dashboard"; - teams = [ teams.xfce ]; + passthru.updateScript = gitUpdater { rev-prefix = "xfdashboard-"; }; + + meta = { + description = "GNOME shell like dashboard"; + homepage = "https://gitlab.xfce.org/apps/xfdashboard"; + license = lib.licenses.gpl2Plus; + mainProgram = "xfdashboard"; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +}) From ef42534976e60c14737c4bddc5bd821a732fdd85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 03:47:40 +0000 Subject: [PATCH 45/60] webcord: 4.11.0 -> 4.11.1 --- pkgs/by-name/we/webcord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index ae2a230af021..50a9de8366e1 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "webcord"; - version = "4.11.0"; + version = "4.11.1"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; tag = "v${version}"; - hash = "sha256-JHPvUEHBPsDqdesVifPFtg9mRwTUsln6JeXKXj/o8d8="; + hash = "sha256-u2Asoc5cwVRtD6yz77iJ8hA2IfVSA4iYI8snPCLufnE="; }; - npmDepsHash = "sha256-5R3kcMZ9TsuZ89M6C3y/daEYDd/0ekRqf3uLBzSOOJA="; + npmDepsHash = "sha256-sREnthfmE01yzVwqMN6zbhTAquulztriytMSOcj3ZCo="; makeCacheWritable = true; From 2de581e65332e7e52dd641736d42adb4bdc7d38c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 04:26:10 +0000 Subject: [PATCH 46/60] python3Packages.pyswitchbot: 0.68.3 -> 0.68.4 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index a7aede945cea..5b1dd2d43536 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.68.3"; + version = "0.68.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; tag = version; - hash = "sha256-PMwXaOIEUuJcZ8D7xuOfwTqYStqynu30wS0wWHyc2WI="; + hash = "sha256-B3xORFuvgVM4MoAMWWXkO5wUe1wU2gEo+NzWVikMrXg="; }; build-system = [ setuptools ]; From 698ca750ea6c0557c0d8f59b4cae54676974924e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 06:48:45 +0000 Subject: [PATCH 47/60] vscode: 1.103.1 -> 1.103.2 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1bfa8a5c7874..4a09cbb4c1e1 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-0zM9dyK226l4RgF1H81ojp5HC25snaN5K1QCnWIw/nw="; - x86_64-darwin = "sha256-PpThKF6TKp7hcku8QEsVYhQYVwgiVFaCWSgNI6Vo2+s="; - aarch64-linux = "sha256-bv9WsrvvlUc4PCKNZmsFBXQD6le5Ier1nm5qaXD2Mic="; - aarch64-darwin = "sha256-5wWmlgarDlWvk2Y4HRk00/oi0WcjDmnT7YL2Z1rfJ+Y="; - armv7l-linux = "sha256-hSYqK1hXg3nfxz344XdLrnWfixmlqbJUpI68PCcfF+I="; + x86_64-linux = "sha256-vlmvPk2ljwdDklGygdxmtodPzGB+gNjwEaaVp3N+fQI="; + x86_64-darwin = "sha256-k1W/85ehc8YXBKSac+E9aoV2AEif85iyTqqxEZ3MNr8="; + aarch64-linux = "sha256-26QfnBYm1Rx1Udzk4dtpNOUSpuDqpIkimv0QlkcnsAg="; + aarch64-darwin = "sha256-au/H0QxWb9KwuJkJVV+gVyjUlArziV0zptrAlBtt9f0="; + armv7l-linux = "sha256-VRbzwhoqrLCdGbAYRkzVMzVjg8pioRhvKTvV3F+tjjE="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.103.1"; + version = "1.103.2"; # This is used for VS Code - Remote SSH test - rev = "e3550cfac4b63ca4eafca7b601f0d2885817fd1f"; + rev = "6f17636121051a53c88d3e605c491d22af2ba755"; in callPackage ./generic.nix { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ callPackage ./generic.nix { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-GEN8WMPaYhwQsgml3tXWJP7F4RXH5vy6Ht0RUGauxnw="; + hash = "sha256-6E/rh22SC97uzkDsLMsrard9kbfSanuUcAImrV69JLw="; }; stdenv = stdenvNoCC; }; From 3a2ece762eb14a50010435401848ac4409ceb08b Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 23 Aug 2025 09:49:27 +0300 Subject: [PATCH 48/60] nixos/all-tests: delete deleted test --- nixos/tests/all-tests.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9631036f035c..7c05d24a793f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1187,7 +1187,6 @@ in pingvin-share = runTest ./pingvin-share.nix; pinnwand = runTest ./pinnwand.nix; plantuml-server = runTest ./plantuml-server.nix; - plasma-bigscreen = runTest ./plasma-bigscreen.nix; plasma6 = runTest ./plasma6.nix; plausible = runTest ./plausible.nix; playwright-python = runTest ./playwright-python.nix; From 19a760df2d40f0f41baa8fa899f3fc2342c5ab0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Aug 2025 17:32:39 +1000 Subject: [PATCH 49/60] github-runner: 2.327.1 -> 2.328.0 (#435227) --- pkgs/by-name/gi/github-runner/deps.json | 42 +++++++++++------------ pkgs/by-name/gi/github-runner/package.nix | 4 +-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/gi/github-runner/deps.json b/pkgs/by-name/gi/github-runner/deps.json index cc73b54f8081..6146f1957680 100644 --- a/pkgs/by-name/gi/github-runner/deps.json +++ b/pkgs/by-name/gi/github-runner/deps.json @@ -6,13 +6,13 @@ }, { "pname": "Azure.Storage.Blobs", - "version": "12.24.0", - "hash": "sha256-PcI3Jf9VrDfkr0YfoR89us45HE1DE8g5J3ZpZ8vZkLs=" + "version": "12.25.0", + "hash": "sha256-SjIwM1sIBd4I9ShAeaIAfPUzc3K7tbodW6y1vNAD+4U=" }, { "pname": "Azure.Storage.Common", - "version": "12.23.0", - "hash": "sha256-DAMzFlls76hH5jtXtU89SvbQWhhELaQq+PfG4SK7W+Q=" + "version": "12.24.0", + "hash": "sha256-ZjeMv8xaZXkmb1OgZlN9uJelhAcU7KhO/FK02qiz/zA=" }, { "pname": "Castle.Core", @@ -31,13 +31,13 @@ }, { "pname": "Microsoft.CodeCoverage", - "version": "17.13.0", - "hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o=" + "version": "17.14.1", + "hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs=" }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.13.0", - "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY=" + "version": "17.14.1", + "hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -96,13 +96,13 @@ }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.13.0", - "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk=" + "version": "17.14.1", + "hash": "sha256-QMf6O+w0IT+16Mrzo7wn+N20f3L1/mDhs/qjmEo1rYs=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.13.0", - "hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo=" + "version": "17.14.1", + "hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs=" }, { "pname": "Microsoft.Win32.Primitives", @@ -134,11 +134,6 @@ "version": "1.5.0-rc2-24027", "hash": "sha256-lddIyqj8Y3IexOm5I1hsE5w1/dOoOaNDHoUPI1vkX80=" }, - { - "pname": "Newtonsoft.Json", - "version": "13.0.1", - "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" - }, { "pname": "Newtonsoft.Json", "version": "13.0.3", @@ -449,6 +444,11 @@ "version": "4.3.0", "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + }, { "pname": "System.Console", "version": "4.0.0-rc2-24027", @@ -576,8 +576,8 @@ }, { "pname": "System.IO.Hashing", - "version": "6.0.0", - "hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE=" + "version": "8.0.0", + "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE=" }, { "pname": "System.Linq", @@ -661,8 +661,8 @@ }, { "pname": "System.Reflection.Metadata", - "version": "1.6.0", - "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + "version": "8.0.0", + "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" }, { "pname": "System.Reflection.Primitives", diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 2f41b1ce826d..776c86e6a945 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -25,13 +25,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes; buildDotnetModule (finalAttrs: { pname = "github-runner"; - version = "2.327.1"; + version = "2.328.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-wTbhuBg9eIq1wGifeORTUvp9+yWDHb42J88o2Fmnrfo="; + hash = "sha256-3Q2bscLKdUBPx+5X0qxwtcy3CU6N/wE8yO1CcATSyBQ="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision From 226476dc5efcebbc6120ae79fb0316fcb1d61e75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Aug 2025 09:34:41 +0200 Subject: [PATCH 50/60] python313Packages.govee-ble: update disabled --- pkgs/development/python-modules/govee-ble/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index ada45324e92c..3413143a8fc2 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "0.45.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; From 9ef783d06da93f05afddb3a8df41fcb1987b5cfb Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 23 Aug 2025 10:40:49 +0300 Subject: [PATCH 51/60] python313Packages.django-cachalot: actually use pytestCheckHook, skip broken tests --- .../django-cachalot/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix index 7d8377e74039..37e126c50621 100644 --- a/pkgs/development/python-modules/django-cachalot/default.nix +++ b/pkgs/development/python-modules/django-cachalot/default.nix @@ -56,19 +56,23 @@ buildPythonPackage rec { # redisTestHook does not work on darwin doCheck = !stdenv.hostPlatform.isDarwin; - # disable broken pinning test preCheck = '' - substituteInPlace cachalot/tests/read.py \ - --replace-fail \ - "def test_explain(" \ - "def _test_explain(" + export DJANGO_SETTINGS_MODULE=settings ''; - checkPhase = '' - runHook preCheck - ${python.interpreter} runtests.py - runHook postCheck - ''; + pytestFlags = [ + "-o python_files=*.py" + "-o collect_imported_tests=false" + "cachalot/tests" + "cachalot/admin_tests" + ]; + + disabledTests = [ + # relies on specific EXPLAIN output format from sqlite, which is not stable + "test_explain" + # broken on django-debug-toolbar 6.0 + "test_rendering" + ]; meta = with lib; { description = "No effort, no worry, maximum performance"; From 413b9e7efc02554bb3dc1837aa9627c1ebcd8723 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 23 Aug 2025 10:57:25 +0300 Subject: [PATCH 52/60] paperless-ngx: drop merged patch --- pkgs/by-name/pa/paperless-ngx/package.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 607adc324deb..f191fea5795a 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -152,15 +152,6 @@ python.pkgs.buildPythonApplication rec { inherit version src; - # Manual partial backport of: - # - https://github.com/paperless-ngx/paperless-ngx/commit/9889c59d3daa8f4ac8ec2400c00ddc36a7ca63c9 - # - https://github.com/paperless-ngx/paperless-ngx/pull/10538 - # Fixes build with latest dependency versions. - # FIXME: remove in next update - patches = [ - ./dep-updates.patch - ]; - postPatch = '' # pytest-xdist with to many threads makes the tests flaky if (( $NIX_BUILD_CORES > 3)); then From af2826cf7d00a21c078ff5c8718e4ae05ed8f97c Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 23 Aug 2025 08:15:10 +0200 Subject: [PATCH 53/60] linux_xanmod: 6.12.42 -> 6.12.43 --- 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 f81265b76aac..dd1c9a1f12b9 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.42"; - hash = "sha256-q/a6ik5kKRKOcbmGxGBdCDW3dsgIDf/7tvEpcGjDrHI="; + version = "6.12.43"; + hash = "sha256-Jc3VKpUaIc1nBbbCZ/jAx/kteuQBQBO6TEPlaNq8Jrk="; }; # ./update-xanmod.sh main main = { From 792d8f00f4d116878f8b5956aabd3e026b4527c0 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 23 Aug 2025 08:17:01 +0200 Subject: [PATCH 54/60] linux_xanmod_latest: 6.15.10 -> 6.15.11 --- 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 dd1c9a1f12b9..37f23057c66f 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -20,8 +20,8 @@ let }; # ./update-xanmod.sh main main = { - version = "6.15.10"; - hash = "sha256-6ed820JXJr7QqOX3IiF50SFrYeVrx0xCh73zrlmMy5I="; + version = "6.15.11"; + hash = "sha256-251rQqXkzLzmgl1uqN3mvXlkIbH+B25C30hMJ6v4tBE="; }; }; From 2b96c79244ded28eafb90b2f7fd2b651a627ff5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 23 Aug 2025 11:15:54 +0200 Subject: [PATCH 55/60] Revert "buildMozillaMach: use nss-esr for 140esr and older" This reverts commit c4a261a0519d1353b86a02d3e0f67d9aad75ff3d. We need to postpone this after updating nss-esr to fix 140esr build https://github.com/NixOS/nixpkgs/pull/435439#discussion_r2295299515 --- pkgs/build-support/build-mozilla-mach/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index b7feccb768c0..75e94c5ccfd8 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -577,7 +577,7 @@ buildStdenv.mkDerivation { xorg.xorgproto zlib ( - if (lib.versionAtLeast version "141") then nss_latest else nss_esr # 3.90 + if (lib.versionAtLeast version "129") then nss_latest else nss_esr # 3.90 ) ] ++ lib.optional alsaSupport alsa-lib From d7dc3d0292692a8e6941432abb165449558edc2b Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 23 Aug 2025 09:42:44 +0200 Subject: [PATCH 56/60] python3Packages.sphinxext-opengraph: switch to pyproject to fix build --- .../python-modules/sphinxext-opengraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 70bd42464cae..e62e96f242a4 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -7,13 +7,13 @@ pytestCheckHook, pythonOlder, beautifulsoup4, - setuptools-scm, + flit-core, }: buildPythonPackage rec { pname = "sphinxext-opengraph"; version = "0.12.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { hash = "sha256-2ch9BxgrqbfIJ8fzFKYscha4+G7OAVz+OIOqYwX2gSA="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ flit-core ]; optional-dependencies = { social_cards_generation = [ matplotlib ]; From 498d03f92f29c1869f3804ccd5ae0bf3ba9f033a Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 23 Aug 2025 10:08:55 +0200 Subject: [PATCH 57/60] python3Packages.sphinx-reredirects: switch to flit-core to fix build --- .../development/python-modules/sphinx-reredirects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-reredirects/default.nix b/pkgs/development/python-modules/sphinx-reredirects/default.nix index b250106a46c9..877676192611 100644 --- a/pkgs/development/python-modules/sphinx-reredirects/default.nix +++ b/pkgs/development/python-modules/sphinx-reredirects/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - setuptools, + flit-core, sphinx, }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; build-system = [ - setuptools + flit-core ]; dependencies = [ From 2ee236a095ce3875e18eded7ae9826f456b65d96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Aug 2025 10:01:21 +0000 Subject: [PATCH 58/60] kubectl-ai: 0.0.20 -> 0.0.22 --- pkgs/by-name/ku/kubectl-ai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix index ac29224c97a7..6a35ec8699e9 100644 --- a/pkgs/by-name/ku/kubectl-ai/package.nix +++ b/pkgs/by-name/ku/kubectl-ai/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kubectl-ai"; - version = "0.0.20"; + version = "0.0.22"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubectl-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-iyyaQBulncPNJXm7ir/aOjJxJvd0Q178weneiwQbGcU="; + hash = "sha256-sU8CATzhp0seUJNYjvxFkRoA/Xqb57kZqGpEOCxypUA="; }; - vendorHash = "sha256-a84HesnInU7JZZTx0Rm1Qgsmo7SJC0kMnckgmUk0Vow="; + vendorHash = "sha256-OJnpd8z4e6ytoUi5ydFHYPMA77ryU7Tp8wriuab7yuk="; # Build the main command subPackages = [ "cmd" ]; From c8b23bcbe4399be7c4b8d5c2803ad08e53fce93d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Aug 2025 12:37:46 +0200 Subject: [PATCH 59/60] python3Packages.django-hierarkey: 2.0.0 -> 2.0.1 https://github.com/raphaelm/django-hierarkey/compare/2.0.0...2.0.1 --- pkgs/development/python-modules/django-hierarkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-hierarkey/default.nix b/pkgs/development/python-modules/django-hierarkey/default.nix index bd9702b356b2..21029c39516a 100644 --- a/pkgs/development/python-modules/django-hierarkey/default.nix +++ b/pkgs/development/python-modules/django-hierarkey/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-hierarkey"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "raphaelm"; repo = "django-hierarkey"; tag = version; - hash = "sha256-vXc31tUQrukdXeiMHZYP12o0C3R28CsC5fHjhMgRdU0="; + hash = "sha256-zIz7aokOGLGXV/xJnYcz8lBP7b2rxLrfaD3i/DLpFR8="; }; build-system = [ setuptools ]; From 329ef07609153e270a379ffb667a06300ff04472 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 23 Aug 2025 12:44:16 +0200 Subject: [PATCH 60/60] pretix: 2025.7.0 -> 2025.7.1 https://pretix.eu/about/en/blog/20250823-release-2025-7-1/ --- pkgs/by-name/pr/pretix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 263e796e95f5..9a60066d9ccc 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -42,13 +42,13 @@ let }; pname = "pretix"; - version = "2025.7.0"; + version = "2025.7.1"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-fKAHakrgvtkQR/dpXWL0prsq90TvEdYaS6FLyaI8MrM="; + hash = "sha256-emPzCwViqbGqlQRYmyamhQ5y6a3g67TTYIdv6FWbGEU="; }; npmDeps = buildNpmPackage {