From 4c47be359015b5a4e2de097508fe37c65345574b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 12 Oct 2025 10:12:03 -0500 Subject: [PATCH 001/105] scss-lint: move to pkgs/by-name, update ffi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Relocated from pkgs/development/tools/scss-lint to pkgs/by-name/sc/scss-lint following the by-name directory convention. - Updated ffi from 1.17.1 → 1.17.2 with corresponding sha256 refresh. - Regenerated gemset.nix to include explicit groups/platforms for sass-listen. - Replaced old Gemfile.lock (with multiple platform entries) with a new normalized lockfile (bundler 2.7.1). - Removed top-level alias from all-packages.nix. This keeps scss-lint reproducible under current RubyGems and aligns it with the by-name package layout. --- .../tools => by-name/sc}/scss-lint/Gemfile | 0 pkgs/by-name/sc/scss-lint/Gemfile.lock | 23 ++++++++++ .../tools => by-name/sc}/scss-lint/gemset.nix | 6 ++- .../sc/scss-lint/package.nix} | 0 pkgs/development/tools/scss-lint/Gemfile.lock | 43 ------------------- pkgs/top-level/all-packages.nix | 2 - 6 files changed, 27 insertions(+), 47 deletions(-) rename pkgs/{development/tools => by-name/sc}/scss-lint/Gemfile (100%) create mode 100644 pkgs/by-name/sc/scss-lint/Gemfile.lock rename pkgs/{development/tools => by-name/sc}/scss-lint/gemset.nix (91%) rename pkgs/{development/tools/scss-lint/default.nix => by-name/sc/scss-lint/package.nix} (100%) delete mode 100644 pkgs/development/tools/scss-lint/Gemfile.lock diff --git a/pkgs/development/tools/scss-lint/Gemfile b/pkgs/by-name/sc/scss-lint/Gemfile similarity index 100% rename from pkgs/development/tools/scss-lint/Gemfile rename to pkgs/by-name/sc/scss-lint/Gemfile diff --git a/pkgs/by-name/sc/scss-lint/Gemfile.lock b/pkgs/by-name/sc/scss-lint/Gemfile.lock new file mode 100644 index 000000000000..8f6ebd379216 --- /dev/null +++ b/pkgs/by-name/sc/scss-lint/Gemfile.lock @@ -0,0 +1,23 @@ +GEM + remote: https://rubygems.org/ + specs: + ffi (1.17.2) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + scss_lint (0.60.0) + sass (~> 3.5, >= 3.5.5) + +PLATFORMS + ruby + +DEPENDENCIES + scss_lint + +BUNDLED WITH + 2.7.1 diff --git a/pkgs/development/tools/scss-lint/gemset.nix b/pkgs/by-name/sc/scss-lint/gemset.nix similarity index 91% rename from pkgs/development/tools/scss-lint/gemset.nix rename to pkgs/by-name/sc/scss-lint/gemset.nix index cc20d03b442d..7300ead8b4b2 100644 --- a/pkgs/development/tools/scss-lint/gemset.nix +++ b/pkgs/by-name/sc/scss-lint/gemset.nix @@ -4,10 +4,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6"; + sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; type = "gem"; }; - version = "1.17.1"; + version = "1.17.2"; }; rb-fsevent = { groups = [ "default" ]; @@ -46,6 +46,8 @@ "rb-fsevent" "rb-inotify" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; diff --git a/pkgs/development/tools/scss-lint/default.nix b/pkgs/by-name/sc/scss-lint/package.nix similarity index 100% rename from pkgs/development/tools/scss-lint/default.nix rename to pkgs/by-name/sc/scss-lint/package.nix diff --git a/pkgs/development/tools/scss-lint/Gemfile.lock b/pkgs/development/tools/scss-lint/Gemfile.lock deleted file mode 100644 index 8b0672a440da..000000000000 --- a/pkgs/development/tools/scss-lint/Gemfile.lock +++ /dev/null @@ -1,43 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - ffi (1.17.1) - ffi (1.17.1-aarch64-linux-gnu) - ffi (1.17.1-aarch64-linux-musl) - ffi (1.17.1-arm-linux-gnu) - ffi (1.17.1-arm-linux-musl) - ffi (1.17.1-arm64-darwin) - ffi (1.17.1-x86-linux-gnu) - ffi (1.17.1-x86-linux-musl) - ffi (1.17.1-x86_64-darwin) - ffi (1.17.1-x86_64-linux-gnu) - ffi (1.17.1-x86_64-linux-musl) - rb-fsevent (0.11.2) - rb-inotify (0.11.1) - ffi (~> 1.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - scss_lint (0.60.0) - sass (~> 3.5, >= 3.5.5) - -PLATFORMS - aarch64-linux-gnu - aarch64-linux-musl - arm-linux-gnu - arm-linux-musl - arm64-darwin - ruby - x86-linux-gnu - x86-linux-musl - x86_64-darwin - x86_64-linux-gnu - x86_64-linux-musl - -DEPENDENCIES - scss_lint - -BUNDLED WITH - 2.6.2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea57e436c6df..d0113c0adf5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6870,8 +6870,6 @@ with pkgs; sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; simpleBuildTool = sbt; - scss-lint = callPackage ../development/tools/scss-lint { }; - shake = # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 ( From 698994055936f36e0da1ec73714fd51e2d5e41dd Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 29 Oct 2025 21:19:35 +0100 Subject: [PATCH 002/105] perlPackages.IOCompressBrotli: init at 0.019 https://github.com/timlegge/perl-IO-Compress-Brotli --- .../perl-modules/IOCompressBrotli/default.nix | 53 +++++++++++++++++++ .../IOCompressBrotli/use-system-brotli.patch | 40 ++++++++++++++ pkgs/top-level/perl-packages.nix | 2 + 3 files changed, 95 insertions(+) create mode 100644 pkgs/development/perl-modules/IOCompressBrotli/default.nix create mode 100644 pkgs/development/perl-modules/IOCompressBrotli/use-system-brotli.patch diff --git a/pkgs/development/perl-modules/IOCompressBrotli/default.nix b/pkgs/development/perl-modules/IOCompressBrotli/default.nix new file mode 100644 index 000000000000..28d15d81e9d1 --- /dev/null +++ b/pkgs/development/perl-modules/IOCompressBrotli/default.nix @@ -0,0 +1,53 @@ +{ + lib, + brotli, + buildPerlPackage, + fetchurl, + perlPackages, + pkg-config, +}: + +buildPerlPackage { + pname = "IO-Compress-Brotli"; + version = "0.019"; + + src = fetchurl { + url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/IO-Compress-Brotli-0.019.tar.gz"; + hash = "sha256-N/QN187kSs6iby92Onc+YdTsIjMF3e7KRhJEPL8oj78="; + }; + + patches = [ + # Use system brotli in Makefile.PL + ./use-system-brotli.patch + ]; + + postPatch = '' + substituteInPlace Makefile.PL \ + --replace-fail "@LIBS@" "-L${lib.getLib brotli}/lib -lbrotlienc -lbrotlidec -lbrotlicommon" + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + brotli + perlPackages.FileSlurper + ]; + + propagatedBuildInputs = with perlPackages; [ + FileSlurper + GetoptLong + ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev brotli}/include"; + + meta = { + description = "Write Brotli buffers/streams"; + homepage = "https://github.com/timlegge/perl-IO-Compress-Brotli"; + changelog = "https://github.com/timlegge/perl-IO-Compress-Brotli/blob/main/Changes"; + license = with lib.licenses; [ + artistic1 + gpl1Plus + ]; + maintainers = [ lib.maintainers.anthonyroussel ]; + }; +} diff --git a/pkgs/development/perl-modules/IOCompressBrotli/use-system-brotli.patch b/pkgs/development/perl-modules/IOCompressBrotli/use-system-brotli.patch new file mode 100644 index 000000000000..fd26111e1615 --- /dev/null +++ b/pkgs/development/perl-modules/IOCompressBrotli/use-system-brotli.patch @@ -0,0 +1,40 @@ +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -1,6 +1,5 @@ + use 5.014000; + use ExtUtils::MakeMaker; +-use Alien::cmake3; + use File::Spec::Functions qw/catfile/; + + WriteMakefile( +@@ -17,16 +16,7 @@ + 'Getopt::Long' => '0', + 'Time::HiRes' => '0', + }, +- CONFIGURE_REQUIRES => { +- 'Alien::cmake3' => '0', +- }, +- BUILD_REQUIRES => { +- 'Alien::cmake3' => '0', +- }, +- INC => '-Ibrotli/c/include', +- MYEXTLIB => $myextlib, +- EXTRALIBS => ' brotli/libbrotlienc$(LIB_EXT) brotli/libbrotlidec$(LIB_EXT) brotli/libbrotlicommon$(LIB_EXT) ', +- clean => { FILES => "brotli/Makefile $myextlib brotli/CMakeCache.txt brotli/CMakeFiles/* brotli/CTestTestfile.cmake brotli/DartConfiguration.tcl brotli/brotli* brotli/cmake_install.cmake brotli/libbrotlicommon.pc brotli/libbrotlidec.pc brotli/libbrotlienc.pc" }, ++ LIBS => "@LIBS@", + META_ADD => { + dynamic_config => 0, + resources => { +@@ -33,12 +24,3 @@ + }, + } + ); +- +-sub MY::postamble { +- my @dirs = Alien::cmake3->bin_dir; +- my $cmake = defined $dirs[0] ? catfile($dirs[0] , Alien::cmake3->exe) : Alien::cmake3->exe; +-' +-$(MYEXTLIB): brotli/CMakeLists.txt +- cd brotli && "' . $cmake . '"' . $cmake_options . ' -DCMAKE_MAKE_PROGRAM=$(MAKE) -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./installed . && $(MAKE) +-' +-} diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4c712e9d854e..c80d092e4ec0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17446,6 +17446,8 @@ with self; }; }; + IOCompressBrotli = callPackage ../development/perl-modules/IOCompressBrotli { }; + IODigest = buildPerlPackage { pname = "IO-Digest"; version = "0.11"; From ab0038400600281cd996d7fdbdfd3a9765124855 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 29 Oct 2025 20:11:23 +0100 Subject: [PATCH 003/105] exiftool: add missing dependencies --- .../perl-modules/ImageExifTool/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix index b264606cd05a..caca8be2c14f 100644 --- a/pkgs/development/perl-modules/ImageExifTool/default.nix +++ b/pkgs/development/perl-modules/ImageExifTool/default.nix @@ -6,6 +6,10 @@ shortenPerlShebang, stdenv, versionCheckHook, + ArchiveZip, + CompressRawLzma, + IOCompress, + IOCompressBrotli, }: buildPerlPackage rec { @@ -19,12 +23,19 @@ buildPerlPackage rec { hash = "sha256-GPm3HOt7fNMbXRrV5V+ykJAfhww1O6NrD0l/7hA2i28="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postPatch = '' patchShebangs exiftool ''; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + + propagatedBuildInputs = [ + ArchiveZip + CompressRawLzma + IOCompress + IOCompressBrotli + ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/exiftool ''; From 30ae7b80cdb40c0796d2592790c2eb6e7f40a650 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 3 Nov 2025 20:40:55 +0100 Subject: [PATCH 004/105] theft: disable failing test Fixes https://hydra.nixos.org/build/310752654 Signed-off-by: Marcin Serwin --- pkgs/by-name/th/theft/disable-failing-test.patch | 14 ++++++++++++++ pkgs/by-name/th/theft/package.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/by-name/th/theft/disable-failing-test.patch diff --git a/pkgs/by-name/th/theft/disable-failing-test.patch b/pkgs/by-name/th/theft/disable-failing-test.patch new file mode 100644 index 000000000000..088c83eecd6d --- /dev/null +++ b/pkgs/by-name/th/theft/disable-failing-test.patch @@ -0,0 +1,14 @@ +diff --git a/test/test_theft_integration.c b/test/test_theft_integration.c +index ecbad97..92c3cbe 100644 +--- a/test/test_theft_integration.c ++++ b/test/test_theft_integration.c +@@ -1618,7 +1618,8 @@ SUITE(integration) { + RUN_TEST(forking_hook); + RUN_TEST(forking_privilege_drop_cpu_limit__slow); + +- RUN_TEST(repeat_with_verbose_set_after_shrinking); ++ // fails on aarch64-linux ++ // RUN_TEST(repeat_with_verbose_set_after_shrinking); + + // Regressions + RUN_TEST(expected_seed_should_be_used_first); diff --git a/pkgs/by-name/th/theft/package.nix b/pkgs/by-name/th/theft/package.nix index 37ffd27e8391..f5dc0b03932b 100644 --- a/pkgs/by-name/th/theft/package.nix +++ b/pkgs/by-name/th/theft/package.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd"; }; + patches = [ ./disable-failing-test.patch ]; + postPatch = '' substituteInPlace Makefile \ --replace "ar -rcs" "${stdenv.cc.targetPrefix}ar -rcs" From 849bca5cab5f550470546f242ff2c3c9df4e6d38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 16:31:16 +0000 Subject: [PATCH 005/105] ergogen: 4.1.0 -> 4.2.1 --- pkgs/by-name/er/ergogen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/er/ergogen/package.nix b/pkgs/by-name/er/ergogen/package.nix index 9bac4ed8380d..2dfc6400de20 100644 --- a/pkgs/by-name/er/ergogen/package.nix +++ b/pkgs/by-name/er/ergogen/package.nix @@ -8,7 +8,7 @@ buildNpmPackage (finalAttrs: { pname = "ergogen"; - version = "4.1.0"; + version = "4.2.1"; forceGitDeps = true; @@ -16,10 +16,10 @@ buildNpmPackage (finalAttrs: { owner = "ergogen"; repo = "ergogen"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y4Ri5nLxbQ78LvyGARPxsvoZ9gSMxY14QuxZJg6Cu3Y="; + hash = "sha256-pddohqq08w/PpU3ZF3tCGSjUMLKnhCn/Db6WLKytjo0="; }; - npmDepsHash = "sha256-BQbf/2lWLYnrSjwWjDo6QceFyR+J/vhDcVgCaytGfl0="; + npmDepsHash = "sha256-gSF4L4QiScW3ZaAm8QFCBGhbw7NhFe4gHWitN/OuQi4="; makeCacheWritable = true; dontNpmBuild = true; From f57ac16cfff7812a3627483e218eed1ad53cb125 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 9 Nov 2025 11:08:52 +0100 Subject: [PATCH 006/105] vgmtools: 0.1-unstable-2025-10-22 -> 0.1-unstable-2025-11-04 --- pkgs/by-name/vg/vgmtools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vg/vgmtools/package.nix b/pkgs/by-name/vg/vgmtools/package.nix index ce0e16aadba4..7ecc6f8d8ec5 100644 --- a/pkgs/by-name/vg/vgmtools/package.nix +++ b/pkgs/by-name/vg/vgmtools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "vgmtools"; - version = "0.1-unstable-2025-10-22"; + version = "0.1-unstable-2025-11-04"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "606db7fa229389b80bccb4c6e28b3d71dfddc984"; - hash = "sha256-kOkBIN1/FG6snpriLiu8ZMqGa2MXOC79zUZwGrMyk/A="; + rev = "d5d1ba5bbe9f5bc78ea0202490a3432465d5f154"; + hash = "sha256-91smzkVY+SC5zBp0v7VkIkMCZX0vs6ivPnKTyw3ZkW4="; }; nativeBuildInputs = [ From 4898b600d0ee8987a24b6b089676bf2d5b7c3272 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 9 Nov 2025 11:21:00 +0100 Subject: [PATCH 007/105] vgmtools: Drop meta-wide "with lib" --- pkgs/by-name/vg/vgmtools/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/vg/vgmtools/package.nix b/pkgs/by-name/vg/vgmtools/package.nix index 7ecc6f8d8ec5..46915310b234 100644 --- a/pkgs/by-name/vg/vgmtools/package.nix +++ b/pkgs/by-name/vg/vgmtools/package.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation { url = "https://github.com/vgmrips/vgmtools.git"; }; - meta = with lib; { + meta = { homepage = "https://github.com/vgmrips/vgmtools"; description = "Collection of tools for the VGM file format"; - license = licenses.gpl2Only; # Not clarified whether Only or Plus - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; + license = lib.licenses.gpl2Only; # Not clarified whether Only or Plus + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.all; }; } From 165e024bfeb1b35f1b5f0d967b301880c1c6adae Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 23 Oct 2025 21:27:41 -0300 Subject: [PATCH 008/105] redshift-plasma-applet: fix build with cmake4 --- pkgs/applications/misc/redshift-plasma-applet/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix index 8a198a702eaa..8568d2acd312 100644 --- a/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation { substituteInPlace package/contents/ui/config/ConfigAdvanced.qml \ --replace "'redshift -V'" \ "'${redshift}/bin/redshift -V'" + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" ''; nativeBuildInputs = [ From ab9433eac5c367e30e4e92c78f494ed74ed6dd1f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 9 Nov 2025 15:17:17 -0300 Subject: [PATCH 009/105] redshift-plasma-applet: drop --- .../misc/redshift-plasma-applet/default.nix | 76 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 78 deletions(-) delete mode 100644 pkgs/applications/misc/redshift-plasma-applet/default.nix diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix deleted file mode 100644 index 8568d2acd312..000000000000 --- a/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - stdenv, - cmake, - extra-cmake-modules, - plasma-framework, - kwindowsystem, - redshift, - fetchFromGitHub, - fetchpatch, -}: - -let - version = "1.0.18"; -in - -stdenv.mkDerivation { - pname = "redshift-plasma-applet"; - inherit version; - - src = fetchFromGitHub { - owner = "kotelnik"; - repo = "plasma-applet-redshift-control"; - rev = "v${version}"; - sha256 = "122nnbafa596rxdxlfshxk45lzch8c9342bzj7kzrsjkjg0xr9pq"; - }; - - patches = [ - # This patch fetches from out-of-source repo because the GitHub copy is frozen, - # the active fork is now on invent.kde.org. Remove this patch when a new version is released and src is updated - # Redshift version >= 1.12 requires the -P option to clear the existing effects before applying shading. - # Without it scrolling makes the screen gets darker and darker until it is impossible to see anything. - (fetchpatch { - url = "https://invent.kde.org/plasma/plasma-redshift-control/-/commit/898c3a4cfc6c317915f1e664078d8606497c4049.patch"; - sha256 = "0b6pa3fcj698mgqnc85jbbmcl3qpf418mh06qgsd3c4v237my0nv"; - }) - ]; - - patchPhase = '' - substituteInPlace package/contents/ui/main.qml \ - --replace "redshiftCommand: 'redshift'" \ - "redshiftCommand: '${redshift}/bin/redshift'" \ - --replace "redshiftOneTimeCommand: 'redshift -O " \ - "redshiftOneTimeCommand: '${redshift}/bin/redshift -O " - - substituteInPlace package/contents/ui/config/ConfigAdvanced.qml \ - --replace "'redshift -V'" \ - "'${redshift}/bin/redshift -V'" - - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - plasma-framework - kwindowsystem - ]; - - dontWrapQtApps = true; - - meta = with lib; { - description = "KDE Plasma 5 widget for controlling Redshift"; - homepage = "https://github.com/kotelnik/plasma-applet-redshift-control"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ - benley - zraexy - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f8650a3795bd..1618e5909b7a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1330,6 +1330,7 @@ mapAliases { redoc-cli = throw "'redoc-cli' been removed because it has been marked as broken since at least November 2024. Consider using 'redocly' instead."; # Added 2025-10-01 redocly-cli = throw "'redocly-cli' has been renamed to/replaced by 'redocly'"; # Converted to throw 2025-10-27 redpanda = throw "'redpanda' has been renamed to/replaced by 'redpanda-client'"; # Converted to throw 2025-10-27 + redshift-plasma-applet = throw "'redshift-plasma-applet' has been removed as it is obsolete and lack maintenance upstream."; # Added 2025-11-09 remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11 responsively-app = throw "'responsively-app' has been removed due to lack of maintainance upstream."; # Added 2025-06-25 retroarchBare = throw "'retroarchBare' has been renamed to/replaced by 'retroarch-bare'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a89aeaffa4e..33bbaa8f0acd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13405,8 +13405,6 @@ with pkgs; gammastep ; - redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; - ### SCIENCE/CHEMISTY avogadrolibs = libsForQt5.callPackage ../development/libraries/science/chemistry/avogadrolibs { }; From 8d53797b89b4e46eedc19eb9a993b9f127c6f096 Mon Sep 17 00:00:00 2001 From: Rasheeq Azad Date: Sun, 9 Nov 2025 14:18:22 -0500 Subject: [PATCH 010/105] makemkv: use fixpoint argument of mkDerivation This makes bumping the version with overrideAttrs easier. Also fix improper quoting in scripts. --- pkgs/by-name/ma/makemkv/package.nix | 227 ++++++++++++++-------------- 1 file changed, 110 insertions(+), 117 deletions(-) diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix index 5c18ed3bf0c9..4ba7eb44b9b5 100644 --- a/pkgs/by-name/ma/makemkv/package.nix +++ b/pkgs/by-name/ma/makemkv/package.nix @@ -16,124 +16,117 @@ withJava ? true, jre_headless, }: - -let - version = "1.18.2"; - # Using two URLs as the first one will break as soon as a new version is released - src_bin = fetchurl { - urls = [ - "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" - "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" - ]; - hash = "sha256-v8THzrwPAEl2cf/Vbmo08HcKnmr37/LwEn76FD8oY24="; - }; - src_oss = fetchurl { - urls = [ - "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" - "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" - ]; - hash = "sha256-uUl/VVXCV/XTx/GLarA8dM/z6kQ36ANJ1hjRFb9fpEU="; - }; -in -stdenv.mkDerivation { - pname = "makemkv"; - inherit version; - - srcs = [ - src_bin - src_oss - ]; - - sourceRoot = "makemkv-oss-${version}"; - - patches = [ ./r13y.patch ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - autoPatchelfHook - pkg-config - qt5.wrapQtAppsHook - ]; - - buildInputs = [ - ffmpeg - openssl - qt5.qtbase - zlib - ]; - - runtimeDependencies = [ (lib.getLib curl) ]; - - qtWrapperArgs = - let - binPath = lib.makeBinPath [ jre_headless ]; - in - lib.optionals withJava [ "--prefix PATH : ${binPath}" ]; - - installPhase = '' - runHook preInstall - - install -Dm555 -t $out/bin out/makemkv out/mmccextr out/mmgplsrv ../makemkv-bin-${version}/bin/amd64/makemkvcon - install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* - install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* - install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop - install -Dm444 -t $out/share/icons/hicolor/16x16/apps ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/* - install -Dm444 -t $out/share/icons/hicolor/32x32/apps ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/* - install -Dm444 -t $out/share/icons/hicolor/64x64/apps ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/* - install -Dm444 -t $out/share/icons/hicolor/128x128/apps ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/* - install -Dm444 -t $out/share/icons/hicolor/256x256/apps ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/* - - runHook postInstall - ''; - - passthru = { - srcs = { - inherit src_bin src_oss; - }; - updateScript = lib.getExe (writeShellApplication { - name = "update-makemkv"; - runtimeInputs = [ - common-updater-scripts - curl - rubyPackages.nokogiri +stdenv.mkDerivation ( + finalAttrs: + let + inherit (finalAttrs) version; + # Using two URLs as the first one will break as soon as a new version is released + srcs.bin = fetchurl { + urls = [ + "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" + "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - text = '' - get_version() { - # shellcheck disable=SC2016 - curl --fail --silent 'https://forum.makemkv.com/forum/viewtopic.php?f=3&t=224' \ - | nokogiri -e 'puts $_.css("head title").first.text.match(/\bMakeMKV (\d+\.\d+\.\d+) /)[1]' - } - oldVersion=${lib.escapeShellArg version} - newVersion=$(get_version) - if [[ $oldVersion == "$newVersion" ]]; then - echo "$0: New version same as old version, nothing to do." >&2 - exit - fi - update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_bin - update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_oss --ignore-same-version - ''; - }); - }; + hash = "sha256-v8THzrwPAEl2cf/Vbmo08HcKnmr37/LwEn76FD8oY24="; + }; + srcs.oss = fetchurl { + urls = [ + "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" + "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" + ]; + hash = "sha256-uUl/VVXCV/XTx/GLarA8dM/z6kQ36ANJ1hjRFb9fpEU="; + }; + in + { + pname = "makemkv"; + version = "1.18.2"; - meta = with lib; { - description = "Convert blu-ray and dvd to mkv"; - longDescription = '' - makemkv is a one-click QT application that transcodes an encrypted - blu-ray or DVD disc into a more portable set of mkv files, preserving - subtitles, chapter marks, all video and audio tracks. + srcs = lib.attrValues finalAttrs.passthru.srcs; + sourceRoot = "makemkv-oss-${version}"; + patches = [ ./r13y.patch ]; - Program is time-limited -- it will stop functioning after 60 days. You - can always download the latest version from makemkv.com that will reset the - expiration date. - ''; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = [ - licenses.unfree - licenses.lgpl21 + enableParallelBuilding = true; + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + qt5.wrapQtAppsHook ]; - homepage = "https://makemkv.com"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jchw ]; - }; -} + buildInputs = [ + ffmpeg + openssl + qt5.qtbase + zlib + ]; + runtimeDependencies = [ (lib.getLib curl) ]; + + qtWrapperArgs = + let + binPath = lib.makeBinPath [ jre_headless ]; + in + lib.optionals withJava [ "--prefix PATH : ${binPath}" ]; + + installPhase = '' + runHook preInstall + + install -Dm555 -t "$out"/bin out/{makemkv,mmccextr,mmgplsrv} \ + ../makemkv-bin-"$version"/bin/amd64/makemkvcon + install -D -t "$out"/lib out/lib{driveio,makemkv,mmbd}.so.* + install -D -t "$out"/share/MakeMKV ../makemkv-bin-"$version"/src/share/* + install -Dm444 -t "$out"/share/applications ../makemkv-oss-"$version"/makemkvgui/share/makemkv.desktop + install -Dm444 -t "$out"/share/icons/hicolor/16x16/apps ../makemkv-oss-"$version"/makemkvgui/share/icons/16x16/* + install -Dm444 -t "$out"/share/icons/hicolor/32x32/apps ../makemkv-oss-"$version"/makemkvgui/share/icons/32x32/* + install -Dm444 -t "$out"/share/icons/hicolor/64x64/apps ../makemkv-oss-"$version"/makemkvgui/share/icons/64x64/* + install -Dm444 -t "$out"/share/icons/hicolor/128x128/apps ../makemkv-oss-"$version"/makemkvgui/share/icons/128x128/* + install -Dm444 -t "$out"/share/icons/hicolor/256x256/apps ../makemkv-oss-"$version"/makemkvgui/share/icons/256x256/* + + runHook postInstall + ''; + + passthru = { + inherit srcs; + updateScript = lib.getExe (writeShellApplication { + name = "update-makemkv"; + runtimeInputs = [ + common-updater-scripts + curl + rubyPackages.nokogiri + ]; + runtimeEnv.oldVersion = version; + text = '' + get_version() { + # shellcheck disable=SC2016 + curl --fail --silent 'https://forum.makemkv.com/forum/viewtopic.php?f=3&t=224' \ + | nokogiri -e 'puts $_.css("head title").first.text.match(/\bMakeMKV (\d+\.\d+\.\d+) /)[1]' + } + newVersion=$(get_version) + if [ "$oldVersion" == "$newVersion" ]; then + echo "$0: New version same as old version, nothing to do." >&2 + exit + fi + update-source-version makemkv "$newVersion" --source-key=passthru.srcs.bin + update-source-version makemkv "$newVersion" --source-key=passthru.srcs.oss --ignore-same-version + ''; + }); + }; + + meta = with lib; { + description = "Convert blu-ray and dvd to mkv"; + longDescription = '' + makemkv is a one-click QT application that transcodes an encrypted + blu-ray or DVD disc into a more portable set of mkv files, preserving + subtitles, chapter marks, all video and audio tracks. + + Program is time-limited -- it will stop functioning after 60 days. You + can always download the latest version from makemkv.com that will reset the + expiration date. + ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = [ + licenses.unfree + licenses.lgpl21 + ]; + homepage = "https://makemkv.com"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ jchw ]; + }; + } +) From 36d969b21776a4ab0afbb32687a028952fc689e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 10 Nov 2025 01:13:05 +0100 Subject: [PATCH 011/105] nixos/tests/vaultwarden: fix test --- nixos/tests/vaultwarden.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix index 63ad504cf3fa..0c56a47ef41d 100644 --- a/nixos/tests/vaultwarden.nix +++ b/nixos/tests/vaultwarden.nix @@ -210,9 +210,6 @@ let output = json.loads(client.succeed(f"bw --nointeraction --raw --session {key} list items")) assert output[0]['login']['password'] == "${storedPassword}" - - with subtest("Check systemd unit hardening"): - server.log(server.succeed("systemd-analyze security vaultwarden.service | grep -v ✓")) ''; } ); @@ -239,7 +236,6 @@ builtins.mapAttrs (k: v: makeVaultwardenTest k v) { with subtest("Check that backup exists"): server.succeed('[ -d "/srv/backups/vaultwarden" ]') server.succeed('[ -f "/srv/backups/vaultwarden/db.sqlite3" ]') - server.succeed('[ -d "/srv/backups/vaultwarden/attachments" ]') server.succeed('[ -f "/srv/backups/vaultwarden/rsa_key.pem" ]') # Ensure only the db backed up with the backup command exists and not the other db files. server.succeed('[ ! -f "/srv/backups/vaultwarden/db.sqlite3-shm" ]') From 9bf7c99f168d7a641a54de7998397a0869a996db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 08:09:33 +0000 Subject: [PATCH 012/105] prometheus-postfix-exporter: 0.15.0 -> 0.17.0 --- pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 172c6a19f96e..1a24ae62e8cd 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "postfix_exporter"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "Hsn723"; repo = "postfix_exporter"; tag = "v${version}"; - sha256 = "sha256-0HgvkKdgfKcX74dJLOxSnp1xJuaOazusgDrCdhX/Lg4="; + sha256 = "sha256-PIZBzDZJkjttxy2pYUAs9G9C/byCNpnhWYuqWJlGgfM="; }; - vendorHash = "sha256-HsXVZ6fmaGU93CpA+t/VpIsEigkh09Uw8h7eSeaThk4="; + vendorHash = "sha256-FY2bynGrgxBsSlQQ6bnr/NYHt9pmzF/6ST/Ea3cDfF8="; ldflags = [ "-s" From 82fa5eeac89d778e11738aeb84745dc20ab259cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 01:33:00 +0000 Subject: [PATCH 013/105] librespot: 0.7.1 -> 0.8.0 --- pkgs/applications/audio/librespot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 8aa6c7eba17f..39f44d6c585c 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -23,16 +23,16 @@ rustPlatform.buildRustPackage rec { pname = "librespot"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "librespot-org"; repo = "librespot"; rev = "v${version}"; - hash = "sha256-gBMzvQxmy+GYzrOKWmbhl56j49BK8W8NYO2RrvS4mWI="; + hash = "sha256-twWndV6z5Cdivz7pfAJzdlIjddEiZPEFnTzipMczmJo="; }; - cargoHash = "sha256-PiGIxMIA/RL+YkpG1f46zyAO5anx9Ii+anKrANCM+rk="; + cargoHash = "sha256-Kf3w6tD/MQaXXegtiCkFbUcYwr4OMw6ipLxNLxJ2NTQ="; nativeBuildInputs = [ pkg-config From 0729c944866a9e95ec78aeef68a5e4641a4e1a26 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 11 Nov 2025 23:38:26 +0100 Subject: [PATCH 014/105] nodejs_24: 24.11.0 -> 24.11.1 --- pkgs/development/web/nodejs/v24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index add4d163d32f..2385a2d79967 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -25,8 +25,8 @@ let in buildNodejs { inherit enableNpm; - version = "24.11.0"; - sha256 = "cf9c906d46446471f955b1f2c6ace8a461501d82d27e1ae8595dcb3b0e2c312a"; + version = "24.11.1"; + sha256 = "ea4da35f1c9ca376ec6837e1e30cee30d491847fe152a3f0378dc1156d954bbd"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then From a5a18f9cd9ca045fffbb6c2e175474fc76b9bb30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Nov 2025 00:19:52 +0000 Subject: [PATCH 015/105] python3Packages.biosppy: 2.2.3 -> 2.2.4 --- pkgs/development/python-modules/biosppy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/biosppy/default.nix b/pkgs/development/python-modules/biosppy/default.nix index afb93e5f30df..72169a353383 100644 --- a/pkgs/development/python-modules/biosppy/default.nix +++ b/pkgs/development/python-modules/biosppy/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "biosppy"; - version = "2.2.3"; + version = "2.2.4"; pyproject = true; src = fetchFromGitHub { owner = "scientisst"; repo = "BioSPPy"; tag = "v${version}"; - hash = "sha256-R+3K8r+nzrCiZegxur/rf3/gDGhN9bVNMhlK94SHer0="; + hash = "sha256-ED25/4WmLbXfEfa4KuUJMN+Fc9hd/AdUqgw8mwQes8Y="; }; build-system = [ setuptools ]; From ccc5633ebed907e37601ade116563ad6a69e3f81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Nov 2025 13:43:17 +0100 Subject: [PATCH 016/105] libresplit: 0-unstable-2025-10-15 -> 0-unstable-2025-11-11 --- pkgs/by-name/li/libresplit/package.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/li/libresplit/package.nix b/pkgs/by-name/li/libresplit/package.nix index 5edd5ba5ac07..1aaf0ed208c8 100644 --- a/pkgs/by-name/li/libresplit/package.nix +++ b/pkgs/by-name/li/libresplit/package.nix @@ -1,31 +1,33 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, gtk3, jansson, luajit, + meson, + ninja, pkg-config, unstableGitUpdater, wrapGAppsHook3, - xxd, }: -stdenv.mkDerivation { +gcc15Stdenv.mkDerivation { pname = "libresplit"; - version = "0-unstable-2025-10-15"; + version = "0-unstable-2025-11-11"; src = fetchFromGitHub { - owner = "wins1ey"; + owner = "LibreSplit"; repo = "LibreSplit"; - rev = "7628922ba2c6b6a9e6d6d144b55d20479d7ceeb3"; - hash = "sha256-3UXDHmcW6lxXGno5ijG6OlQ58F1z/J2O8S1y2O+7+p4="; + rev = "1a149e2d6d02c456e787bffc07b3c7ca67d7bd44"; + hash = "sha256-EEYocgSKgQsGxJfyRYsfTGFmR8+TWPOLfOKjv6uXKuU="; }; nativeBuildInputs = [ + meson + ninja pkg-config wrapGAppsHook3 - xxd ]; buildInputs = [ @@ -34,12 +36,10 @@ stdenv.mkDerivation { luajit ]; - makeFlags = [ "PREFIX=$(out)" ]; - passthru.updateScript = unstableGitUpdater { }; meta = { - homepage = "https://github.com/wins1ey/LibreSplit"; + homepage = "https://github.com/LibreSplitDev/LibreSplit"; description = "Speedrun timer with auto splitting and load removal for Linux"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fgaz ]; From 8416627cf96e27a002ed9bee31cd6dab394f1b00 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 13 Nov 2025 09:06:32 +0800 Subject: [PATCH 017/105] bustle: 0.12.0 -> 0.13.0 --- pkgs/by-name/bu/bustle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/bustle/package.nix b/pkgs/by-name/bu/bustle/package.nix index 1c186a1aca13..ebdf1210d462 100644 --- a/pkgs/by-name/bu/bustle/package.nix +++ b/pkgs/by-name/bu/bustle/package.nix @@ -19,19 +19,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "bustle"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "bustle"; tag = finalAttrs.version; - hash = "sha256-gzPFODVLvv+Ore1XR+XTi2fjVh3OJOZF0k9vilVnst4="; + hash = "sha256-+Pl4ze1nrC27NIfJ4FNc3iqYWBtCBpHp2zZNAxAPbJk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-DYkicVDjQRIMfKl0f9aLWIyQfR153I43EpSuskenmoA="; + hash = "sha256-el1zVFE8hsmIisHO+btvnA0WVN9bN8iuVPaSF02ovCI="; }; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { From 08b01b4771281dd90917d552adb429457f0191f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Nov 2025 19:22:40 -0800 Subject: [PATCH 018/105] python3Packages.aiomodernforms: replace async-timeout with asyncio.timeout --- .../python-modules/aiomodernforms/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix index 103c2e9fad03..1654ae5a92f3 100644 --- a/pkgs/development/python-modules/aiomodernforms/default.nix +++ b/pkgs/development/python-modules/aiomodernforms/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, + setuptools, aiohttp, backoff, yarl, @@ -13,7 +15,7 @@ buildPythonPackage rec { pname = "aiomodernforms"; version = "0.1.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "wonderslug"; @@ -22,13 +24,18 @@ buildPythonPackage rec { hash = "sha256-Vx51WBjjNPIfLlwMnAuwHnGNljhnjKkU0tWB9M9rjsw="; }; - postPatch = '' - substituteInPlace aiomodernforms/modernforms.py --replace-fail \ - "with async_timeout.timeout(self._request_timeout):" \ - "async with async_timeout.timeout(self._request_timeout):" - ''; + patches = [ + # https://github.com/wonderslug/aiomodernforms/pull/274 + (fetchpatch { + name = "replace-async-timeout-with-asyncio.timeout.patch"; + url = "https://github.com/wonderslug/aiomodernforms/commit/61f1330b2fc244565fd97ae392b9778faa1bab09.patch"; + hash = "sha256-7sy5/HgPYgVpULgeEu3tFBa2iXIskAqcarf0RndxTpE="; + }) + ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp backoff yarl From 72a5d2a212630792b673891ad29af4a8d45850e6 Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Sun, 7 Sep 2025 16:09:49 +0200 Subject: [PATCH 019/105] wireguard-go: 0.0.20230223 -> 0.0.20250522 --- pkgs/by-name/wi/wireguard-go/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index b77c1ea2f827..d686cab9925b 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -9,16 +9,16 @@ buildGoModule ( finalAttrs: let - rev = "12269c2761734b15625017d8565745096325392f"; + rev = "f333402bd9cbe0f3eeb02507bd14e23d7d639280"; shortVer = "${finalAttrs.version} (${lib.substring 0 7 rev})"; in { pname = "wireguard-go"; - version = "0-unstable-2023-12-11"; + version = "0.0.20250522"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${rev}.tar.xz"; - hash = "sha256-br7/dwr/e4HvBGJXh+6lWqxBUezt5iZNy9BFqEA1bLk="; + hash = "sha256-GRr8NKKb4SHd0WxmNL84eiofFHcauDDmSyNNrXermcA="; }; postPatch = '' @@ -29,7 +29,7 @@ buildGoModule ( printf 'package main\n\nconst Version = "${shortVer}"' > version.go ''; - vendorHash = "sha256-RqZ/3+Xus5N1raiUTUpiKVBs/lrJQcSwr1dJib2ytwc="; + vendorHash = "sha256-sCajxTV26jjlmgmbV4GG6hg9NkLGS773ZbFyKucvuBE="; subPackages = [ "." ]; From 0b6811869fec275f59639e0f0351e009fde2b295 Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Sun, 7 Sep 2025 16:21:29 +0200 Subject: [PATCH 020/105] wireguard-go: download by version number instead of commit hash --- pkgs/by-name/wi/wireguard-go/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index d686cab9925b..cd8c2d331e3f 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -9,15 +9,15 @@ buildGoModule ( finalAttrs: let - rev = "f333402bd9cbe0f3eeb02507bd14e23d7d639280"; - shortVer = "${finalAttrs.version} (${lib.substring 0 7 rev})"; + version = "0.0.20250522"; + shortVer = version; in { pname = "wireguard-go"; - version = "0.0.20250522"; + inherit version; src = fetchzip { - url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${rev}.tar.xz"; + url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; hash = "sha256-GRr8NKKb4SHd0WxmNL84eiofFHcauDDmSyNNrXermcA="; }; From e5af3da4df7b29b75633766596ef6369ed0fdfa7 Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Sun, 7 Sep 2025 16:24:07 +0200 Subject: [PATCH 021/105] wireguard-go: remove injections of custom shortVer Due to the previous changes, shortVer is no longer custom at all. It is just equal to the official version number, so the custom injections became essentially no-ops. --- pkgs/by-name/wi/wireguard-go/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index cd8c2d331e3f..6386c2966000 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -10,7 +10,6 @@ buildGoModule ( finalAttrs: let version = "0.0.20250522"; - shortVer = version; in { pname = "wireguard-go"; @@ -24,9 +23,6 @@ buildGoModule ( postPatch = '' # Skip formatting tests rm -f format_test.go - - # Inject version - printf 'package main\n\nconst Version = "${shortVer}"' > version.go ''; vendorHash = "sha256-sCajxTV26jjlmgmbV4GG6hg9NkLGS773ZbFyKucvuBE="; @@ -56,7 +52,7 @@ buildGoModule ( passthru.tests.version = testers.testVersion { package = wireguard-go; - version = "v${shortVer}"; + version = "v${version}"; }; meta = with lib; { From 9c8ea39b0f9f1bceb14748213620ad521f0e7968 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Nov 2025 04:51:04 +0000 Subject: [PATCH 022/105] gdscript-formatter: 0.14.0 -> 0.17.0 --- pkgs/by-name/gd/gdscript-formatter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix index b92bbdb93954..065d50c50d1e 100644 --- a/pkgs/by-name/gd/gdscript-formatter/package.nix +++ b/pkgs/by-name/gd/gdscript-formatter/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gdscript-formatter"; - version = "0.14.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "GDQuest"; repo = "GDScript-formatter"; tag = finalAttrs.version; - hash = "sha256-cY6Ow1f8o40M9/knneAod8ABj7ObQAkzs3yODMpkCxQ="; + hash = "sha256-pxJGn2MXJN+NIhDTbJBRDT+0nynuELYLk3kPzGb4Ia0="; # Needed due to .gitattributes being used for the Godot addon and export-ignoring all files deepClone = true; }; - cargoHash = "sha256-U3M1xuSybP9WVHNMYaY6QrBZ//cAGCIOIo2dY0jpJzc="; + cargoHash = "sha256-F0L6/9HU9zkFSFHGpgX8UDRTJm/yVKuv4GakgjFuG6Y="; cargoBuildFlags = [ "--bin=gdscript-formatter" From b6d7e4c59ab4ec96168d37bd6cea8c0a257da440 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Nov 2025 04:55:45 +0000 Subject: [PATCH 023/105] vscode-extensions.saoudrizwan.claude-dev: 3.36.1 -> 3.37.1 --- .../vscode/extensions/saoudrizwan.claude-dev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index bb2eba5d4764..18e74ecc1621 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.36.1"; - hash = "sha256-8pkX3KYwLr/jIHtWVmt+cx8CionKGjgSz6yFApSHR3g="; + version = "3.37.1"; + hash = "sha256-wS893/I6uc6aUy2chPYCTdG7PzLl5tqx8dhMDasmtYA="; }; meta = { From 613533d8c563493a0378049cbd654167a7190f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 13 Nov 2025 22:12:05 -0800 Subject: [PATCH 024/105] python3Packages.ring-doorbell: replace async-timeout with asyncio.timeout --- .../python-modules/ring-doorbell/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index c67eab7d78d6..67d8e7622519 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -5,6 +5,7 @@ aioresponses, asyncclick, buildPythonPackage, + fetchpatch, fetchPypi, firebase-messaging, freezegun, @@ -15,7 +16,6 @@ pytest-mock, pytest-socket, pytestCheckHook, - pythonOlder, pytz, typing-extensions, websockets, @@ -26,14 +26,25 @@ buildPythonPackage rec { version = "0.9.13"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { pname = "ring_doorbell"; inherit version; hash = "sha256-M8lHODHdWXLvrDbQMeEgGaQMYCXicHTQta+XjJxSQlM="; }; + patches = [ + # https://github.com/python-ring-doorbell/python-ring-doorbell/pull/494 + (fetchpatch { + name = "replace-async-timeout-with-asyncio.timeout.patch"; + url = "https://github.com/python-ring-doorbell/python-ring-doorbell/commit/771243153921ec2cfb5f103b08ed08cccbe2e760.patch"; + excludes = [ + ".github/workflows/ci.yml" + "uv.lock" + ]; + hash = "sha256-l6CUg3J6FZ0c0v0SSqvndjl4XeBhGFy/uWHPkExCM50="; + }) + ]; + pythonRelaxDeps = [ "requests-oauthlib" ]; build-system = [ hatchling ]; From 528fe610ef1df9e2646d58cd1fba9e6e666b5ebc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Nov 2025 08:07:07 +0000 Subject: [PATCH 025/105] python3Packages.lance-namespace-urllib3-client: 0.0.20 -> 0.0.21 --- .../python-modules/lance-namespace-urllib3-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix index 112793ef4722..15cc3192db98 100644 --- a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix +++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "lance-namespace"; - version = "0.0.20"; + version = "0.0.21"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance-namespace"; tag = "v${version}"; - hash = "sha256-dacYNbWXlV6+/klb9/rgbG/2YJ5BAw5xeSZbPvDgRb4="; + hash = "sha256-KbQ1xXD/+8oOcbhc+dvk68ZF0daWm7In0y0NVsSfp9U="; }; sourceRoot = "${src.name}/python/lance_namespace_urllib3_client"; From 2f82dc799fffda16ed284deaee2653212335bdcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Nov 2025 08:49:56 +0000 Subject: [PATCH 026/105] python3Packages.lance-namespace: 0.0.20 -> 0.0.21 --- pkgs/development/python-modules/lance-namespace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix index f19307f524a3..12198c334963 100644 --- a/pkgs/development/python-modules/lance-namespace/default.nix +++ b/pkgs/development/python-modules/lance-namespace/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "lance-namespace"; - version = "0.0.20"; + version = "0.0.21"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance-namespace"; tag = "v${version}"; - hash = "sha256-dacYNbWXlV6+/klb9/rgbG/2YJ5BAw5xeSZbPvDgRb4="; + hash = "sha256-KbQ1xXD/+8oOcbhc+dvk68ZF0daWm7In0y0NVsSfp9U="; }; sourceRoot = "${src.name}/python/lance_namespace"; From f42d05488da66722b91b605d9a91bed16b578111 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 14 Nov 2025 03:32:19 -0500 Subject: [PATCH 027/105] python313Packages.tables: switch to pyproject build system - Switch from format = "setuptools" to pyproject = true - Replace setupPyBuildFlags with pypaBuildFlags using --config-setting - Add pkg-config to nativeBuildInputs - Set HDF5_DIR environment variable - All 6851 tests pass --- .../python-modules/tables/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 62321f1d9385..650f1a403abe 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -14,6 +14,7 @@ numpy, numexpr, packaging, + pkg-config, setuptools, sphinx, typing-extensions, @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "tables"; version = "3.10.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -51,6 +52,10 @@ buildPythonPackage rec { sphinx ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ bzip2 c-blosc @@ -77,17 +82,21 @@ buildPythonPackage rec { substituteInPlace tables/__init__.py \ --replace-fail 'find_library("blosc2")' '"${lib.getLib c-blosc}/lib/libblosc${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; + env = { + HDF5_DIR = lib.getDev hdf5; + }; + # Regenerate C code with Cython preBuild = '' make distclean ''; - setupPyBuildFlags = [ - "--hdf5=${lib.getDev hdf5}" - "--lzo=${lib.getDev lzo}" - "--bzip2=${lib.getDev bzip2}" - "--blosc=${lib.getDev c-blosc}" - "--blosc2=${lib.getDev blosc2.c-blosc2}" + pypaBuildFlags = [ + "--config-setting=--build-option=--hdf5=${lib.getDev hdf5}" + "--config-setting=--build-option=--lzo=${lib.getDev lzo}" + "--config-setting=--build-option=--bzip2=${lib.getDev bzip2}" + "--config-setting=--build-option=--blosc=${lib.getDev c-blosc}" + "--config-setting=--build-option=--blosc2=${lib.getDev blosc2.c-blosc2}" ]; nativeCheckInputs = [ pytest ]; From 56e280500ad208c675b259e4785250657358db07 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 31 Oct 2025 21:52:56 -0600 Subject: [PATCH 028/105] shadps4: 0.11.0 -> 0.12.5 https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.12.5 Diff: https://github.com/shadps4-emu/shadPS4/compare/v.0.11.0...v.0.12.5 --- pkgs/by-name/sh/shadps4/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix index 088499c81e66..dfbaee7d32e7 100644 --- a/pkgs/by-name/sh/shadps4/package.nix +++ b/pkgs/by-name/sh/shadps4/package.nix @@ -21,7 +21,6 @@ pipewire, pkg-config, pugixml, - qt6, rapidjson, renderdoc, robin-map, @@ -29,6 +28,7 @@ sndio, stb, toml11, + util-linux, vulkan-headers, vulkan-loader, vulkan-memory-allocator, @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shadps4"; - version = "0.11.0"; + version = "0.12.5"; src = fetchFromGitHub { owner = "shadps4-emu"; repo = "shadPS4"; tag = "v.${finalAttrs.version}"; - hash = "sha256-ZHgwFWSoEaWILTafet5iQvaLwLtXy3HuCxjkQMt4PBA="; + hash = "sha256-H/GOnArWxMe/90qgyLb9fXbeJabUOV8CjLtpGokoStQ="; fetchSubmodules = true; }; @@ -71,11 +71,6 @@ stdenv.mkDerivation (finalAttrs: { libgbm pipewire pugixml - qt6.qtbase - qt6.qtdeclarative - qt6.qtmultimedia - qt6.qttools - qt6.qtwayland rapidjson renderdoc robin-map @@ -83,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { sndio stb toml11 + util-linux vulkan-headers vulkan-loader vulkan-memory-allocator @@ -95,11 +91,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - qt6.wrapQtAppsHook ]; cmakeFlags = [ - (lib.cmakeBool "ENABLE_QT_GUI" true) (lib.cmakeBool "ENABLE_UPDATER" false) ]; From 8224f08f7c21b6c4df8f85c19ab58828c89adeb0 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Tue, 11 Nov 2025 16:32:06 -0700 Subject: [PATCH 029/105] shadps4: fix test --- nixos/tests/shadps4.nix | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/nixos/tests/shadps4.nix b/nixos/tests/shadps4.nix index b6ac6397a642..76c282394dae 100644 --- a/nixos/tests/shadps4.nix +++ b/nixos/tests/shadps4.nix @@ -6,7 +6,7 @@ }; nodes.machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/x11.nix ]; @@ -80,37 +80,17 @@ machine.wait_for_x() - with subtest("starting shadps4 works"): - machine.succeed("shadps4 >&2 &") - machine.wait_for_text("Directory to install games") - machine.screenshot("0001-shadps4-dir-setup-prompt") - - machine.send_chars("/root\n") - machine.wait_for_text("Game List") - # Make it fullscreen, so mouse coords are simpler & content isn't cut off - machine.send_key("alt-f10") - # Should now see the rest too - machine.wait_for_text("Play Time") - machine.screenshot("0002-shadps4-started") - with subtest("running example works"): # Ensure that chosen openorbis logo colour isn't present already assert ( check_for_color(openorbisColor)(True) == False ), "openorbisColor {} was present on the screen before we launched anything!".format(openorbisColor) - machine.succeed("xdotool mousemove 20 30 click 1") # click on "File" - machine.wait_for_text("Boot Game") - machine.send_key("down") - machine.send_key("ret") - - # Pick the PNG sample (hello world runs too, but text-only output is currently broken) - machine.wait_for_text("Look in") - machine.send_chars("/etc/openorbis-sample-packages/OpenOrbis-PNG-Sample/uroot/eboot.bin\n") + machine.succeed("shadps4 /etc/openorbis-sample-packages/OpenOrbis-PNG-Sample/uroot/eboot.bin >&2 &") # Look for logo with machine.nested("Waiting for the screen to have openorbisColor {} on it:".format(openorbisColor)): retry(check_for_color(openorbisColor)) - machine.screenshot("0003-shadps4-sample-running") + machine.screenshot("0001-shadps4-sample-running") ''; } From 4de09b231f6941ab45c6858f8c3ee4bf275a61b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Nov 2025 12:06:47 +0000 Subject: [PATCH 030/105] enzyme: 0.0.208 -> 0.0.215 --- pkgs/by-name/en/enzyme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 64bbf9b095c0..fcceaf343530 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.208"; + version = "0.0.215"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-/WNiGeKoEvKYlXIK4cU6z5gFGujQbAE13qyvnhMniXc="; + hash = "sha256-XK3d47Q/6+sJ2RL+on483z9PvZrdaKxIT9/GUQuLPl8="; }; postPatch = '' From dbfa266e06659431654bbfa14b0d0a86dce89ca5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Nov 2025 13:41:06 +0000 Subject: [PATCH 031/105] lazydocker: 0.24.1 -> 0.24.2 --- pkgs/by-name/la/lazydocker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazydocker/package.nix b/pkgs/by-name/la/lazydocker/package.nix index d3b35e970731..54fb96c135e3 100644 --- a/pkgs/by-name/la/lazydocker/package.nix +++ b/pkgs/by-name/la/lazydocker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-cVjDdrxmGt+hj/WWP9B3BT739k9SSr4ryye5qWb3XNM="; + sha256 = "sha256-Dw7FBJ78b835iVkV8OrA06CAZ/GRCEXlLg/RfHZXfF0="; }; vendorHash = null; From b2ee4b62745b0b85fa5708b5429fa419b48eb101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Nov 2025 06:57:21 -0800 Subject: [PATCH 032/105] python3Packages.manim: don't override av Overriding Python packages isn't allowed within python3Packages. --- pkgs/development/python-modules/manim/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index 67d820774f35..04d864118ac3 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -183,16 +183,6 @@ let cbfonts-fd ] ); - # https://github.com/ManimCommunity/manim/pull/4037 - av_13_1 = av.overridePythonAttrs rec { - version = "13.1.0"; - src = fetchFromGitHub { - owner = "PyAV-Org"; - repo = "PyAV"; - tag = "v${version}"; - hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60="; - }; - }; in buildPythonPackage rec { pname = "manim"; @@ -216,7 +206,7 @@ buildPythonPackage rec { buildInputs = [ cairo ]; dependencies = [ - av_13_1 + av beautifulsoup4 click cloup @@ -278,6 +268,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "manim" ]; meta = { + # https://github.com/ManimCommunity/manim/pull/4037 + broken = lib.versionAtLeast av.version "14"; description = "Animation engine for explanatory math videos - Community version"; longDescription = '' Manim is an animation engine for explanatory math videos. It's used to From b81fc778edee4023c60e1e70a2ecb5f5f003fac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Nov 2025 07:12:17 -0800 Subject: [PATCH 033/105] python3Packages.samsungtvws: replace async-timeout with asyncio.timeout --- .../python-modules/samsungtvws/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index 5fa6bff8ccd7..777e3afc0bc7 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -2,7 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, + fetchpatch, + + # build system + setuptools, # propagates: requests, @@ -25,8 +28,7 @@ buildPythonPackage rec { pname = "samsungtvws"; version = "2.7.2"; - format = "setuptools"; - disabled = isPy27; + pyproject = true; src = fetchFromGitHub { owner = "xchwarze"; @@ -35,7 +37,18 @@ buildPythonPackage rec { hash = "sha256-CU59Kg8kSEE71x6wifCKCaVFdaMftodtkrAOpD+qvWY="; }; - propagatedBuildInputs = [ + patches = [ + # https://github.com/xchwarze/samsung-tv-ws-api/pull/159 + (fetchpatch { + name = "replace-async-timeout-with-asyncio.timeout.patch"; + url = "https://github.com/xchwarze/samsung-tv-ws-api/commit/c5b363aababe0e859cf3aa521a658c83c567f876.patch"; + hash = "sha256-gEtcqmxy2Til0KYLGwCxRThx9fndqdMbYam5WbzDKOo="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ requests websocket-client ]; From ac700b363449b9baa3317a6ab410ef7257d57961 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 14 Nov 2025 16:35:12 +0000 Subject: [PATCH 034/105] asc: migrate to by-name - Move package from pkgs/games/asc/default.nix to pkgs/by-name/as/asc/package.nix - Update fetchFromGitHub to use `hash` instead of `sha256` - Drop local `with lib` block; reference `lib.licenses`, `lib.maintainers`, and `lib.platforms` explicitly - Remove top-level all-packages.nix entry; by-name layout exposes `pkgs.asc` automatically --- .../asc/default.nix => by-name/as/asc/package.nix} | 10 +++++----- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{games/asc/default.nix => by-name/as/asc/package.nix} (84%) diff --git a/pkgs/games/asc/default.nix b/pkgs/by-name/as/asc/package.nix similarity index 84% rename from pkgs/games/asc/default.nix rename to pkgs/by-name/as/asc/package.nix index 008d10ab6566..cad2d9710a09 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/by-name/as/asc/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { owner = "ValHaris"; repo = "asc-hq"; rev = "fa3bca082a5cea2b35812349f99b877f0113aef0"; - sha256 = "atamYCN2mOqxV6auToTeWdpKuFfC+GLfLdRsfT0ouwQ="; + hash = "sha256-atamYCN2mOqxV6auToTeWdpKuFfC+GLfLdRsfT0ouwQ="; }; nativeBuildInputs = [ pkg-config ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation { libsigcxx ]; - meta = with lib; { + meta = { description = "Turn based strategy game"; longDescription = '' @@ -78,9 +78,9 @@ stdenv.mkDerivation { homepage = "https://www.asc-hq.org/"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d79a0a739829..ca9efa8923a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12939,11 +12939,6 @@ with pkgs; arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; - asc = callPackage ../games/asc { - lua = lua5_1; - physfs = physfs_2; - }; - beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix { inherit (python3Packages) beancount beangulp; }; From f951773b952d1997d8a9ca0ecc4f5b9197f91e2a Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Fri, 14 Nov 2025 17:44:27 +0100 Subject: [PATCH 035/105] roslyn-ls: 5.1.0-1.25506.3 -> 5.3.0-2.25553.6 --- pkgs/by-name/ro/roslyn-ls/deps.json | 48 ++++++++----------- pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch | 46 ------------------ pkgs/by-name/ro/roslyn-ls/package.nix | 10 ++-- 3 files changed, 24 insertions(+), 80 deletions(-) delete mode 100644 pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 8f4399e026ec..04fc4731bd53 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -37,9 +37,9 @@ }, { "pname": "Microsoft.Build", - "version": "17.3.4", - "hash": "sha256-LHtjk4vxeVSLzAKAcG8BN+S20d2sUR2DAOsSXLNIy5U=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.3.4/microsoft.build.17.3.4.nupkg" + "version": "17.11.31", + "hash": "sha256-NBn5hn85Q9dG1q09joq0pJsxsZ1m5DBQVJu+Mlx4EGE=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.11.31/microsoft.build.17.11.31.nupkg" }, { "pname": "Microsoft.Build.Framework", @@ -53,29 +53,23 @@ "hash": "sha256-Zh78ZPYCj0B5j+lrIBAX0KAZAUWA6ItZ78tYvMDi2oI=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.framework/17.15.0-preview-25353-11/microsoft.build.framework.17.15.0-preview-25353-11.nupkg" }, - { - "pname": "Microsoft.Build.Framework", - "version": "17.3.4", - "hash": "sha256-p2JG7pMBGfDVP6sOzBOqOkImZmwotlGvfS+8BjjVYf8=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.framework/17.3.4/microsoft.build.framework.17.3.4.nupkg" - }, { "pname": "Microsoft.Build.Locator", - "version": "1.8.1", - "hash": "sha256-q1oZLwPGO+Q/btm3jUzNo37eBziDD/MOXE3LsUSVeA4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.8.1/microsoft.build.locator.1.8.1.nupkg" + "version": "1.10.2", + "hash": "sha256-f/GyCcjeSgT0cD/icTtMDClyyTQOJD5AXNWERIBDPfA=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.10.2/microsoft.build.locator.1.10.2.nupkg" }, { "pname": "Microsoft.Build.Tasks.Core", - "version": "17.3.4", - "hash": "sha256-0RA95pD6zHBf1lgYyrrAuEuNeGwuCgGxNdhEJ0cJUCs=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.tasks.core/17.3.4/microsoft.build.tasks.core.17.3.4.nupkg" + "version": "17.11.31", + "hash": "sha256-5G9ZuP/6XNmR++YyBpQuBKqNsF2FXxz+537TtVWCik8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.11.31/microsoft.build.tasks.core.17.11.31.nupkg" }, { "pname": "Microsoft.Build.Utilities.Core", - "version": "17.3.4", - "hash": "sha256-SfZxr5xDANnDnC1HCUgho2H9MnF6n51cM47Rrf07fWw=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.utilities.core/17.3.4/microsoft.build.utilities.core.17.3.4.nupkg" + "version": "17.11.31", + "hash": "sha256-AQN2Qi4WbguyZitJR8FTYzq9k0LDyzETFpTA9aQZ4Gw=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.11.31/microsoft.build.utilities.core.17.11.31.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", @@ -133,15 +127,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "11.0.0-beta.25504.3", - "hash": "sha256-UkkFqvq5HLl5EY4nhY4x1FvKj7QVlgC1yz25Juv9cOE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25504.3/microsoft.dotnet.arcade.sdk.11.0.0-beta.25504.3.nupkg" + "version": "11.0.0-beta.25531.1", + "hash": "sha256-3zAA42msNPkvWe29bOeC44zjJyaFRU+M2+jBti/JTP4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25531.1/microsoft.dotnet.arcade.sdk.11.0.0-beta.25531.1.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "11.0.0-beta.25504.3", - "hash": "sha256-L4iPZRQHMW+YGda7op4orP87OyuXY5+QlpE/EmMoKd4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25504.3/microsoft.dotnet.xlifftasks.11.0.0-beta.25504.3.nupkg" + "version": "11.0.0-beta.25531.1", + "hash": "sha256-6Ko4aKbQZskfE2B6xg6RZjEd51at6/Pk1OvMRfP6qWQ=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25531.1/microsoft.dotnet.xlifftasks.11.0.0-beta.25531.1.nupkg" }, { "pname": "Microsoft.Extensions.Configuration", @@ -511,9 +505,9 @@ }, { "pname": "System.CommandLine", - "version": "2.0.0-rc.1.25502.108", - "hash": "sha256-O1uciBJ6ig7JWzj/U7N40om77qtBt3fnBkbKSDGJkEU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-rc.1.25502.108/system.commandline.2.0.0-rc.1.25502.108.nupkg" + "version": "2.0.0-rc.1.25515.110", + "hash": "sha256-kkWn8IJRJjafkB1WSuE0kA0gyce3eGcikK3gKUlEH3g=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-rc.1.25515.110/system.commandline.2.0.0-rc.1.25515.110.nupkg" }, { "pname": "System.ComponentModel.Composition", diff --git a/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch b/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch deleted file mode 100644 index a5f75d015089..000000000000 --- a/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props -index 58f90114f4d..8eb23c25067 100644 ---- a/eng/targets/TargetFrameworks.props -+++ b/eng/targets/TargetFrameworks.props -@@ -17,7 +17,7 @@ - net8.0 - net8.0 - net8.0 -- net6.0 -+ net8.0 - net9.0 - - -diff --git a/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj b/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj -index 8101f56b8be..1733955dc3d 100644 ---- a/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj -+++ b/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj -@@ -28,6 +28,12 @@ - --> - <_MsbuildVersion>17.3.4 - -+ -+ <_MsbuildFramework>$(TargetFramework) -+ -+ -+ <_MsbuildFramework>net6.0 -+ - - - -@@ -36,10 +42,10 @@ - - - -- -- -- -- -+ -+ -+ -+ - - - - diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 2b85f11a1927..5176afddde6f 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -5,7 +5,6 @@ dotnetCorePackages, stdenvNoCC, testers, - roslyn-ls, jq, writeText, runCommand, @@ -53,18 +52,18 @@ in buildDotnetModule (finalAttrs: rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.94.41-prerelease"; + vsVersion = "2.100.5"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-763RCPnFVn8QK447Ou10/9WDn2apOS1P0p/QQCpRn5s="; + hash = "sha256-PXb5BmXPfkitY/Lc2HMhAqX48dXqIYX+I4iFzvnvWTE="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "5.1.0-1.25506.3"; + version = "5.3.0-2.25553.6"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; @@ -72,9 +71,6 @@ buildDotnetModule (finalAttrs: rec { nativeBuildInputs = [ jq ]; patches = [ - # until upstream updates net6.0 here: - # https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20 - ./force-sdk_8_0.patch # until made configurable/and or different location # https://github.com/dotnet/roslyn/issues/76892 ./cachedirectory.patch From e4025c318856a6dac84c6db0146e2131916df3ed Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Fri, 14 Nov 2025 08:34:12 +0100 Subject: [PATCH 036/105] pgadmin: 9.9 -> 9.10 Signed-off-by: Florian Brandes --- pkgs/by-name/pg/pgadmin4/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pg/pgadmin4/package.nix b/pkgs/by-name/pg/pgadmin4/package.nix index f9894e25a9da..f524e53119d2 100644 --- a/pkgs/by-name/pg/pgadmin4/package.nix +++ b/pkgs/by-name/pg/pgadmin4/package.nix @@ -20,14 +20,14 @@ let pname = "pgadmin"; - version = "9.9"; - yarnHash = "sha256-QInOfpgQgx4i/gTyWG40Sl7Me5ynC/nOfjik82ltwLM="; + version = "9.10"; + yarnHash = "sha256-1xbQedxNDQaEiAT9GPNzz17cVD0v4CoxEn0SugJHaz0="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-XzjotJt02mZ0Se/bZMqAl8KL6egIVqqkbiEdcRuHcuE="; + hash = "sha256-AUkxv7rmlb+KYhLe4vj9OvZkmBnN+TL+b/0Xf1+Wyy4="; }; # keep the scope, as it is used throughout the derivation and tests From dc3b9d4b964c27a021f5d26bec11057b6096c31d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Nov 2025 19:37:54 +0000 Subject: [PATCH 037/105] viceroy: 0.15.0 -> 0.16.0 --- pkgs/by-name/vi/viceroy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix index b5ed99eab189..534ae51240db 100644 --- a/pkgs/by-name/vi/viceroy/package.nix +++ b/pkgs/by-name/vi/viceroy/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "fastly"; repo = "viceroy"; rev = "v${version}"; - hash = "sha256-CG+D4jh5p6bcc0E6qTvecwkoxCRoHJAGiAOtR8A+Otc="; + hash = "sha256-uZdzQ3YW3RYyJMLnyzmYi+b2rMeK7gdxXZ9QPHuu8/w="; }; - cargoHash = "sha256-K4nh/ODbk++UxxIoeLpq4boWGbID2DJW845rx605Z7Y="; + cargoHash = "sha256-A/XQZ/stc3sUL60aBZWfHADiCLVQRD7RmZ3bUHoVtgg="; cargoTestFlags = [ "--package viceroy-lib" From b63e2c58c47c62794969f4b094e533079c1f9002 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Nov 2025 19:43:23 +0000 Subject: [PATCH 038/105] postfix-tlspol: 1.8.20 -> 1.8.21 --- pkgs/by-name/po/postfix-tlspol/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix index 627a0309d56f..1aacf8b93fb5 100644 --- a/pkgs/by-name/po/postfix-tlspol/package.nix +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "postfix-tlspol"; - version = "1.8.20"; + version = "1.8.21"; src = fetchFromGitHub { owner = "Zuplu"; repo = "postfix-tlspol"; tag = "v${version}"; - hash = "sha256-/+FWTrb39PB1L6UDXAr3w0c0bMrpptX23g8WHI794GA="; + hash = "sha256-EBgP2gwq3pei2TBNuinyY2PgLKaV6PBmk3aCkecGvk4="; }; vendorHash = null; From c870ad4862046e20d63947bad6bf3eb4450d6aac Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Wed, 12 Nov 2025 13:37:30 -0800 Subject: [PATCH 039/105] adguardhome: 0.107.65 -> 0.107.69 --- pkgs/by-name/ad/adguardhome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ad/adguardhome/package.nix b/pkgs/by-name/ad/adguardhome/package.nix index 9df89eb8fc84..3319a942aedb 100644 --- a/pkgs/by-name/ad/adguardhome/package.nix +++ b/pkgs/by-name/ad/adguardhome/package.nix @@ -9,15 +9,15 @@ buildGoModule (finalAttrs: { pname = "adguardhome"; - version = "0.107.65"; + version = "0.107.69"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "AdGuardHome"; tag = "v${finalAttrs.version}"; - hash = "sha256-OOW77CJRR5vi5jHFOCyF/OyCXaQdTgEc8xZKPcF9vQE="; + hash = "sha256-eUMssp4rYmkreYdaSDlYP0bQsZgsrrN9e65UF7NseN8="; }; - vendorHash = "sha256-spBMVSZhiM0R5tf8dhZD+N4ucFZ9Wno9Y+BhZMdzQRM="; + vendorHash = "sha256-qee3ifDDR1U23VZAu0gj1CPPaDrSQfwfrKte1OUZPlE="; dashboard = buildNpmPackage { inherit (finalAttrs) src; @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { postPatch = '' cd client ''; - npmDepsHash = "sha256-s7TJvGyk05HkAOgjYmozvIQ3l2zYUhWrGRJrWdp9ZJQ="; + npmDepsHash = "sha256-AYm4ZgTsPJ6aNL7fo9DJqC0yq9i1mJghO7zWWC1X9eA="; npmBuildScript = "build-prod"; postBuild = '' mkdir -p $out/build/ @@ -45,7 +45,7 @@ buildGoModule (finalAttrs: { passthru = { updateScript = ./update.sh; - schema_version = 30; + schema_version = 31; tests.adguardhome = nixosTests.adguardhome; tests.version = testers.testVersion { package = finalAttrs.finalPackage; From 065da26e0778912d3023c3bf0bb6dbf8fd08aece Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Thu, 13 Nov 2025 21:18:07 +0000 Subject: [PATCH 040/105] adguardhome: fix automatic update --- pkgs/by-name/ad/adguardhome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/adguardhome/package.nix b/pkgs/by-name/ad/adguardhome/package.nix index 3319a942aedb..b175a5ea5a38 100644 --- a/pkgs/by-name/ad/adguardhome/package.nix +++ b/pkgs/by-name/ad/adguardhome/package.nix @@ -20,8 +20,8 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-qee3ifDDR1U23VZAu0gj1CPPaDrSQfwfrKte1OUZPlE="; dashboard = buildNpmPackage { - inherit (finalAttrs) src; - name = "dashboard"; + inherit (finalAttrs) src version; + pname = "adguardhome-dashboard"; postPatch = '' cd client ''; From 9f6139b74d4bb611cf00752de653de81abbd8354 Mon Sep 17 00:00:00 2001 From: winston Date: Fri, 14 Nov 2025 20:32:10 +0100 Subject: [PATCH 041/105] gpaste: fix GIRepository `prepend_search_path` call, enable for GNOME 49 --- pkgs/by-name/gp/gpaste/package.nix | 18 +++++++++++------- pkgs/by-name/gp/gpaste/wrapper.js | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/gp/gpaste/package.nix b/pkgs/by-name/gp/gpaste/package.nix index 97c4cefacaac..f71819236b18 100644 --- a/pkgs/by-name/gp/gpaste/package.nix +++ b/pkgs/by-name/gp/gpaste/package.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \ --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${finalAttrs.pname}-${finalAttrs.version}"} + + substituteInPlace src/gnome-shell/metadata.json.in --replace-fail \ + '"shell-version": [ "45", "46", "47", "48" ],' \ + '"shell-version": [ "45", "46", "47", "48", "49" ],' ''; nativeBuildInputs = [ @@ -59,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - "-Dcontrol-center-keybindings-dir=${placeholder "out"}/share/gnome-control-center/keybindings" - "-Ddbus-services-dir=${placeholder "out"}/share/dbus-1/services" - "-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user" + (lib.mesonOption "control-center-keybindings-dir" "${placeholder "out"}/share/gnome-control-center/keybindings") + (lib.mesonOption "dbus-services-dir" "${placeholder "out"}/share/dbus-1/services") + (lib.mesonOption "systemd-user-unit-dir" "${placeholder "out"}/etc/systemd/user") ]; postInstall = '' @@ -78,13 +82,13 @@ stdenv.mkDerivation (finalAttrs: { --subst-var-by typelibDir "${placeholder "out"}/lib/girepository-1.0" ''; - meta = with lib; { + meta = { homepage = "https://github.com/Keruspe/GPaste"; changelog = "https://github.com/Keruspe/GPaste/blob/v${finalAttrs.version}/NEWS"; description = "Clipboard management system with GNOME integration"; mainProgram = "gpaste-client"; - license = licenses.bsd2; - platforms = platforms.linux; - teams = [ teams.gnome ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + teams = [ lib.teams.gnome ]; }; }) diff --git a/pkgs/by-name/gp/gpaste/wrapper.js b/pkgs/by-name/gp/gpaste/wrapper.js index ea6a9cba6f6f..eeaa6956973c 100644 --- a/pkgs/by-name/gp/gpaste/wrapper.js +++ b/pkgs/by-name/gp/gpaste/wrapper.js @@ -1,5 +1,5 @@ import GIRepository from 'gi://GIRepository'; -GIRepository.Repository.prepend_search_path('@typelibDir@'); +GIRepository.Repository.dup_default().prepend_search_path('@typelibDir@'); export default (await import('./.@originalName@-wrapped.js')).default; From aef75c7aa538e1df3059ed2d3417fa0ce731005a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Nov 2025 09:42:05 +0000 Subject: [PATCH 042/105] python3Packages.django-modelcluster: cleanup --- .../django-modelcluster/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index ada5591773f9..06cbb3fc2c68 100644 --- a/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix @@ -1,14 +1,21 @@ { lib, buildPythonPackage, - django-taggit, - django, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + django, + pytz, + + # optional-dependencies + django-taggit, + + # tests pytest-django, pytestCheckHook, - pythonOlder, - pytz, - setuptools, }: buildPythonPackage rec { @@ -16,8 +23,6 @@ buildPythonPackage rec { version = "6.4"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "wagtail"; repo = "django-modelcluster"; @@ -44,10 +49,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "modelcluster" ]; - meta = with lib; { + meta = { description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database"; homepage = "https://github.com/torchbox/django-modelcluster/"; - changelog = "https://github.com/wagtail/django-modelcluster/blob/v${version}/CHANGELOG.txt"; - license = licenses.bsd2; + changelog = "https://github.com/wagtail/django-modelcluster/blob/${src.tag}/CHANGELOG.txt"; + license = lib.licenses.bsd2; }; } From 92ea220f1747c23729bcaf3c0def42094a0a4e8d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Nov 2025 10:00:35 +0000 Subject: [PATCH 043/105] python3Packages.django-modelsearch: init at 1.1.1 --- .../django-modelsearch/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/django-modelsearch/default.nix diff --git a/pkgs/development/python-modules/django-modelsearch/default.nix b/pkgs/development/python-modules/django-modelsearch/default.nix new file mode 100644 index 000000000000..73fd60e8d7be --- /dev/null +++ b/pkgs/development/python-modules/django-modelsearch/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + django, + django-tasks, + + # tests + pytest-django, + pytestCheckHook, + django-modelcluster, +}: + +buildPythonPackage rec { + pname = "modelsearch"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "wagtail"; + repo = "django-modelsearch"; + tag = "v${version}"; + hash = "sha256-tjwVepI9mdrMbTtxfe6yNUrSHWKndGxv2lJ8AfyNcr0="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + django + django-modelcluster + django-tasks + ]; + + pythonImportsCheck = [ "modelsearch" ]; + + # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. + # You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. + doCheck = false; + + meta = { + description = "Index Django Models with Elasticsearch or OpenSearch and query them with the ORM"; + homepage = "https://github.com/wagtail/django-modelsearch"; + changelog = "https://github.com/wagtail/django-modelsearch/releases/tag/${src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb82560f6b42..87861798cafb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4083,6 +4083,8 @@ self: super: with self; { django-modelcluster = callPackage ../development/python-modules/django-modelcluster { }; + django-modelsearch = callPackage ../development/python-modules/django-modelsearch { }; + django-modeltranslation = callPackage ../development/python-modules/django-modeltranslation { }; django-mptt = callPackage ../development/python-modules/django-mptt { }; From 6a2cb5059ac72716d95a4d73c3697106a6c4ea3d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Nov 2025 09:31:57 +0000 Subject: [PATCH 044/105] python3Packages.wagtail: 7.1.1 -> 7.2 Changelog: https://github.com/wagtail/wagtail/blob/v7.2/CHANGELOG.txt --- .../python-modules/wagtail/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 888375a07d14..e7fba326c845 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -12,6 +12,7 @@ django, django-filter, django-modelcluster, + django-modelsearch, django-taggit, django-tasks, django-treebeard, @@ -31,15 +32,14 @@ buildPythonPackage rec { pname = "wagtail"; - version = "7.1.1"; + version = "7.2"; pyproject = true; - # The GitHub source requires some assets to be compiled, which in turn - # requires fixing the upstream package lock. We need to use the PyPI release - # until https://github.com/wagtail/wagtail/pull/13136 gets merged. - src = fetchPypi { - inherit pname version; - hash = "sha256-e90eWww0VDeYXAHwp/YKYX5114jzfH2DlVj05qElGvk="; + src = fetchFromGitHub { + owner = "wagtail"; + repo = "wagtail"; + tag = "v${version}"; + hash = "sha256-o/4jn32ffR3BPVNwtFKJ6PowXYi7SpjBqghdeZIl5tM="; }; build-system = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { django django-filter django-modelcluster + django-modelsearch django-taggit django-tasks django-treebeard From 6a994cdcba72b14655ffb06dbb55fc411d3ee89e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Nov 2025 23:32:30 +0000 Subject: [PATCH 045/105] python3Packages.wagtail-modeladmin: skip failing tests --- pkgs/development/python-modules/wagtail-modeladmin/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/wagtail-modeladmin/default.nix b/pkgs/development/python-modules/wagtail-modeladmin/default.nix index d988e8efde3b..2cffd8c880ee 100644 --- a/pkgs/development/python-modules/wagtail-modeladmin/default.nix +++ b/pkgs/development/python-modules/wagtail-modeladmin/default.nix @@ -45,6 +45,9 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck + # AssertionError: 3 != 1 : Found 3 instances of 'error-message' in response (expected 1) + rm wagtail_modeladmin/test/tests/test_simple_modeladmin.py + ${python.interpreter} testmanage.py test runHook postCheck From cf34409f34899e015b0df4369021b11b17a8446a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Nov 2025 23:32:43 +0000 Subject: [PATCH 046/105] python3Packages.wegtail-localize: cleanup --- .../wagtail-localize/default.nix | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index 459af94afac3..70d1be1957a9 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -1,19 +1,26 @@ { lib, buildPythonPackage, - dj-database-url, - django, - django-rq, - fetchFromGitHub, + + # build-system flit-core, - freezegun, - google-cloud-translate, + + # dependencies + django, polib, - python, - pythonOlder, typing-extensions, wagtail, wagtail-modeladmin, + + # optional-dependencies + google-cloud-translate, + + # tests + dj-database-url, + django-rq, + fetchFromGitHub, + freezegun, + python, }: buildPythonPackage rec { @@ -21,8 +28,6 @@ buildPythonPackage rec { version = "1.12.2"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { repo = "wagtail-localize"; owner = "wagtail"; @@ -34,12 +39,16 @@ buildPythonPackage rec { dependencies = [ django - wagtail polib typing-extensions + wagtail wagtail-modeladmin ]; + optional-dependencies = { + google = [ google-cloud-translate ]; + }; + nativeCheckInputs = [ dj-database-url django-rq @@ -47,21 +56,22 @@ buildPythonPackage rec { google-cloud-translate ]; - optional-dependencies = { - google = [ google-cloud-translate ]; - }; - checkPhase = '' + runHook preCheck + # test_translate_html fails with later Beautifulsoup releases rm wagtail_localize/machine_translators/tests/test_dummy_translator.py + ${python.interpreter} testmanage.py test + + runHook postCheck ''; - meta = with lib; { + meta = { description = "Translation plugin for Wagtail CMS"; homepage = "https://github.com/wagtail/wagtail-localize"; changelog = "https://github.com/wagtail/wagtail-localize/blob/${src.tag}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ sephi ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sephi ]; }; } From 72b42fa89c060b7d8b55822372fa9d89dd4bc2ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Nov 2025 23:54:35 +0000 Subject: [PATCH 047/105] rio: 0.2.30 -> 0.2.35 --- pkgs/by-name/ri/rio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index 2e988f3c33e2..0e1f969d84ac 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -50,16 +50,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "rio"; - version = "0.2.30"; + version = "0.2.35"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; tag = "v${finalAttrs.version}"; - hash = "sha256-YkZq9mPQTeYtDuvGrEzV7PlDQZHUED/JuSLvsFWxYI0="; + hash = "sha256-KQC8I/XBZ7uBEug5QNxmNbPom0MY10fprO4iCxgLtps="; }; - cargoHash = "sha256-Rr6FiievKElzWhLEXOQZdcJ4KKlfvW9p8k7r7wIm0MQ="; + cargoHash = "sha256-Xq387L6V7BlL7jad1liH7qEhD4T5t8N+POTCG1oZ9xU="; nativeBuildInputs = [ rustPlatform.bindgenHook From 2ef8ce729721dd3fb318a62e6837ef333e4177de Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 8 Nov 2025 11:38:34 -0500 Subject: [PATCH 048/105] maintainers: drop aristid Inactive since 2022. --- maintainers/maintainer-list.nix | 6 ------ nixos/tests/containers-bridge.nix | 1 - nixos/tests/containers-imperative.nix | 1 - nixos/tests/containers-ip.nix | 1 - nixos/tests/containers-portforward.nix | 1 - pkgs/by-name/id/ideviceinstaller/package.nix | 2 +- pkgs/by-name/is/ispc/package.nix | 1 - pkgs/by-name/jp/jpegoptim/package.nix | 2 +- pkgs/by-name/mo/mozjpeg/package.nix | 2 +- pkgs/by-name/rq/rq/package.nix | 5 +---- 10 files changed, 4 insertions(+), 18 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7d123951fa41..0bc95ef50325 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2088,12 +2088,6 @@ githubId = 8049011; name = "Arik Grahl"; }; - aristid = { - email = "aristidb@gmail.com"; - github = "aristidb"; - githubId = 30712; - name = "Aristid Breitkreuz"; - }; ariutta = { email = "anders.riutta@gmail.com"; github = "ariutta"; diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index d95c85616ae8..cfcabab14b5c 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -10,7 +10,6 @@ in name = "containers-bridge"; meta = { maintainers = with lib.maintainers; [ - aristid aszlig ]; }; diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index f540368a8c31..eb36ce9df60d 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -3,7 +3,6 @@ name = "containers-imperative"; meta = { maintainers = with lib.maintainers; [ - aristid aszlig ]; }; diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix index 5ae8e9a2cb15..8dceda8db4c6 100644 --- a/nixos/tests/containers-ip.nix +++ b/nixos/tests/containers-ip.nix @@ -17,7 +17,6 @@ in name = "containers-ipv4-ipv6"; meta = { maintainers = with lib.maintainers; [ - aristid aszlig ]; }; diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix index 2d001cd66cd3..90b0620d757a 100644 --- a/nixos/tests/containers-portforward.nix +++ b/nixos/tests/containers-portforward.nix @@ -10,7 +10,6 @@ in name = "containers-portforward"; meta = { maintainers = with lib.maintainers; [ - aristid aszlig ianwookim ]; diff --git a/pkgs/by-name/id/ideviceinstaller/package.nix b/pkgs/by-name/id/ideviceinstaller/package.nix index 4f4f858e9cdb..839d803c3a41 100644 --- a/pkgs/by-name/id/ideviceinstaller/package.nix +++ b/pkgs/by-name/id/ideviceinstaller/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ aristid ]; + maintainers = [ ]; mainProgram = "ideviceinstaller"; }; } diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix index 6044e7b3ac41..d9de7eed40a6 100644 --- a/pkgs/by-name/is/ispc/package.nix +++ b/pkgs/by-name/is/ispc/package.nix @@ -109,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/ispc/ispc/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ - aristid thoughtpolice athas alexfmpe diff --git a/pkgs/by-name/jp/jpegoptim/package.nix b/pkgs/by-name/jp/jpegoptim/package.nix index cc64cc65e6ec..fca75e9e1be7 100644 --- a/pkgs/by-name/jp/jpegoptim/package.nix +++ b/pkgs/by-name/jp/jpegoptim/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Optimize JPEG files"; homepage = "https://www.kokkonen.net/tjko/projects.html"; license = licenses.gpl3Plus; - maintainers = [ maintainers.aristid ]; + maintainers = [ ]; platforms = platforms.all; mainProgram = "jpegoptim"; }; diff --git a/pkgs/by-name/mo/mozjpeg/package.nix b/pkgs/by-name/mo/mozjpeg/package.nix index 4280e414cc71..01c9864f18c7 100644 --- a/pkgs/by-name/mo/mozjpeg/package.nix +++ b/pkgs/by-name/mo/mozjpeg/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/mozilla/mozjpeg"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.aristid ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix index 7009a75d4d89..47fa08a9fdb8 100644 --- a/pkgs/by-name/rq/rq/package.nix +++ b/pkgs/by-name/rq/rq/package.nix @@ -47,9 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "rq"; homepage = "https://github.com/dflemstr/rq"; license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ - aristid - Br1ght0ne - ]; + maintainers = with lib.maintainers; [ Br1ght0ne ]; }; }) From 45dfb4e9d4b85130b5347e994c0ab01025a367d0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 14 Nov 2025 17:50:19 -0800 Subject: [PATCH 049/105] sbcl: set minimum macOS version to 10.12 on x86_64-darwin --- pkgs/development/compilers/sbcl/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 69235fe11ca8..29345c0b4394 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -255,6 +255,11 @@ stdenv.mkDerivation (self: { # Fails to find `O_LARGEFILE` otherwise. env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; + # Set minimum macOS version to 10.12 for x86_64-darwin to support clock_gettime() + env.SBCL_MACOSX_VERSION_MIN = lib.optionalString ( + stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 + ) "10.12"; + buildPhase = '' runHook preBuild From 0dabb109e41d68f26826a102afb2778721919bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Nov 2025 17:48:42 -0800 Subject: [PATCH 050/105] python3Packages.av_13: init at 13.1.0 --- .../python-modules/av_13/default.nix | 90 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 92 insertions(+) create mode 100644 pkgs/development/python-modules/av_13/default.nix diff --git a/pkgs/development/python-modules/av_13/default.nix b/pkgs/development/python-modules/av_13/default.nix new file mode 100644 index 000000000000..333aee52270c --- /dev/null +++ b/pkgs/development/python-modules/av_13/default.nix @@ -0,0 +1,90 @@ +{ + buildPythonPackage, + cython, + fetchFromGitHub, + fetchurl, + ffmpeg_7-headless, + lib, + linkFarm, + numpy, + pillow, + pkg-config, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "av"; + version = "13.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PyAV-Org"; + repo = "PyAV"; + tag = "v${version}"; + hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60="; + }; + + build-system = [ + cython + setuptools + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ ffmpeg_7-headless ]; + + preCheck = + let + testSamples = linkFarm "pyav-test-samples" ( + lib.mapAttrs (_: fetchurl) (lib.importTOML ../av/test-samples.toml) + ); + in + '' + # ensure we import the built version + rm -r av + ln -s ${testSamples} tests/assets + ''; + + nativeCheckInputs = [ + numpy + pillow + pytestCheckHook + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ + "av" + "av.audio" + "av.buffer" + "av.bytesource" + "av.codec" + "av.container" + "av._core" + "av.datasets" + "av.descriptor" + "av.dictionary" + "av.error" + "av.filter" + "av.format" + "av.frame" + "av.logging" + "av.option" + "av.packet" + "av.plane" + "av.stream" + "av.subtitles" + "av.utils" + "av.video" + ]; + + meta = { + changelog = "https://github.com/PyAV-Org/PyAV/blob/${src.tag}/CHANGELOG.rst"; + description = "Pythonic bindings for FFmpeg"; + homepage = "https://github.com/PyAV-Org/PyAV"; + license = lib.licenses.bsd2; + mainProgram = "pyav"; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 471b0d264065..4458b561ddf7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1208,6 +1208,8 @@ self: super: with self; { av = callPackage ../development/python-modules/av { }; + av_13 = callPackage ../development/python-modules/av_13 { }; + avahi = toPythonModule ( pkgs.avahi.override { inherit python; From 6152c6d0a24bd8217c182f31c8291df3ab35173c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Nov 2025 07:02:03 -0800 Subject: [PATCH 051/105] git-sim: fix av override --- pkgs/by-name/gi/git-sim/package.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/by-name/gi/git-sim/package.nix b/pkgs/by-name/gi/git-sim/package.nix index 093a54006f7a..d3a072799348 100644 --- a/pkgs/by-name/gi/git-sim/package.nix +++ b/pkgs/by-name/gi/git-sim/package.nix @@ -13,17 +13,7 @@ let defaultOverrides = [ (self: super: { - av = ( - super.av.overridePythonAttrs rec { - version = "13.1.0"; - src = fetchFromGitHub { - owner = "PyAV-Org"; - repo = "PyAV"; - tag = "v${version}"; - hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60="; - }; - } - ); + av = self.av_13; }) ]; From 15c2333fe89607e164129470c3b5a41074a7661b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Nov 2025 07:03:59 -0800 Subject: [PATCH 052/105] git-sim: unpin python3 --- pkgs/by-name/gi/git-sim/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-sim/package.nix b/pkgs/by-name/gi/git-sim/package.nix index d3a072799348..9fe4ab882feb 100644 --- a/pkgs/by-name/gi/git-sim/package.nix +++ b/pkgs/by-name/gi/git-sim/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, installShellFiles, - python312, + python3, # Override Python packages using # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); } @@ -17,7 +17,7 @@ let }) ]; - python = python312.override { + python = python3.override { self = python; packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); }; From 2d9bf263900170f286e5c22cfdb9e0d0901478ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Nov 2025 17:49:58 -0800 Subject: [PATCH 053/105] home-assistant: use av_13 --- pkgs/servers/home-assistant/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9c1d9c3c137a..f215353f88d9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -86,15 +86,7 @@ let ]; }); - av = (super.av.override { ffmpeg-headless = ffmpeg_7-headless; }).overridePythonAttrs rec { - version = "13.1.0"; - src = fetchFromGitHub { - owner = "PyAV-Org"; - repo = "PyAV"; - tag = "v${version}"; - hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60="; - }; - }; + av = self.av_13; imageio = super.imageio.overridePythonAttrs (oldAttrs: { disabledTests = oldAttrs.disabledTests or [ ] ++ [ From cd3e1beac58da637c28b3f134714670827fe153b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Nov 2025 17:54:48 -0800 Subject: [PATCH 054/105] manim: pin av at 13.1.0 --- pkgs/by-name/ma/manim/package.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/ma/manim/package.nix diff --git a/pkgs/by-name/ma/manim/package.nix b/pkgs/by-name/ma/manim/package.nix new file mode 100644 index 000000000000..631cbbf2ffeb --- /dev/null +++ b/pkgs/by-name/ma/manim/package.nix @@ -0,0 +1,12 @@ +{ + python3Packages, +}: + +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + av = self.av_13; + } + ); +in +pythonPackages.toPythonApplication pythonPackages.manim diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52e3564b51b3..a1bc4374bf88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11143,8 +11143,6 @@ with pkgs; m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; - manim = python3Packages.toPythonApplication python3Packages.manim; - manim-slides = (python3Packages.toPythonApplication python3Packages.manim-slides).overridePythonAttrs (oldAttrs: { From 813140d8fd561428499279b7ad95f258b173d1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Nov 2025 17:59:18 -0800 Subject: [PATCH 055/105] manim-slides: pin av at 13.1.0 --- pkgs/by-name/ma/manim-slides/package.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/ma/manim-slides/package.nix diff --git a/pkgs/by-name/ma/manim-slides/package.nix b/pkgs/by-name/ma/manim-slides/package.nix new file mode 100644 index 000000000000..ec66070ce3e4 --- /dev/null +++ b/pkgs/by-name/ma/manim-slides/package.nix @@ -0,0 +1,14 @@ +{ + python3Packages, +}: + +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + av = self.av_13; + } + ); +in +(pythonPackages.toPythonApplication pythonPackages.manim-slides).overridePythonAttrs (oldAttrs: { + dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.pyqt6-full; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1bc4374bf88..c0cca4ddc872 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11143,12 +11143,6 @@ with pkgs; m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; - manim-slides = - (python3Packages.toPythonApplication python3Packages.manim-slides).overridePythonAttrs - (oldAttrs: { - dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.pyqt6-full; - }); - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; minari = python3Packages.toPythonApplication python3Packages.minari; From 84b60461923a2b0ea98b2bd3adb7051a142bcf19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Nov 2025 18:34:59 -0800 Subject: [PATCH 056/105] python3Packages.toonapi: replace async-timeout with asyncio.timeout --- .../python-modules/toonapi/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/toonapi/default.nix b/pkgs/development/python-modules/toonapi/default.nix index d2dcaa4897cb..3d33b1c6ea25 100644 --- a/pkgs/development/python-modules/toonapi/default.nix +++ b/pkgs/development/python-modules/toonapi/default.nix @@ -4,16 +4,15 @@ backoff, buildPythonPackage, fetchFromGitHub, - pythonOlder, + fetchpatch, yarl, + setuptools, }: buildPythonPackage rec { pname = "toonapi"; version = "0.3.0"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + pyproject = true; src = fetchFromGitHub { owner = "frenck"; @@ -22,7 +21,18 @@ buildPythonPackage rec { hash = "sha256-RaN9ppqJbTik1/vNX0/YLoBawrqjyQWU6+FLTspIxug="; }; - propagatedBuildInputs = [ + patches = [ + # https://github.com/frenck/python-toonapi/pull/15 + (fetchpatch { + name = "replace-async-timeout-with-asyncio.timeout.patch"; + url = "https://github.com/frenck/python-toonapi/commit/a04f1d8bcbcf48889dae49219d2edadbeb2dfa01.patch"; + hash = "sha256-EMK11M+2OTnIB7oWavpQKNQq0ZLuSxYQlC6On7ob1xU="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp backoff yarl From f3b59117d03954c381d991578d3476a35fef1ca1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Nov 2025 03:01:57 +0000 Subject: [PATCH 057/105] python3Packages.iminuit: 2.31.3 -> 2.32.0 --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 88f545992b0a..fe79b76d088d 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.31.3"; + version = "2.32.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/7Oust4mxADQr/fit0V/ZM1gmklMRe5Xnv/ugbG8XXg="; + hash = "sha256-oys00YZllZvnWta9sd2ARZu5RGbGK0VWMcAFaKzN99I="; }; nativeBuildInputs = [ From fd8cc84777dea78f3a272d98d98ea827bb18bae4 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 20 Oct 2025 14:05:12 -0600 Subject: [PATCH 058/105] tandoor-recipes: 2.2.5 -> 2.3.3 https://github.com/TandoorRecipes/recipes/releases/tag/2.3.3 Diff: https://github.com/TandoorRecipes/recipes/compare/2.2.5...2.3.3 --- pkgs/by-name/ta/tandoor-recipes/common.nix | 4 ++-- pkgs/by-name/ta/tandoor-recipes/package.nix | 6 +++++- pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index 475f23738cca..721cf51303b6 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "2.2.5"; + version = "2.3.3"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; tag = version; - hash = "sha256-N6d5T11fOAtPKAV/tqTWGdwMkWNY8rPpWT2TBSc0ybc="; + hash = "sha256-N9eHoQyNPbjf4XrdNvTuMKs866mO+jgn2zRkXLAMtb8="; }; yarnHash = "sha256-1p79Bdsn6KDApYKz9BAwrA97svbB8ub+Wl49MTIumW8="; diff --git a/pkgs/by-name/ta/tandoor-recipes/package.nix b/pkgs/by-name/ta/tandoor-recipes/package.nix index 5b81e5df48ea..c3a27f4816df 100644 --- a/pkgs/by-name/ta/tandoor-recipes/package.nix +++ b/pkgs/by-name/ta/tandoor-recipes/package.nix @@ -4,7 +4,11 @@ python3, }: let - python = python3; + python = python3.override { + packageOverrides = final: prev: { + django = final.django_5; + }; + }; common = callPackage ./common.nix { }; diff --git a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch index 4845110543e8..444b19df821f 100644 --- a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch +++ b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch @@ -11,4 +11,4 @@ index 2755dc99..4026b96e 100644 # addopts = -n auto --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html -asyncio_default_fixture_loop_scope = fixture \ No newline at end of file -+asyncio_default_fixture_loop_scope = fixture ++asyncio_default_fixture_loop_scope = function From 6d725e9029cdbb22b595d359d6d60d00b32dc401 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 12 Nov 2025 14:10:40 +0100 Subject: [PATCH 059/105] electron-source.electron_39: 39.1.1 -> 39.1.2 - Changelog: https://github.com/electron/electron/releases/tag/v39.1.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v39.1.1...v39.1.2 --- pkgs/development/tools/electron/info.json | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 7f4ce45c6dab..f0ea4ecf41de 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -2656,7 +2656,7 @@ "version": "38.6.0" }, "39": { - "chrome": "142.0.7444.59", + "chrome": "142.0.7444.134", "chromium": { "deps": { "gn": { @@ -2665,15 +2665,15 @@ "version": "0-unstable-2025-09-18" } }, - "version": "142.0.7444.59" + "version": "142.0.7444.134" }, "chromium_npm_hash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=", "deps": { "src": { "args": { - "hash": "sha256-E2nxJzxjFu3pBeBptqBHNnguiBeI4tg76uLNOzitM+U=", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "142.0.7444.59", + "hash": "sha256-h0T8M4/UjMFCLTf0HH5M2uaFtmCDhYzjFsCzu1O1aEU=", + "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "tag": "142.0.7444.134", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -2712,10 +2712,10 @@ }, "src/electron": { "args": { - "hash": "sha256-1unNLuIek76p05+Jz/oKmc4/rUtAU6W37I7SnTV3UnE=", + "hash": "sha256-mAAUslBt5xfVpAJ0pFIt0lPpKDYu2Xc2aWsaTlqN+6k=", "owner": "electron", "repo": "electron", - "tag": "v39.1.1" + "tag": "v39.1.2" }, "fetcher": "fetchFromGitHub" }, @@ -2937,8 +2937,8 @@ }, "src/third_party/dawn": { "args": { - "hash": "sha256-loKRLJfTxBxlTbPVWZqGdx0DyPvEopbs2zIf4gaxoLo=", - "rev": "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920", + "hash": "sha256-BFJsVt7hkSyyPQiX7QCN7Fu6CgTF/2xwAQbWCkJVq6M=", + "rev": "95f9c2b375395cc82941babdf1e9f0cf60a32831", "url": "https://dawn.googlesource.com/dawn.git" }, "fetcher": "fetchFromGitiles" @@ -3009,8 +3009,8 @@ }, "src/third_party/devtools-frontend/src": { "args": { - "hash": "sha256-bUJuFEDqgUFdMfmMyroX4s2ky/2n37PsTWaV+iQHCJg=", - "rev": "38cfe98a56a034da33ee62a5f1ea235fe47f58a7", + "hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo=", + "rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17", "url": "https://chromium.googlesource.com/devtools/devtools-frontend" }, "fetcher": "fetchFromGitiles" @@ -3991,8 +3991,8 @@ }, "src/v8": { "args": { - "hash": "sha256-ovlKdiBYD9RAjA1XI0PLp/pt25LAvm3fn5AqWlJQfgs=", - "rev": "bb294624702efbb17691b642333f06bf5108e600", + "hash": "sha256-SL9YaplMFA1Ez11bIzAfl/F5qQob/PvCP1uknP1LiLs=", + "rev": "4427aa4a9c14d3d542866c0ed2ae8a8554cfd68d", "url": "https://chromium.googlesource.com/v8/v8.git" }, "fetcher": "fetchFromGitiles" @@ -4001,6 +4001,6 @@ "electron_yarn_hash": "19mpwfjb85d9kw1awiymj47h06rjk6vxqcgfajh612cgwkbz4m6f", "modules": "140", "node": "22.21.1", - "version": "39.1.1" + "version": "39.1.2" } } From 7f3d3b2766912cd66073769814f88d04234de3df Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 12 Nov 2025 14:18:37 +0100 Subject: [PATCH 060/105] electron_39-bin: 39.1.1 -> 39.1.2 - Changelog: https://github.com/electron/electron/releases/tag/v39.1.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v39.1.1...v39.1.2 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 91245b576e14..c7f9b03f83f8 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -34,13 +34,13 @@ }, "39": { "hashes": { - "aarch64-darwin": "90bfac2ec51c73a2f82d3b6f72ef69acb4b260cfe09106c1c0cc84389438ba27", - "aarch64-linux": "67c257ada60b8ee5107d4c3c3912ece8d8c1383321a00fda114ade06860e4b3f", - "armv7l-linux": "45305e3f1927fa87593802906d620057c093ce56d970dcf3e698a7ae672e0dcc", - "headers": "1dkmd89c4z9v0aqnf7sb3zpxdjqsi43h77dawniqlcglwv6vqh8v", - "x86_64-darwin": "3da533366600e21bd882512285d3583fe7a58457897c7a2dc49634f76056714d", - "x86_64-linux": "d4e492de3e0dd240746bcc54c2abf2b941f1657e06f07b87937bee516cf6fa59" + "aarch64-darwin": "0c7c9a957285ec02fd4d716f642e744e1ccde02d5fd1f9563112ac265671f38c", + "aarch64-linux": "a8c96d7b358b4286a9f75b7bdd48a32514a88d52c69525b566304c9f6d9bc559", + "armv7l-linux": "bc55e430581cc1c06e00fd2d7bd0c3e201c4316a28255290c76614bac3e2550f", + "headers": "1vqbmcpg57k0xr3izcy1fhi6c8135dhmbapj0cwbfgrcsd2kg6bf", + "x86_64-darwin": "ae5ed2333ec3b00fe9a31f00e206cf33e82ac9a5f490e1713886c9eb8152faf4", + "x86_64-linux": "06d68598576b02855cf848081c9b3117a4cb6e7f74b79afabdab0d3ab5810c3d" }, - "version": "39.1.1" + "version": "39.1.2" } } From 656ce16db36427eecf18cb5441c73bc535f70c27 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 12 Nov 2025 14:18:39 +0100 Subject: [PATCH 061/105] electron-chromedriver_39: 39.1.1 -> 39.1.2 - Changelog: https://github.com/electron/electron/releases/tag/v39.1.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v39.1.1...v39.1.2 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 002e60f7ae3d..260299cb1c00 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,13 +34,13 @@ }, "39": { "hashes": { - "aarch64-darwin": "555c0c1456b3cfed09b79569fc1e6d9644cb1c1ee2c6d176ed3ee9380cca963e", - "aarch64-linux": "5a45ad3b6d62db31f94e16ea323d559a5380b92730032e106cf602f9258b8d0b", - "armv7l-linux": "478fe206d431297acbff3a4cfd95df7e864ab29971a883c9518b1a4b476a14fb", - "headers": "1dkmd89c4z9v0aqnf7sb3zpxdjqsi43h77dawniqlcglwv6vqh8v", - "x86_64-darwin": "af7656f7a1d29568ea820ae50f6b32c6db12b49382037a705524986c389d25cf", - "x86_64-linux": "23122cda6e264f716483fe00d9c085d2faad7fe2acd1cfbc6a301f54e80c44ac" + "aarch64-darwin": "d109aa625511905b8814a1ae0894222d62e373ace74ba184264268f5c1adde54", + "aarch64-linux": "9e11646e02288e5a95511feac3f22d2c4e7f6801ec06bccb3484f2c5d10cd481", + "armv7l-linux": "aea83d67ae4d4107a6e449a6b1ff5619b5cb852fed5389bcdd634c7fdbb12777", + "headers": "1vqbmcpg57k0xr3izcy1fhi6c8135dhmbapj0cwbfgrcsd2kg6bf", + "x86_64-darwin": "cdfc6405ca94eb187ff74d5787e952ba9a6444ff93488f230979603648c52b25", + "x86_64-linux": "2d4d3c0888f581e02608ee3c78a699f30ab4b77edb0f7e9daad3ba581fd04fd2" }, - "version": "39.1.1" + "version": "39.1.2" } } From 17e9e948f08d24fb6031e7513af0cfd3a2f979bb Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:58:21 +0100 Subject: [PATCH 062/105] electron_37-bin: 37.9.0 -> 37.10.0 - Changelog: https://github.com/electron/electron/releases/tag/v37.10.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v37.9.0...v37.10.0 --- pkgs/development/tools/electron/binary/info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index c7f9b03f83f8..0713b191ceab 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -12,14 +12,14 @@ }, "37": { "hashes": { - "aarch64-darwin": "5d953398aeb0a578f724d18755f693c8cd32125812c3e6a6f3c9ec90bdfa414a", - "aarch64-linux": "35e969cc0a4e779011f314311db07244235f5b2a8db9284bf0061ece7084f6dd", - "armv7l-linux": "015c9caf6bb919b73b5118a56f260746ec4ca1ae8c5008e3591d562a6f4c5aee", + "aarch64-darwin": "10f0143c4590a7eb9f542ff9e26db929a3690120e7010f74df546f164a4e128b", + "aarch64-linux": "902f4382f42b94d36d6fb5bd0b5d136b505a56649a81152d14971294ca94fff8", + "armv7l-linux": "099a77b3ad0fe3d71d9efa780d2a4be187ba74c03f15714d7c791e3e64b44fcd", "headers": "0lwcdw882hjb2vhj9vvngkwq5l6nrh7d2hr9adpqdm1any4rssl5", - "x86_64-darwin": "44b845bc1cac455d800cec2df1be3e72af0a3a4c54e933c803f30ab12600ffea", - "x86_64-linux": "e5b45933bca6acbf24a52452c976a30f5ac2614d0f08b00b7202b90efba1bc96" + "x86_64-darwin": "b4ea214ca58bce53f45d24acf1e3be245f787b40d3aa8532f71c91624d9502d6", + "x86_64-linux": "3a982dbfe21b72929ffcc80c786e0aa106a9e6ebf83ba7c8ed587dc12898c6e4" }, - "version": "37.9.0" + "version": "37.10.0" }, "38": { "hashes": { From 59fdb165c8137f6583ade8462f7a6a45086754c4 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:58:24 +0100 Subject: [PATCH 063/105] electron-chromedriver_37: 37.9.0 -> 37.10.0 - Changelog: https://github.com/electron/electron/releases/tag/v37.10.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v37.9.0...v37.10.0 --- .../tools/electron/chromedriver/info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 260299cb1c00..325ad4a2077e 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -12,14 +12,14 @@ }, "37": { "hashes": { - "aarch64-darwin": "1e2b6822ec49e253f765b34e5078f8261df0fcb086c7a8bfbbebdd35bdb8801e", - "aarch64-linux": "66877c9863c967dc435fa18e5177673b9f9e139bd73981c5945d92546d71a5ea", - "armv7l-linux": "deedf5b7f387721b4bcb9cea274ceaf7625852f88f3217eabd2104f42259f8be", + "aarch64-darwin": "d2c5aeb337610c011007e36142e9bac64c0c3ac225cdf8b41373267b57b1ae98", + "aarch64-linux": "3ec3197a0845556d03fd8389354e2e6eb1fb6dfd4ebfbf4d97448e440020777f", + "armv7l-linux": "6fd0945a614e98d0a14e5433e427f9e99414c11bce1dbced47e8e2180721ed09", "headers": "0lwcdw882hjb2vhj9vvngkwq5l6nrh7d2hr9adpqdm1any4rssl5", - "x86_64-darwin": "e367440fdc5c915cd137c49ddd2912bda893996da6d14f1d678f02bcb726b135", - "x86_64-linux": "62ae1633d05f165d4ee42c2d6675f46db8cb55714433fddb5cb082dc9e40bffb" + "x86_64-darwin": "049d25c8c23bbc1ff7060a56df071115895b9ba6268396cb69c6a1d6283918c7", + "x86_64-linux": "c0b5cd05437b13f0ad83e1bcc5d61a803962f72b29c0af21f4b19d2b8ff193a2" }, - "version": "37.9.0" + "version": "37.10.0" }, "38": { "hashes": { From 615fe0884f3909cedabd4fd137b48683c95d9834 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:58:26 +0100 Subject: [PATCH 064/105] electron_38-bin: 38.6.0 -> 38.7.0 - Changelog: https://github.com/electron/electron/releases/tag/v38.7.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v38.6.0...v38.7.0 --- pkgs/development/tools/electron/binary/info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 0713b191ceab..736d54591640 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -23,14 +23,14 @@ }, "38": { "hashes": { - "aarch64-darwin": "2add03400a735823e827b5671c52d877338b08fd4733dba210b35f99d6346f24", - "aarch64-linux": "99fe2c76ef1571da036d4610a6f49de1aa16ea4735b0b20da1d026668d70d629", - "armv7l-linux": "25cbecb533ff355e85c6760729dfd822fd27c6d50a36cab800d3d07af603295a", + "aarch64-darwin": "e89ab60544fa0a11775baf9fe027fa8ad2cf54ecf3ec80cd7b883aba8e32a63c", + "aarch64-linux": "08965d6d57f78b6cd26fcef0275e3047fd90e9e55ea2ab2c811c5c19364d3813", + "armv7l-linux": "220d9fbd00013fa940a4178f1ec5a8b2ac27bc4288fd51d5459afd1ff7f5de6d", "headers": "1f1381qc705fv50sbm0g5f6wm8pkwqvrbhb1kvi3i9mk2910y14m", - "x86_64-darwin": "6a36e577156907ea15ca1cd393c90f0a60bebf01ca9c3414b7e76f4bb8b2d6f4", - "x86_64-linux": "b48627d5ce7b533170363e750d7292ecc489bce61ec2b933b9d4705c53166545" + "x86_64-darwin": "cdc216cca9541be10c4e2ff6a6c540ff1b2ab0947a6bd184917b243968bf9f8b", + "x86_64-linux": "21c15c1b6ea52d57c00551ec667d771ddb9ecc6ea2c7431012060f90868f688d" }, - "version": "38.6.0" + "version": "38.7.0" }, "39": { "hashes": { From bb67d8ba214f302d1f11f0de1f6692fd68942bb0 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:58:28 +0100 Subject: [PATCH 065/105] electron-chromedriver_38: 38.6.0 -> 38.7.0 - Changelog: https://github.com/electron/electron/releases/tag/v38.7.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v38.6.0...v38.7.0 --- .../tools/electron/chromedriver/info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 325ad4a2077e..6aeef0d2e542 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -23,14 +23,14 @@ }, "38": { "hashes": { - "aarch64-darwin": "b625e3ca3e66a79a63a35c7ca2e199172237387d4739e107620485f83c8dff46", - "aarch64-linux": "118b35d04d28f63a10dd3f80f809648e0507f381f889130e9a9cc8e1d1d8dec4", - "armv7l-linux": "f5cab868e2da285d60595c7df7cc29595070c4078993516a5f55d674b4b16b7c", + "aarch64-darwin": "41c15283f64be0f0773aa6a2fd44dbf2cdc9c42a5fe523420ae5b0a2f3969e61", + "aarch64-linux": "2bb62a5f1d46261847c95694559558dc32a8bf1b7165dce1011a9b1c31a60116", + "armv7l-linux": "c9605552bb48935f540f64fbe7c9cc8b3b3067a5989babfacaacf2016ce87230", "headers": "1f1381qc705fv50sbm0g5f6wm8pkwqvrbhb1kvi3i9mk2910y14m", - "x86_64-darwin": "a05015b38f4b6b25d874a5e2bd82c04813e27c34e3611fab8919af772c0e8a55", - "x86_64-linux": "1e087810c35b86e077a14464eaead73a8ec64eaa0e1107ac81828a985455aa70" + "x86_64-darwin": "3af644d66d45be674a584cf4bfd89aae4f003650222f1ced86ce9c19aaf6c0a3", + "x86_64-linux": "479aaeff15da7187a7e24803a2a4325ccc6e9719b00cdc754f052192a137fadc" }, - "version": "38.6.0" + "version": "38.7.0" }, "39": { "hashes": { From c0a4604e181bbdfeb83c012ea807b507a51314c2 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:58:31 +0100 Subject: [PATCH 066/105] electron_39-bin: 39.1.2 -> 39.2.0 - Changelog: https://github.com/electron/electron/releases/tag/v39.2.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v39.1.2...v39.2.0 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 736d54591640..f4283a21e2f3 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -34,13 +34,13 @@ }, "39": { "hashes": { - "aarch64-darwin": "0c7c9a957285ec02fd4d716f642e744e1ccde02d5fd1f9563112ac265671f38c", - "aarch64-linux": "a8c96d7b358b4286a9f75b7bdd48a32514a88d52c69525b566304c9f6d9bc559", - "armv7l-linux": "bc55e430581cc1c06e00fd2d7bd0c3e201c4316a28255290c76614bac3e2550f", - "headers": "1vqbmcpg57k0xr3izcy1fhi6c8135dhmbapj0cwbfgrcsd2kg6bf", - "x86_64-darwin": "ae5ed2333ec3b00fe9a31f00e206cf33e82ac9a5f490e1713886c9eb8152faf4", - "x86_64-linux": "06d68598576b02855cf848081c9b3117a4cb6e7f74b79afabdab0d3ab5810c3d" + "aarch64-darwin": "3ecbe543ebc728d813ea21f16cedebd6b7af812d716b0ede37f1227179a66c3e", + "aarch64-linux": "da7db0ead43e1f560fc1ade4aa50d773d75a5c5339d995f08db49b6fb7267c23", + "armv7l-linux": "87fc8b6903559deab6c2aada4e03dddba06a0071b10ecdc6a116da0baaeb639d", + "headers": "0pnmlknafq1d4hmfhpqpxv87sqrr9rkv3kz0r5y016j7yldjibh0", + "x86_64-darwin": "721ec50aac1c2c4ce0930b4f14eb4e5b92ce58ac41f965825dc986eb5f511fee", + "x86_64-linux": "c1f2f123dee6896ff09e4b3e504dfbfe42356c0e6b41b33fd849aa19fd50253d" }, - "version": "39.1.2" + "version": "39.2.0" } } From fab8a82730e079bce6cf4a0e16dbaccee583b1af Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:58:33 +0100 Subject: [PATCH 067/105] electron-chromedriver_39: 39.1.2 -> 39.2.0 - Changelog: https://github.com/electron/electron/releases/tag/v39.2.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v39.1.2...v39.2.0 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 6aeef0d2e542..cc8df047a162 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,13 +34,13 @@ }, "39": { "hashes": { - "aarch64-darwin": "d109aa625511905b8814a1ae0894222d62e373ace74ba184264268f5c1adde54", - "aarch64-linux": "9e11646e02288e5a95511feac3f22d2c4e7f6801ec06bccb3484f2c5d10cd481", - "armv7l-linux": "aea83d67ae4d4107a6e449a6b1ff5619b5cb852fed5389bcdd634c7fdbb12777", - "headers": "1vqbmcpg57k0xr3izcy1fhi6c8135dhmbapj0cwbfgrcsd2kg6bf", - "x86_64-darwin": "cdfc6405ca94eb187ff74d5787e952ba9a6444ff93488f230979603648c52b25", - "x86_64-linux": "2d4d3c0888f581e02608ee3c78a699f30ab4b77edb0f7e9daad3ba581fd04fd2" + "aarch64-darwin": "98c036b4be864a3b6518142bb82ec329651d74bb3d38c6e8693058e8cb0a22f3", + "aarch64-linux": "ee24ebef991438cb8d3be0ec97c06cd63201e7fdbeb85b57b133a0a0fe32519d", + "armv7l-linux": "82b4855a5dcc17548da7826fbb6cc2f98cef515ad09aa5c24fad52bb076161cc", + "headers": "0pnmlknafq1d4hmfhpqpxv87sqrr9rkv3kz0r5y016j7yldjibh0", + "x86_64-darwin": "daae3a502e68195a30700040d428a4edb9e243d9673dcd10c3f01a5cae0474d5", + "x86_64-linux": "d11ae58e17f8f3759d67dc03096e979743825a5a4ea793357b550c50c1881b35" }, - "version": "39.1.2" + "version": "39.2.0" } } From 8ad82830de5083c1e36d27123cd1e6e93b2ff07f Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:59:00 +0100 Subject: [PATCH 068/105] electron-source.electron_37: 37.9.0 -> 37.10.0 - Changelog: https://github.com/electron/electron/releases/tag/v37.10.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v37.9.0...v37.10.0 --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index f0ea4ecf41de..0a983e7c1e23 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -56,10 +56,10 @@ }, "src/electron": { "args": { - "hash": "sha256-k+YDahI53rwe8o4EjrFfSWTbplUMJemN52+O4ICtz8M=", + "hash": "sha256-nE6qhNX6k+TqHS6PPZcsQ3BCH1ckkn6/FNPv12TcHQ0=", "owner": "electron", "repo": "electron", - "tag": "v37.9.0" + "tag": "v37.10.0" }, "fetcher": "fetchFromGitHub" }, @@ -1329,7 +1329,7 @@ "electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk", "modules": "136", "node": "22.21.1", - "version": "37.9.0" + "version": "37.10.0" }, "38": { "chrome": "140.0.7339.249", From c5dabdc8568fcf54a3d9a050c6b7a9d2979fe2ae Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Nov 2025 14:07:11 +0100 Subject: [PATCH 069/105] electron-source.electron_38: 38.6.0 -> 38.7.0 - Changelog: https://github.com/electron/electron/releases/tag/v38.7.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v38.6.0...v38.7.0 --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 0a983e7c1e23..dd6c4830b66c 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1388,10 +1388,10 @@ }, "src/electron": { "args": { - "hash": "sha256-zrShSv6a2TCaMR90dfsN//PWsthHtz8m5awwNFur6hM=", + "hash": "sha256-FFO1VwcyIRtmDRiQ94ar6+fxOg97eeNGfYdqUPZhXPE=", "owner": "electron", "repo": "electron", - "tag": "v38.6.0" + "tag": "v38.7.0" }, "fetcher": "fetchFromGitHub" }, @@ -2653,7 +2653,7 @@ "electron_yarn_hash": "1knhw3blk3bl2a8nl58ik272qj2q0cpqiih5gcsds1na3bbkbn2z", "modules": "139", "node": "22.21.1", - "version": "38.6.0" + "version": "38.7.0" }, "39": { "chrome": "142.0.7444.134", From 79036239454d4e50396890c201efd6c73e7cda86 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 15 Nov 2025 04:41:13 +0100 Subject: [PATCH 070/105] electron-source.electron_39: 39.1.2 -> 39.2.0 - Changelog: https://github.com/electron/electron/releases/tag/v39.2.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v39.1.2...v39.2.0 --- pkgs/development/tools/electron/info.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index dd6c4830b66c..a4207b8025f3 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -2656,7 +2656,7 @@ "version": "38.7.0" }, "39": { - "chrome": "142.0.7444.134", + "chrome": "142.0.7444.162", "chromium": { "deps": { "gn": { @@ -2665,15 +2665,15 @@ "version": "0-unstable-2025-09-18" } }, - "version": "142.0.7444.134" + "version": "142.0.7444.162" }, "chromium_npm_hash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=", "deps": { "src": { "args": { - "hash": "sha256-h0T8M4/UjMFCLTf0HH5M2uaFtmCDhYzjFsCzu1O1aEU=", + "hash": "sha256-CiOE22Kxdqovk+/vV2UJWo013DFRFGhEeUVsrKuOixE=", "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "142.0.7444.134", + "tag": "142.0.7444.162", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -2712,10 +2712,10 @@ }, "src/electron": { "args": { - "hash": "sha256-mAAUslBt5xfVpAJ0pFIt0lPpKDYu2Xc2aWsaTlqN+6k=", + "hash": "sha256-uQHUCB+BLguP7GjP+iws5gowFpwYKHa/lIqxCVFM76g=", "owner": "electron", "repo": "electron", - "tag": "v39.1.2" + "tag": "v39.2.0" }, "fetcher": "fetchFromGitHub" }, @@ -2745,8 +2745,8 @@ }, "src/third_party/angle": { "args": { - "hash": "sha256-FWPyOxpsXvFtOD6OJ950NQUBcpVIeYvjuAKaqnER6A0=", - "rev": "e5b338502c7c65bd38d4695bc557938ca4cc3aa7", + "hash": "sha256-PM7msE9678QFyr7qp47Bc0vTntsSCeB/cirg9ME6TZk=", + "rev": "7b27cb13556246035dfc7b308702b1b20710df47", "url": "https://chromium.googlesource.com/angle/angle.git" }, "fetcher": "fetchFromGitiles" @@ -3991,8 +3991,8 @@ }, "src/v8": { "args": { - "hash": "sha256-SL9YaplMFA1Ez11bIzAfl/F5qQob/PvCP1uknP1LiLs=", - "rev": "4427aa4a9c14d3d542866c0ed2ae8a8554cfd68d", + "hash": "sha256-otYRT8scmJ9boG2PKXRacL0C5FFwOVctKK/Dh7WG0tU=", + "rev": "9210361d0a26fa4afefad8c5e60c85e59c5e2c8e", "url": "https://chromium.googlesource.com/v8/v8.git" }, "fetcher": "fetchFromGitiles" @@ -4001,6 +4001,6 @@ "electron_yarn_hash": "19mpwfjb85d9kw1awiymj47h06rjk6vxqcgfajh612cgwkbz4m6f", "modules": "140", "node": "22.21.1", - "version": "39.1.2" + "version": "39.2.0" } } From f35fb324fa5b46db76d73ad520426ced893e22f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Nov 2025 03:46:06 +0000 Subject: [PATCH 071/105] rekor-cli: 1.4.2 -> 1.4.3 --- pkgs/tools/security/rekor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index 7841745b93d6..46eeeb5a15c9 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -15,13 +15,13 @@ let }: buildGoModule rec { inherit pname; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - hash = "sha256-ILHFITlcT/2szSOuPoQZkont8GRMYXCAmMwEqvMT/tE="; + hash = "sha256-EdEYjim3FDkc04uBYWFA8iPNJArHfjjioyUPCh7iwgw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -34,7 +34,7 @@ let ''; }; - vendorHash = "sha256-JOpqNwIR2SCuOAVQnSqX1PLaQW+Eh7YR1wK56byj94w="; + vendorHash = "sha256-kw6i9BzVTy6dJsIm8d4FPt7QeI+6AOqCfq3KhdQFuQ4="; nativeBuildInputs = [ installShellFiles ]; From a514ef1f2f66062e4791ca35583d20f6bc062084 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 23 Aug 2025 21:42:39 -0400 Subject: [PATCH 072/105] pdfium-binaries: 7087 -> 7363 --- pkgs/by-name/pd/pdfium-binaries/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index ae3ef3a350dd..7b96a89ba2d8 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdfium-binaries"; # also update rev of headers in python3Packages.pypdfium2 - version = "7087"; + version = "7363"; src = let @@ -28,17 +28,17 @@ stdenv.mkDerivation (finalAttrs: { hash = if withV8 then selectSystem { - x86_64-linux = "sha256-nKHXcBTEp165g18HLzaNGfKt8MtTYpKBGNgwIpSO0u4="; - aarch64-linux = "sha256-wip/ry42aDbyGiwYSUX8koxDuf88BLGZAmMZE0s+fL0="; - x86_64-darwin = "sha256-7pUMfNFgGqQ8Dnox57sHfrKKke+i8CGEma4tePJaTDA="; - aarch64-darwin = "sha256-o59kmTNC4nSCFLfww3E+4iIYs2kQ30yyFaX9f2Za7os="; + x86_64-linux = "sha256-KbAJUdbT3XjLs68y4xwEG5w8o/89epkXSCKpQsyuNec="; + aarch64-linux = "sha256-zvaTKszH5yT1afzs0W3LV1caN6gaCIJiKIh9bElfI48="; + x86_64-darwin = "sha256-xGnmndTkYSIGn44Y4cfYW36QmkVAOhgIlcsWaRYFbCk="; + aarch64-darwin = "sha256-NYY/YIVtSux4B6UZb7kkZs+GzxXNopmvtknw/HhVEQs="; } else selectSystem { - x86_64-linux = "sha256-zn7QlTvChQa2mQCe5K+zEGVUtuD+l/jEtlKticrrSKg="; - aarch64-linux = "sha256-080X72NNfKaanHeVtmxE/4uNV6Ue4f/1Mri/p3nOT8c="; - x86_64-darwin = "sha256-XMStU0MN9ieCrLQnQL4/jKrNWxgQl9OtZHg9EmemPhU="; - aarch64-darwin = "sha256-Q8R/p1hX6+JeVTFc6w7MC9GPNGqxlu6m+iawRIMndic="; + x86_64-linux = "sha256-mlSmVeE1oDQ1OlW8K7EXk51r7GCbDXH2l/tbat2aiB0="; + aarch64-linux = "sha256-YiCMdwQ2Y0F120iKW3ZkxJKvDgP/vpPw1ItmRnsnz9U="; + x86_64-darwin = "sha256-I2fWQC+GKzZwqTPwXkl9vDJ/HIH3GKzD+kNaUDcNKuw="; + aarch64-darwin = "sha256-AhYAr5SySWJO3jbvs+DvEZ/WaCJ+KhxpFVyOVsJxuXE="; }; stripRoot = false; }; From 0a89c97fd8a6fa913734236523b0fea5af05a2ba Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 25 Aug 2025 19:32:27 -0400 Subject: [PATCH 073/105] python313Packages.zebrafy: handle pypdfium2 5.x --- pkgs/development/python-modules/zebrafy/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/zebrafy/default.nix b/pkgs/development/python-modules/zebrafy/default.nix index c3bf90c078f0..b68ac63bdd6f 100644 --- a/pkgs/development/python-modules/zebrafy/default.nix +++ b/pkgs/development/python-modules/zebrafy/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, setuptools, setuptools-scm, pillow, @@ -22,6 +23,14 @@ buildPythonPackage rec { hash = "sha256-B8jrFQh5swDMfYjdMcY0Hh2VAzknDwarDKVAML6F2r4="; }; + patches = [ + # fix compatibility with pypdfium2 5.x: https://github.com/miikanissi/zebrafy/pull/20 + (fetchpatch { + url = "https://github.com/miikanissi/zebrafy/pull/20/commits/cc15c4a28d9e8aec022d22397ff752600b9ede52.patch"; + hash = "sha256-KAjfKPqmTvfoQN7YPLayPyq2sueDASyU/lMCgLCl1RU="; + }) + ]; + build-system = [ setuptools setuptools-scm From fbf2b41342f138a22a4c336b0ddadf2c5545b736 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 23 Aug 2025 21:45:02 -0400 Subject: [PATCH 074/105] python313Packages.pypdfium2: 4.30.1 -> 5.0.0 --- pkgs/by-name/pd/pdfium-binaries/package.nix | 1 - .../python-modules/pypdfium2/default.nix | 81 +++++-------------- .../pypdfium2/fix-cc-detection.patch | 25 ------ 3 files changed, 18 insertions(+), 89 deletions(-) delete mode 100644 pkgs/development/python-modules/pypdfium2/fix-cc-detection.patch diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index 7b96a89ba2d8..b61b8b12d42f 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdfium-binaries"; - # also update rev of headers in python3Packages.pypdfium2 version = "7363"; src = diff --git a/pkgs/development/python-modules/pypdfium2/default.nix b/pkgs/development/python-modules/pypdfium2/default.nix index 8a566a791873..5acd2148dcce 100644 --- a/pkgs/development/python-modules/pypdfium2/default.nix +++ b/pkgs/development/python-modules/pypdfium2/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, - pkgs, + pkgsCross, buildPythonPackage, fetchFromGitHub, - fetchgit, gitUpdater, setuptools-scm, pdfium-binaries, @@ -13,22 +12,9 @@ pytestCheckHook, removeReferencesTo, python, - replaceVars, }: let - pdfiumVersion = "${pdfium-binaries.version}"; - - headers = fetchgit { - url = "https://pdfium.googlesource.com/pdfium"; - # The latest revision on the chromium/${pdfiumVersion} branch - rev = "9232d7c94a0007377a8034222f47683fe391d474"; - hash = "sha256-dI3jTyVYc0EmMLHTiVjGSf3C2noS9Ru5WijEJFtiSFk="; - sparseCheckout = [ - "public" - ]; - }; - # They demand their own fork of ctypesgen ctypesgen = buildPythonPackage rec { pname = "ctypesgen"; @@ -38,34 +24,26 @@ let src = fetchFromGitHub { owner = "pypdfium2-team"; repo = "ctypesgen"; - rev = "848e9fbb1374f7f58a7ebf5e5da5c33292480b30"; - hash = "sha256-3JA7cW/xaEj/DxMHEypROwrKGo7EwUEcipRqALTvydw="; + rev = "3961621c3e057015362db82471e07f3a57822b15"; + hash = "sha256-0OBY7/Zn12rG20jNYG65lANTRVRIFvE0SgUdYGFpRtU="; }; - patches = [ - (replaceVars ./fix-cc-detection.patch { - cc = "${stdenv.cc.targetPrefix}cc"; - }) - ]; - build-system = [ setuptools-scm ]; - - env.SETUPTOOLS_SCM_PRETEND_VERSION = "${version}"; }; in buildPythonPackage rec { pname = "pypdfium2"; - version = "4.30.1"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "pypdfium2-team"; repo = "pypdfium2"; tag = version; - hash = "sha256-v8f/XruGJYK3H9z4Q1rLg4fEnPHa8tTOlNTBMVxPEgA="; + hash = "sha256-to6l8kfi6pYRs+hv+9zdxpSyhKCxX79G/EMdz6OBBaA="; }; build-system = [ @@ -81,43 +59,19 @@ buildPythonPackage rec { pdfium-binaries ]; - # Build system insists on fetching from the internet unless "cached" files - # are prepared. Even then, some code patching needs to happen to make it not - # talk to the internet. + preBuild = '' + getVersion() { + cat ${pdfium-binaries}/VERSION | grep $1 | sed 's/.*=//' + } + export GIVEN_FULLVER="$(getVersion MAJOR).$(getVersion MINOR).$(getVersion BUILD).$(getVersion PATCH)" + ''; - # The project doesn't seem very open to allow for offline building either, - # see: https://github.com/pypdfium2-team/pypdfium2/discussions/274 - preBuild = - let - pdfiumLib = lib.makeLibraryPath [ pdfium-binaries ]; - inputVersionFile = (pkgs.formats.json { }).generate "version.json" { - version = lib.strings.toInt pdfiumVersion; - source = "generated"; - flags = [ ]; - run_lds = [ pdfiumLib ]; - guard_symbols = false; - }; - bindingsDir = "data/bindings"; - headersDir = "${bindingsDir}/headers"; - versionFile = "${bindingsDir}/version.json"; - in - '' - # Preseed the headers and version file - mkdir -p ${bindingsDir} - cp -r ${headers}/public ${headersDir} - install -m 644 ${inputVersionFile} ${versionFile} - - # Make generated bindings consider pdfium derivation path when loading dynamic libraries - substituteInPlace setupsrc/pypdfium2_setup/emplace.py \ - --replace-fail 'build_pdfium_bindings(pdfium_ver, flags=flags, guard_symbols=True, run_lds=[])' \ - 'build_pdfium_bindings(pdfium_ver, flags=flags, guard_symbols=True, run_lds=["${pdfiumLib}"])' - - # Short circuit the version pull from the internet - substituteInPlace setupsrc/pypdfium2_setup/packaging_base.py \ - --replace-fail 'PdfiumVer.to_full(build)._asdict()' \ - '{"major": 133, "minor": 0, "build": ${pdfiumVersion}, "patch": 1}' - ''; - env.PDFIUM_PLATFORM = "system:${pdfiumVersion}"; + env = { + PDFIUM_PLATFORM = "system-search:${pdfium-binaries.version}"; + PDFIUM_HEADERS = "${pdfium-binaries}/include"; + PDFIUM_BINARY = "${pdfium-binaries}/lib/libpdfium${stdenv.targetPlatform.extensions.sharedLibrary}"; + CPP = "${stdenv.cc.targetPrefix}cpp"; + }; # Remove references to stdenv in comments. postInstall = '' @@ -138,6 +92,7 @@ buildPythonPackage rec { updateScript = gitUpdater { allowedVersions = "^[.0-9]+$"; }; + tests.cross = pkgsCross.aarch64-multiplatform.python3Packages.pypdfium2; }; meta = { diff --git a/pkgs/development/python-modules/pypdfium2/fix-cc-detection.patch b/pkgs/development/python-modules/pypdfium2/fix-cc-detection.patch deleted file mode 100644 index e01cc90901f5..000000000000 --- a/pkgs/development/python-modules/pypdfium2/fix-cc-detection.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/ctypesgen/__main__.py b/src/ctypesgen/__main__.py -index 23ee014..2d0cfc1 100644 ---- a/src/ctypesgen/__main__.py -+++ b/src/ctypesgen/__main__.py -@@ -89,17 +89,9 @@ def main_impl(args, cmd_str): - assert _is_relative_to(args.output, args.linkage_anchor) - - if args.cpp: -- assert shutil.which(args.cpp[0]), f"Given pre-processor {args.cpp[0]!r} is not available." -- else: -- if shutil.which("gcc"): -- args.cpp = ["gcc", "-E"] -- elif shutil.which("cpp"): -- args.cpp = ["cpp"] -- elif shutil.which("clang"): -- args.cpp = ["clang", "-E"] -- else: -- raise RuntimeError("C pre-processor auto-detection failed: neither gcc nor clang available.") -- -+ print("cpp argument ignored for nix build") -+ args.cpp = ["@cc@", "-E"] -+ - # Important: must not use +=, this would mutate the original object, which is problematic when default=[] is used and ctypesgen called repeatedly from within python - args.compile_libdirs = args.compile_libdirs + args.universal_libdirs - args.runtime_libdirs = args.runtime_libdirs + args.universal_libdirs From 1699b73734dc04b81e880d8997bb06f2e6eca812 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 Nov 2025 17:22:26 +0100 Subject: [PATCH 075/105] victoriatraces: 0.2.0 -> 0.5.0, add myself as maintainer ChangeLogs: * https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/v0.3.0 * https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/v0.4.0 * https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/v0.4.1 * https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/v0.5.0 --- pkgs/by-name/vi/victoriatraces/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/vi/victoriatraces/package.nix b/pkgs/by-name/vi/victoriatraces/package.nix index 6c18d0ca0035..91f273e34550 100644 --- a/pkgs/by-name/vi/victoriatraces/package.nix +++ b/pkgs/by-name/vi/victoriatraces/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaTraces"; - version = "0.2.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaTraces"; tag = "v${finalAttrs.version}"; - hash = "sha256-b4/ix191xtW2HpczfRbez2gibgGx7jBRm0hvuP/rTpA="; + hash = "sha256-jmcwn2/UB87wOBCHvquHIgc+a/sCXnxC63nddlZuSL0="; }; vendorHash = null; @@ -31,12 +31,6 @@ buildGoModule (finalAttrs: { ++ lib.optionals withVtStorage [ "app/vtstorage" ] ++ lib.optionals withVtGen [ "app/vtgen" ]; - postPatch = '' - # Allow older go versions - substituteInPlace go.mod \ - --replace-fail "go 1.24.6" "go ${finalAttrs.passthru.go.version}" - ''; - ldflags = [ "-s" "-w" @@ -56,7 +50,10 @@ buildGoModule (finalAttrs: { homepage = "https://docs.victoriametrics.com/victoriatraces/"; description = "Fast open-source observability solution for distributed traces"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cmacrae ]; + maintainers = with lib.maintainers; [ + cmacrae + ma27 + ]; changelog = "https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/${finalAttrs.src.tag}"; mainProgram = "victoria-traces"; }; From 5253f892280272d395c42e2289914b8c231a7b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 15 Nov 2025 09:41:53 +0100 Subject: [PATCH 076/105] thunderbird: 144.0.1 -> 145.0 https://www.thunderbird.net/en-US/thunderbird/145.0/releasenotes/ --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 2daec752a2ff..8886b8f7c368 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -86,8 +86,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "144.0.1"; - sha512 = "e1859ecd247260c9303a335d14f51d2b80bca7fe0125c41cf6f6bdf1331072dcef490d75fba588b37db5410ce2e7084bbe1c8f568d40c46303891ae2bfbe431c"; + version = "145.0"; + sha512 = "f33835e4d740b32d072ac915124d988ef9d4cbe55d7c972c817991d19b64e8bc95b75b503ad3cb9abf4fd1d220fc7cb61720ea84dc49482faa13da1690d7d80e"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; From 557ed833c8e32acd6d30ca507bc65a22be145af2 Mon Sep 17 00:00:00 2001 From: "M. Ian Graham" Date: Sat, 15 Nov 2025 19:11:22 +0900 Subject: [PATCH 077/105] ytdl-sub: pin to ffmpeg 7 to fix build --- pkgs/by-name/yt/ytdl-sub/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 2578b4b3fcd3..2815ce3114d6 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -1,7 +1,7 @@ { python3Packages, fetchFromGitHub, - ffmpeg, + ffmpeg_7, lib, versionCheckHook, }: @@ -38,8 +38,8 @@ python3Packages.buildPythonApplication rec { ]; makeWrapperArgs = [ - "--set YTDL_SUB_FFMPEG_PATH ${lib.getExe' ffmpeg "ffmpeg"}" - "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg "ffprobe"}" + "--set YTDL_SUB_FFMPEG_PATH ${lib.getExe' ffmpeg_7 "ffmpeg"}" + "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg_7 "ffprobe"}" ]; nativeCheckInputs = [ @@ -49,8 +49,8 @@ python3Packages.buildPythonApplication rec { versionCheckProgramArg = "--version"; env = { - YTDL_SUB_FFMPEG_PATH = "${lib.getExe' ffmpeg "ffmpeg"}"; - YTDL_SUB_FFPROBE_PATH = "${lib.getExe' ffmpeg "ffprobe"}"; + YTDL_SUB_FFMPEG_PATH = "${lib.getExe' ffmpeg_7 "ffmpeg"}"; + YTDL_SUB_FFPROBE_PATH = "${lib.getExe' ffmpeg_7 "ffprobe"}"; }; disabledTests = [ From 69ed2ad938275a09718286090ae9881f023c3e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Sat, 15 Nov 2025 11:34:24 +0100 Subject: [PATCH 078/105] nvidia-container-toolkit: 1.17.9 -> 1.18.0 --- pkgs/by-name/nv/nvidia-container-toolkit/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix index 72e377fd7f42..b1175fc571b4 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix @@ -13,13 +13,13 @@ let in buildGoModule (finalAttrs: { pname = "nvidia-container-toolkit"; - version = "1.17.9"; + version = "1.18.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-container-toolkit"; tag = "v${finalAttrs.version}"; - hash = "sha256-kcE4yDoj+CFbMy0N5v8ImxjZMJ/o5/LaAVVV1M7qGiw="; + hash = "sha256-VQcuN+LU7iljpSWrmLBHX67esEQN1HYNPj5cLxUB7dI="; }; @@ -41,9 +41,6 @@ buildGoModule (finalAttrs: { --replace-fail '/usr/bin/nvidia-container-runtime-hook' "$tools/bin/nvidia-container-runtime-hook" \ --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' - substituteInPlace tools/container/toolkit/toolkit.go \ - --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' - substituteInPlace cmd/nvidia-cdi-hook/update-ldcache/update-ldcache.go \ --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' ''; From 040ab8d5f32bf6f99e343c6b78ac980d1f201bb4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 15 Nov 2025 11:56:01 +0000 Subject: [PATCH 079/105] installShellFiles.section.md: fix `unde[r]sirable` typo --- doc/hooks/installShellFiles.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md index 14cf63eb98e2..5400ccc7bf89 100644 --- a/doc/hooks/installShellFiles.section.md +++ b/doc/hooks/installShellFiles.section.md @@ -42,7 +42,7 @@ The manpages must have a section suffix, and may optionally be compressed (with { nativeBuildInputs = [ installShellFiles ]; - # Sometimes the manpage file has an undersirable name; e.g., it conflicts with + # Sometimes the manpage file has an undesirable name; e.g., it conflicts with # another software with an equal name. To install it with a different name, # the installed name must be provided before the path to the file. # From 54dcb2f353476fdd2f7b6b8dbc7f26e77ab63608 Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Fri, 25 Jul 2025 12:51:24 +0000 Subject: [PATCH 080/105] python3Packages.flash-attn: init at 2.8.2 --- .../python-modules/flash-attn/default.nix | 75 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/development/python-modules/flash-attn/default.nix diff --git a/pkgs/development/python-modules/flash-attn/default.nix b/pkgs/development/python-modules/flash-attn/default.nix new file mode 100644 index 000000000000..bfedc4364f03 --- /dev/null +++ b/pkgs/development/python-modules/flash-attn/default.nix @@ -0,0 +1,75 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + einops, + ninja, + setuptools, + symlinkJoin, + torch, +}: + +let + inherit (torch) cudaCapabilities cudaPackages cudaSupport; + inherit (cudaPackages) backendStdenv; +in +buildPythonPackage rec { + pname = "flash-attention"; + version = "2.8.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Dao-AILab"; + repo = "flash-attention"; + tag = "v${version}"; + hash = "sha256-iHxfDh+rGanhymP5F7g8rQcQUlP0oXliVF+y+ur/iJ0="; + fetchSubmodules = true; + }; + + preConfigure = '' + export MAX_JOBS="$NIX_BUILD_CORES" + export NVCC_THREADS="$NIX_BUILD_CORES" + ''; + + env = lib.optionalAttrs cudaSupport { + FLASH_ATTENTION_SKIP_CUDA_BUILD = "FALSE"; + CC = "${backendStdenv.cc}/bin/cc"; + CXX = "${backendStdenv.cc}/bin/c++"; + TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}"; + }; + + build-system = [ + ninja + setuptools + cudaPackages.cuda_nvcc + ]; + + buildInputs = [ + cudaPackages.cuda_cccl # + cudaPackages.libcublas # cublas_v2.h + cudaPackages.libcurand # curand.h + cudaPackages.libcusolver # cusolverDn.h + cudaPackages.libcusparse # cusparse.h + cudaPackages.cuda_cudart # cuda_runtime.h cuda_runtime_api.h + ]; + + dependencies = [ + einops + torch + ]; + + # Requires NVIDIA driver. + doCheck = false; + + pythonImportsCheck = [ "flash_attn" ]; + + meta = { + # Upstream requires either CUDA or ROCm. Couldn't get it to work with ROCm for now. + broken = !cudaSupport; + description = "Official implementation of FlashAttention and FlashAttention-2"; + homepage = "https://github.com/Dao-AILab/flash-attention/"; + changelog = "https://github.com/Dao-AILab/flash-attention/releases/tag/${src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jherland ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f22805eed7cc..1ee69e40b6ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5321,6 +5321,8 @@ self: super: with self; { flasgger = callPackage ../development/python-modules/flasgger { }; + flash-attn = callPackage ../development/python-modules/flash-attn { }; + flashinfer = callPackage ../development/python-modules/flashinfer { }; flashtext = callPackage ../development/python-modules/flashtext { }; From 8fb8721af3595e965798bcde24cd2ddece6b88f0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 7 Nov 2025 20:27:48 +0800 Subject: [PATCH 081/105] pantheon.gala: 8.2.5 -> 8.3.0 https://github.com/elementary/gala/compare/8.2.5...8.3.0 --- .../pantheon/desktop/gala/default.nix | 40 ++++++++----------- .../pantheon/desktop/gala/plugins-dir.patch | 21 ---------- 2 files changed, 17 insertions(+), 44 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 33258d0a87f4..61d6d2775542 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, desktop-file-utils, gettext, libxml2, @@ -11,7 +10,7 @@ pkg-config, vala, wayland-scanner, - wrapGAppsHook3, + wrapGAppsHook4, at-spi2-core, gnome-settings-daemon, gnome-desktop, @@ -19,7 +18,6 @@ granite7, gtk3, gtk4, - libcanberra, libgee, libhandy, mutter, @@ -30,28 +28,15 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "8.2.5"; + version = "8.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = "gala"; - rev = version; - hash = "sha256-uupFeQ73hr6ziLEtzgVJWASUxhspXJX54/U+3PLSCFY="; + tag = version; + hash = "sha256-omsAOOZCQINLTZQg3Sew+p84jv8+R2cHSVtcHFIeUBI="; }; - patches = [ - # We look for plugins in `/run/current-system/sw/lib/` because - # there are multiple plugin providers (e.g. gala and wingpanel). - ./plugins-dir.patch - - # Fix gtk3 daemon menu location with x2 scaling - # https://github.com/elementary/gala/pull/2493 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/33bc3ebe7f175c61845feaf2d06083f1e3b64ddc.patch"; - hash = "sha256-hjjiKcO5o/OABKD8vUsVyqtNKN4ffEOGZntLceLr2+k="; - }) - ]; - depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ @@ -63,7 +48,7 @@ stdenv.mkDerivation rec { pkg-config vala wayland-scanner - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ @@ -72,9 +57,8 @@ stdenv.mkDerivation rec { gnome-desktop granite granite7 - gtk3 - gtk4 # gala-daemon - libcanberra + gtk3 # daemon-gtk3 + gtk4 libgee libhandy mutter @@ -82,6 +66,16 @@ stdenv.mkDerivation rec { systemd ]; + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "conf.set('PLUGINDIR', plugins_dir)" "conf.set('PLUGINDIR','/run/current-system/sw/lib/gala/plugins')" + ''; + + mesonFlags = [ + # https://github.com/elementary/gala/commit/1e75d2a4b42e0d853fd474e90f1a52b0bcd0f690 + "-Dold-icon-groups=true" + ]; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch b/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch deleted file mode 100644 index b0e72bbe1ab7..000000000000 --- a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/meson.build b/meson.build -index d0f00e5..977d2e2 100644 ---- a/meson.build -+++ b/meson.build -@@ -25,6 +25,7 @@ vapi_dir = meson.current_source_dir() / 'vapi' - locale_dir = join_paths(get_option('prefix'), get_option('localedir')) - data_dir = join_paths(get_option('prefix'), get_option('datadir')) - plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins') -+plugins_dir_for_build = join_paths('/run/current-system/sw/lib/', meson.project_name(), 'plugins') - pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) - pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name()) - -@@ -33,7 +34,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) - conf.set_quoted('LOCALEDIR', locale_dir) - conf.set_quoted('DATADIR', data_dir) - conf.set_quoted('PKGDATADIR', pkgdata_dir) --conf.set_quoted('PLUGINDIR', plugins_dir) -+conf.set_quoted('PLUGINDIR', plugins_dir_for_build) - conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala') - conf.set_quoted('VERSION', gala_version) - conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala') From 543c7eabb890c450b65215a0ce2959e2ec8696b7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 7 Nov 2025 21:11:04 +0800 Subject: [PATCH 082/105] pantheon.wingpanel: Fix build with gala 8.3.0 --- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 2288d8908232..51e5620f3f8d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, nix-update-script, wayland-scanner, wrapGAppsHook3, @@ -35,6 +36,13 @@ stdenv.mkDerivation rec { patches = [ ./indicators.patch + + # Fix build with gala 8.3.0 + # https://github.com/elementary/wingpanel/pull/642 + (fetchpatch { + url = "https://github.com/elementary/wingpanel/commit/4476df2573797310e254695a66c099b32afe9736.patch"; + hash = "sha256-99zzXbaeW/ijqPXN7tQexMPWsUW4pX7e0tcxASBVbvI="; + }) ]; depsBuildBuild = [ From 9c9c20922fb4194a8286b071801c43849085c033 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 15 Nov 2025 19:37:07 +0800 Subject: [PATCH 083/105] pantheon.elementary-notifications: 8.1.0 -> 8.1.1 https://github.com/elementary/notifications/compare/8.1.0...8.1.1 --- .../elementary-notifications/default.nix | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 29786e6ef51d..f3c77bfff64e 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -7,42 +7,48 @@ ninja, pkg-config, vala, - gtk3, + gtk4, glib, - granite, - libgee, - libhandy, - libcanberra-gtk3, - wrapGAppsHook3, + granite7, + libadwaita, + libcanberra, + wayland-scanner, + wrapGAppsHook4, }: stdenv.mkDerivation rec { pname = "elementary-notifications"; - version = "8.1.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = "notifications"; - rev = version; - sha256 = "sha256-2+LV3O2V42gI+ysVoeO9KpLqmAj/Zk5F8LzO2RNZ1ZY="; + tag = version; + hash = "sha256-V884jv7bleDMsuZDkodyeNBhStIoNPNxfT6mz1YjHXE="; }; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ glib # for glib-compile-schemas meson ninja pkg-config vala - wrapGAppsHook3 + wayland-scanner + wrapGAppsHook4 ]; buildInputs = [ glib - granite - gtk3 - libcanberra-gtk3 - libgee - libhandy + granite7 + gtk4 + libadwaita + libcanberra ]; passthru = { From 0e7d61818afd3d4ceaff015026896e098e26ef3a Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 15 Nov 2025 13:41:24 +0100 Subject: [PATCH 084/105] cmus: pin to ffmpeg 7 to fix build Fixes: https://hydra.nixos.org/build/313309980 ZHF: #457852 Signed-off-by: Marcin Serwin --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17c0f242d5f6..1ee567d3b816 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10735,6 +10735,7 @@ with pkgs; cmus = callPackage ../applications/audio/cmus { libjack = libjack2; + ffmpeg = ffmpeg_7; }; cni = callPackage ../applications/networking/cluster/cni { }; From b21fe8378a071beff146fd1d9134bf092a5b7568 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 15 Nov 2025 19:49:51 +0800 Subject: [PATCH 085/105] pantheon: Remove onscreen keyboard settings We no longer ship Pantheon X11 session in NixOS, this won't happen upstream before elementary OS 9, so patch here for now. --- .../switchboard-plugs/keyboard/default.nix | 8 ++++-- .../keyboard/fix-paths.patch | 13 ---------- .../hide-onscreen-keyboard-settings.patch | 12 +++++++++ .../elementary-session-settings/default.nix | 12 ++++----- ...ssh-autostart.patch => no-autostart.patch} | 7 +++--- .../quick-settings/default.nix | 7 ++++++ .../hide-onscreen-keyboard-settings.patch | 25 +++++++++++++++++++ 7 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-onscreen-keyboard-settings.patch rename pkgs/desktops/pantheon/desktop/elementary-session-settings/{no-gnome-keyring-ssh-autostart.patch => no-autostart.patch} (78%) create mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/hide-onscreen-keyboard-settings.patch diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index bf6b223048df..02c487cdb56b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -20,7 +20,6 @@ libgnomekbd, libxklavier, ibus, - onboard, switchboard, }: @@ -40,8 +39,13 @@ stdenv.mkDerivation rec { # https://github.com/elementary/settings-keyboard/issues/324 ./hide-install-unlisted-engines-button.patch + # We no longer ship Pantheon X11 session in NixOS. + # https://github.com/elementary/session-settings/issues/91 + # https://github.com/elementary/session-settings/issues/82 + ./hide-onscreen-keyboard-settings.patch + (replaceVars ./fix-paths.patch { - inherit onboard libgnomekbd; + inherit libgnomekbd; }) ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch index e88453433c07..fe380a098c15 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch @@ -1,16 +1,3 @@ -diff --git a/src/Behavior/Behavior.vala b/src/Behavior/Behavior.vala -index bd461685..b6371096 100644 ---- a/src/Behavior/Behavior.vala -+++ b/src/Behavior/Behavior.vala -@@ -252,7 +252,7 @@ public class Keyboard.Behaviour.Page : Gtk.Box { - - onscreen_keyboard_settings.clicked.connect (() => { - try { -- var appinfo = GLib.AppInfo.create_from_commandline ("onboard-settings", null, NONE); -+ var appinfo = GLib.AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, NONE); - appinfo.launch (null, null); - } catch (Error e) { - critical ("Unable to launch onboard-settings: %s", e.message); diff --git a/src/Layout/Widgets/AddLayoutDialog.vala b/src/Layout/Widgets/AddLayoutDialog.vala index 25cc0fe9..b3e350bb 100644 --- a/src/Layout/Widgets/AddLayoutDialog.vala diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-onscreen-keyboard-settings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-onscreen-keyboard-settings.patch new file mode 100644 index 000000000000..4b64f4b93c29 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-onscreen-keyboard-settings.patch @@ -0,0 +1,12 @@ +diff --git a/src/Behavior/Behavior.vala b/src/Behavior/Behavior.vala +index a1929fe4..2f332694 100644 +--- a/src/Behavior/Behavior.vala ++++ b/src/Behavior/Behavior.vala +@@ -227,7 +227,6 @@ public class Keyboard.Behaviour.Page : Gtk.Box { + blink_grid.attach (scale_blink_time, 1, 2); + + var box = new Gtk.Box (VERTICAL, 18); +- box.append (onscreen_keyboard_grid); + box.append (blink_grid); + box.append (repeat_grid); + box.append (stickykeys_grid); diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 6af460863614..5fc4c8bfd7bd 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -31,13 +31,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-mdfmCzR9ikXDlDc7FeOITsdbPbz+G66jUrl1BobY+g8="; }; - /* - This allows `elementary-session-settings` to not use gnome-keyring's ssh capabilities anymore, as they have been - moved to gcr upstream, in an effort to modularize gnome-keyring. - - More info can be found here: https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/60 - */ - patches = [ ./no-gnome-keyring-ssh-autostart.patch ]; + patches = [ + # See https://github.com/elementary/session-settings/issues/88 for gnome-keyring. + # See https://github.com/elementary/session-settings/issues/82 for onboard. + ./no-autostart.patch + ]; nativeBuildInputs = [ desktop-file-utils diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/no-gnome-keyring-ssh-autostart.patch b/pkgs/desktops/pantheon/desktop/elementary-session-settings/no-autostart.patch similarity index 78% rename from pkgs/desktops/pantheon/desktop/elementary-session-settings/no-gnome-keyring-ssh-autostart.patch rename to pkgs/desktops/pantheon/desktop/elementary-session-settings/no-autostart.patch index 97682c5b3778..0efa2f65d8da 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/no-gnome-keyring-ssh-autostart.patch +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/no-autostart.patch @@ -1,12 +1,13 @@ diff --git a/session/meson.build b/session/meson.build -index 501e836..3254658 100644 +index 3e23650..e1f9792 100644 --- a/session/meson.build +++ b/session/meson.build -@@ -79,7 +79,6 @@ if get_option('detect-program-prefixes') == true +@@ -79,8 +79,6 @@ if get_option('detect-program-prefixes') == true autostarts = { 'gnome-keyring-pkcs11': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-pkcs11.desktop'), 'gnome-keyring-secrets': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-secrets.desktop'), - 'gnome-keyring-ssh': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-ssh.desktop'), - 'onboard-autostart': join_paths(onboard_prefix, 'etc/xdg/autostart', 'onboard-autostart.desktop'), +- 'onboard-autostart': join_paths(onboard_prefix, 'etc/xdg/autostart', 'onboard-autostart.desktop'), 'orca-autostart': join_paths(orca_prefix, 'etc/xdg/autostart', 'orca-autostart.desktop'), } + else diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix index 303d77e16b95..4238cbc77c9d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix @@ -32,6 +32,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-82XlZDnXuUB0PPmInrSQh1vrwnOYt9RplKWwYxIirVo="; }; + patches = [ + # We no longer ship Pantheon X11 session in NixOS. + # https://github.com/elementary/session-settings/issues/91 + # https://github.com/elementary/session-settings/issues/82 + ./hide-onscreen-keyboard-settings.patch + ]; + nativeBuildInputs = [ glib # glib-compile-resources meson diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/hide-onscreen-keyboard-settings.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/hide-onscreen-keyboard-settings.patch new file mode 100644 index 000000000000..a8ddaa47da59 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/hide-onscreen-keyboard-settings.patch @@ -0,0 +1,25 @@ +diff --git a/src/PopoverWidget.vala b/src/PopoverWidget.vala +index 9dd331c..438fbe0 100644 +--- a/src/PopoverWidget.vala ++++ b/src/PopoverWidget.vala +@@ -123,7 +123,6 @@ public class QuickSettings.PopoverWidget : Gtk.Box { + + if (server_type == GREETER || glib_settings.get_boolean ("show-a11y")) { + toggle_box.add (screen_reader); +- toggle_box.add (onscreen_keyboard); + + scale_box.add (text_scale); + } +@@ -131,12 +130,10 @@ public class QuickSettings.PopoverWidget : Gtk.Box { + glib_settings.changed["show-a11y"].connect (() => { + if (glib_settings.get_boolean ("show-a11y") && screen_reader.parent == null) { + toggle_box.add (screen_reader); +- toggle_box.add (onscreen_keyboard); + + scale_box.add (text_scale); + } else { + toggle_box.remove (screen_reader); +- toggle_box.remove (onscreen_keyboard); + + scale_box.remove (text_scale); + } From ff28035782d6212fa57c91feb8db3481c7331d4c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 15 Nov 2025 19:56:51 +0800 Subject: [PATCH 086/105] nixos/pantheon: Do not install onboard by default --- nixos/modules/services/desktop-managers/pantheon.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix index 9eca235f8740..adbda8212e8c 100644 --- a/nixos/modules/services/desktop-managers/pantheon.nix +++ b/nixos/modules/services/desktop-managers/pantheon.nix @@ -226,7 +226,6 @@ in gnome-menus adwaita-icon-theme gtk3.out # for gtk-launch program - onboard sound-theme-freedesktop xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ]) From b7fe69eefaf8e3fa7e53ebca56cf78db82ab9986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Sat, 15 Nov 2025 12:37:19 +0100 Subject: [PATCH 087/105] kallisto: fix failing build Co-authored-by: Tom --- pkgs/by-name/ka/kallisto/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ka/kallisto/package.nix b/pkgs/by-name/ka/kallisto/package.nix index 1a252345512e..a773fc881103 100644 --- a/pkgs/by-name/ka/kallisto/package.nix +++ b/pkgs/by-name/ka/kallisto/package.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-hfdeztEyHvuOnLS71oSv8sPqFe2UCX5KlANqrT/Gfx8="; }; + postPatch = '' + substituteInPlace CMakeLists.txt ext/bifrost/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ autoconf cmake From 07e7f6f517ff74ecbf56b2b262f37229c93ca8ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Nov 2025 14:08:21 +0100 Subject: [PATCH 088/105] python3Packages.aimodernfroms: allow local networking on darwin Fixes the test suite. --- pkgs/development/python-modules/aiomodernforms/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix index 1654ae5a92f3..bd3f05b94273 100644 --- a/pkgs/development/python-modules/aiomodernforms/default.nix +++ b/pkgs/development/python-modules/aiomodernforms/default.nix @@ -53,6 +53,8 @@ buildPythonPackage rec { "test_empty_response" ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "aiomodernforms" ]; meta = with lib; { From dc52cea1cdfb8f2028e3b14c267cd9cfb32ca469 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 11 Nov 2025 16:43:53 +0100 Subject: [PATCH 089/105] botan3: optionally expose botan-test and test vectors This binary together with its test-vectors can be used to perform self-tests of botan before its first usage in applications (necessary in some regulated environments). Signed-off-by: Markus Theil --- pkgs/by-name/bo/botan3/package.nix | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bo/botan3/package.nix b/pkgs/by-name/bo/botan3/package.nix index 04fdafff9153..696f35ff814b 100644 --- a/pkgs/by-name/bo/botan3/package.nix +++ b/pkgs/by-name/bo/botan3/package.nix @@ -21,6 +21,9 @@ # useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible withTpm2 ? false, policy ? null, + # create additional "selftests" output and put botan-test binary together with + # test vectors there. Useful to perform initial botan self-tests before using it + exposeSelftests ? false, }@args: assert lib.assertOneOf "policy" policy [ @@ -65,6 +68,9 @@ stdenv.mkDerivation (finalAttrs: { "dev" "doc" "man" + ] + ++ lib.optionals exposeSelftests [ + "selftests" ]; src = fetchurl { @@ -102,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { buildTargets = [ "cli" ] - ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ] + ++ lib.optionals (finalAttrs.finalPackage.doCheck || exposeSelftests) [ "tests" ] ++ lib.optionals static [ "static" ] ++ lib.optionals (!static) [ "shared" ]; @@ -156,10 +162,21 @@ stdenv.mkDerivation (finalAttrs: { fi ''; - postInstall = '' - cd "$out"/lib/pkgconfig - ln -s botan-*.pc botan.pc || true - ''; + postInstall = + lib.optionalString exposeSelftests '' + mkdir -p $selftests/bin + install -Dpm755 -D botan-test $selftests/bin/botan-test + + # don't copy leading source folder structure + pushd src/tests/data &> /dev/null + find . -type d -exec install -d $selftests/test-data/{} \; + find . -type f -exec install -Dpm644 {} $selftests/test-data/{} \; + popd &> /dev/null + '' + + '' + cd "$out"/lib/pkgconfig + ln -s botan-*.pc botan.pc || true + ''; doCheck = true; From 6f5d8c2782bf4fb102ee79f9181bc7c0c8aa6d20 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:33:02 +0100 Subject: [PATCH 090/105] python3Packages.cronsim: 2.6 -> 2.7 https://github.com/cuu508/cronsim/compare/2.6...2.7 --- pkgs/development/python-modules/cronsim/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix index d63b04f84d52..6793c4772a08 100644 --- a/pkgs/development/python-modules/cronsim/default.nix +++ b/pkgs/development/python-modules/cronsim/default.nix @@ -2,24 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "cronsim"; - version = "2.6"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "2.7"; + pyproject = true; src = fetchFromGitHub { owner = "cuu508"; repo = "cronsim"; tag = version; - hash = "sha256-WJ3v2cqAKZkXp1u8xJ0aFuyHPq0gn24DRxpnq5cH/90="; + hash = "sha256-9TextQcZAX5Ri6cc+Qd4T+u8XjxriqoTsy/9/G8XDAM="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cronsim" ]; From ee86b01c34ab6e3d64dd9b4080fee535d3b610f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:34:02 +0100 Subject: [PATCH 091/105] python3Packages.pyportainer: 1.0.12 -> 1.0.14 https://github.com/erwindouna/pyportainer/releases/tag/v1.0.14 --- .../python-modules/pyportainer/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix index e1f6d3bc459c..a3d20498dd38 100644 --- a/pkgs/development/python-modules/pyportainer/default.nix +++ b/pkgs/development/python-modules/pyportainer/default.nix @@ -3,7 +3,6 @@ aresponses, buildPythonPackage, fetchFromGitHub, - fetchpatch, lib, mashumaro, orjson, @@ -16,24 +15,16 @@ buildPythonPackage rec { pname = "pyportainer"; - version = "1.0.12"; + version = "1.0.14"; pyproject = true; src = fetchFromGitHub { owner = "erwindouna"; repo = "pyportainer"; tag = "v${version}"; - hash = "sha256-goTYZhv/+4o2/SMOqANMnR3u4YxwDJVcvT0pz8MT7M8="; + hash = "sha256-5ARTHT5NmRBMOMVRPWAICdScAGUbkebtLyJqUW195Mw="; }; - patches = [ - (fetchpatch { - name = "remove-mkdocs-from-dependencies.patch"; - url = "https://github.com/erwindouna/pyportainer/commit/8ed65c3870ff368465267e9bf2cda441b7b28994.patch"; - hash = "sha256-3FE8NngAajIt8lDjG//sDPULq8mZ0f53iVemJ2xJ4MQ="; - }) - ]; - build-system = [ poetry-core ]; dependencies = [ From b3465001d350a654c54d9836efd73bcca532d0a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:34:26 +0100 Subject: [PATCH 092/105] python3Packages.pysmartthings: 3.3.2 -> 3.3.3 https://github.com/andrewsayre/pysmartthings/releases/tag/v3.3.3 --- pkgs/development/python-modules/pysmartthings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix index ea4ae9fe74d8..7ee2fdb3334a 100644 --- a/pkgs/development/python-modules/pysmartthings/default.nix +++ b/pkgs/development/python-modules/pysmartthings/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pysmartthings"; - version = "3.3.2"; + version = "3.3.3"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "andrewsayre"; repo = "pysmartthings"; tag = "v${version}"; - hash = "sha256-8p9lEf+SoU1WRJxavUwUjlIKjQxcPyBsgVLcwv8XFHs="; + hash = "sha256-1fvgQE7p5R+Bq1O6wSHpPSIQI7pQRUXF+tXcTNLZ2II="; }; build-system = [ poetry-core ]; From 09b7b0228943f5db92946abab1921446252bc27e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:34:58 +0100 Subject: [PATCH 093/105] python3Packages.python-open-router: 0.3.2 -> 0.3.3 https://github.com/joostlek/python-open-router/releases/tag/v0.3.3 --- .../development/python-modules/python-open-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-open-router/default.nix b/pkgs/development/python-modules/python-open-router/default.nix index 72f389d779e3..33e360f36d28 100644 --- a/pkgs/development/python-modules/python-open-router/default.nix +++ b/pkgs/development/python-modules/python-open-router/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "python-open-router"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "joostlek"; repo = "python-open-router"; tag = "v${version}"; - hash = "sha256-SSpSoo82FD1KUwbZpeHpl9I4A50yuJmdTVaHDxLZXso="; + hash = "sha256-RFKtt8ViTIEBmahY9H9YhSdVSlxaBEPOxRWPST9GoAM="; }; build-system = [ poetry-core ]; From 3fe770ca615fe8351a0934cf8f28725a84606fd7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:35:40 +0100 Subject: [PATCH 094/105] python3Packages.pyvesync: 3.1.4 -> 3.2.2 https://github.com/webdjoe/pyvesync/releases/tag/3.2.2 --- pkgs/development/python-modules/pyvesync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 540d2ef158e3..f15dd2a49b3b 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "3.1.4"; + version = "3.2.2"; pyproject = true; src = fetchFromGitHub { owner = "webdjoe"; repo = "pyvesync"; tag = version; - hash = "sha256-l+b53B8Bdd/WnM2Oe9srST2T2KXaQfXtfc5+BwNte90="; + hash = "sha256-7QtyI5U1NRy0/iujfObdRHkwseetaD2M4f/buj8A9AY="; }; build-system = [ setuptools ]; From ba21ae9da90b69e43a6548a28574e7c60caf6dad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:36:09 +0100 Subject: [PATCH 095/105] python3Packages.reolink-aio: 0.16.4 -> 0.16.5 https://github.com/starkillerOG/reolink_aio/releases/tag/0.16.5 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 672408051747..928e61c5c420 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.16.4"; + version = "0.16.5"; pyproject = true; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-YRawVisHVDW4hm/oqxVNscC/99v02+mTqvmBwLC4l40="; + hash = "sha256-crQl7zNjLijv+e+frjssUSuXMGjdcja4B325lBCkBt8="; }; build-system = [ setuptools ]; From ad2f41260c59ca4c9f5647ee3fa025b5da90f75f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:37:10 +0100 Subject: [PATCH 096/105] python3Packages.zha-quirks: 0.0.148 -> 0.0.149 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.149 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index f4a8808bc500..6f4a4700861c 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.148"; + version = "0.0.149"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-A2+pBLPexQLMDE/feQ7mQ1bbzGBAXs/5GktOVn2D2JM="; + hash = "sha256-BAw7K4BrWEsMGcNpCVlcuG1ioiaTdEzBprtMnBton1Q="; }; postPatch = '' From e55256054d7ad8f18ff04f470283c9ff562c98c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:41:02 +0100 Subject: [PATCH 097/105] python3Packages.zha: 0.0.78 -> 0.0.79 https://github.com/zigpy/zha/releases/tag/0.0.79 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 4d4e4fcfceae..138144f0f89e 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.78"; + version = "0.0.79"; pyproject = true; disabled = pythonOlder "3.12"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-io97gvYtI6wsynWPGm2CAAYyDkMRTUSJwL4N56+sNhw="; + hash = "sha256-rM0Hu/MjMBeQSyZ6HsNmHXZmWFDr3cMi0QoHaL/fKto="; }; postPatch = '' From 927f8aa301eb0f8bc502c514784719eac58d2a74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Nov 2025 23:42:05 +0100 Subject: [PATCH 098/105] home-assistant: 2025.11.1 -> 2025.11.2 https://github.com/home-assistant/core/releases/tag/2025.11.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 30b5c5b44741..0b0986eb2f1b 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.11.1"; + version = "2025.11.2"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f215353f88d9..155209209811 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -4,6 +4,7 @@ callPackage, fetchFromGitHub, fetchPypi, + fetchpatch, python313, replaceVars, ffmpeg-headless, @@ -292,7 +293,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.11.1"; + hassVersion = "2025.11.2"; in python.pkgs.buildPythonApplication rec { @@ -313,13 +314,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-39OY9lKlqnv3QdIdJ698cMTBrF41SxbqQfz6N32mD5s="; + hash = "sha256-o4rpdnO/TslJWRj7HwTyWOS0NBVOfAeDfWiYvlx/jhw="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-W9xuWfz9lCQXaPg+O313mzMxvBfY64CrU7vwNjra/3k="; + hash = "sha256-j10a2GSnFau6KYMpFrFCrCTqsmy/D5p6BwQMvlOEe+w="; }; build-system = with python.pkgs; [ @@ -345,6 +346,12 @@ python.pkgs.buildPythonApplication rec { (replaceVars ./patches/ffmpeg-path.patch { ffmpeg = "${lib.getExe ffmpeg-headless}"; }) + + (fetchpatch { + # [2025.11.2] fix matter snapshots + url = "https://github.com/home-assistant/core/commit/04458e01be0748c3f6c980e126d5238d1ca915b6.patch"; + hash = "sha256-gzc0KmSZhOfHVRhIVmOTFTJMI+pAX+8LcOit4JUypyA="; + }) ]; postPatch = '' From 8861e676603ef754343183f01fae9e3f57ac8fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Nov 2025 22:31:40 -0800 Subject: [PATCH 099/105] python3Packages.homeassistant-stubs: 2025.11.1 -> 2025.11.2 Diff: https://github.com/KapJI/homeassistant-stubs/compare/2025.11.1...2025.11.2 Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.11.2 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 33a2bd1a11a8..f889abc0db67 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.11.1"; + version = "2025.11.2"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-OuW2hsYQ/KvCiu1Hfq6g/nryQ5R0Th5GmoR574DMXfU="; + hash = "sha256-xsFbgrXPWwA9c764Jp7fjsUjaG+C03zpdot/+mRAKgA="; }; build-system = [ From 49b7b034ab9e96432f580a93fddc5654d43a92c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Nov 2025 15:53:47 +0100 Subject: [PATCH 100/105] home-assistant: pin xmltodict at 0.15.1 API changes in xmltodict 1.0 breaks the georss component dependencies. --- pkgs/servers/home-assistant/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 155209209811..adea8b1a0751 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -263,6 +263,18 @@ let }; }; + # xmltodict>=1.0 not compatible with georss-client and aio-georss-client + # https://github.com/exxamalte/python-aio-georss-client/issues/63 + xmltodict = super.xmltodict.overridePythonAttrs rec { + version = "0.15.1"; + src = fetchFromGitHub { + owner = "martinblech"; + repo = "xmltodict"; + tag = "v${version}"; + hash = "sha256-j3shoXjAoAWFd+7k+0w6eoNygS2wkbhDkIq7QG+TmSM="; + }; + }; + # internal python packages only consumed by home-assistant itself hass-web-proxy-lib = self.callPackage ./python-modules/hass-web-proxy-lib { }; home-assistant-frontend = self.callPackage ./frontend.nix { }; From 4abaad7d578e837fb5e5d8bb01c897127ff987a5 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 15 Nov 2025 10:16:06 -0500 Subject: [PATCH 101/105] nixos/orca: Fix systemd unit The new systemd unit has `WantedBy=graphical-session.target`, and `ExecStart=orca` needs to be patched to the absolute path. --- nixos/modules/services/accessibility/orca.nix | 1 + pkgs/by-name/or/orca/package.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix index 2ae7c4514edd..f4b65e4d930d 100644 --- a/nixos/modules/services/accessibility/orca.nix +++ b/nixos/modules/services/accessibility/orca.nix @@ -21,6 +21,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; + systemd.user.services.orca.wantedBy = [ "graphical-session.target" ]; services.speechd.enable = true; }; } diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index fcbd6f2fc765..2016bd025d7d 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -104,6 +104,7 @@ python3.pkgs.buildPythonApplication rec { preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + substituteInPlace $out/lib/systemd/user/orca.service --replace-fail ExecStart=orca ExecStart=$out/bin/orca ''; passthru = { From 425e9e3fd454a435b3e172ecac4ebfd2f7268994 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 15 Nov 2025 10:29:50 -0500 Subject: [PATCH 102/105] python3Packages.iminuit: fix meta.changelog, use build-system --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 88f545992b0a..4261c2c24eca 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { hash = "sha256-/7Oust4mxADQr/fit0V/ZM1gmklMRe5Xnv/ugbG8XXg="; }; - nativeBuildInputs = [ + build-system = [ cmake scikit-build-core pybind11 @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/scikit-hep/iminuit"; - changelog = "https://github.com/scikit-hep/iminuit/releases/tag/v{version}"; + changelog = "https://github.com/scikit-hep/iminuit/releases/tag/v${version}"; description = "Python interface for the Minuit2 C++ library"; license = with licenses; [ mit From 429383361806b02d5944228b3203b7d20f7b5788 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Nov 2025 15:29:58 +0000 Subject: [PATCH 103/105] shotwell: 0.32.13 -> 0.32.14 --- pkgs/by-name/sh/shotwell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/shotwell/package.nix b/pkgs/by-name/sh/shotwell/package.nix index b865347be5ff..1839555c19c0 100644 --- a/pkgs/by-name/sh/shotwell/package.nix +++ b/pkgs/by-name/sh/shotwell/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.13"; + version = "0.32.14"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-vdPoT2AuL8frQoQ8kKJes6pJ+y/7de21HbAb0pBdvR4="; + sha256 = "sha256-QbEi9V0kWkto1ocIX9kjmNJfC7ylSDqYsreTK+Tyido="; }; nativeBuildInputs = [ From f90f2fd42e4ad31eda3399c82ffbe16f75cb408a Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sat, 15 Nov 2025 08:34:26 -0700 Subject: [PATCH 104/105] chiaki: Pin to ffmpeg_7 due to avcodec_close Ffmpeg 8 removes avcodec_close which chiaki uses. --- pkgs/by-name/ch/chiaki/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/chiaki/package.nix b/pkgs/by-name/ch/chiaki/package.nix index 76bba18cd7c4..39720c826f2e 100644 --- a/pkgs/by-name/ch/chiaki/package.nix +++ b/pkgs/by-name/ch/chiaki/package.nix @@ -4,7 +4,7 @@ fetchgit, cmake, pkg-config, - ffmpeg, + ffmpeg_7, libopus, SDL2, libevdev, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ - ffmpeg + ffmpeg_7 # needs avcodec_close which was removed in ffmpeg 8 libopus libsForQt5.qtbase libsForQt5.qtmultimedia From 1c181eb2ca578d50e2dc928af61e122e348bc29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 15 Nov 2025 17:23:06 +0100 Subject: [PATCH 105/105] redshift-plasma-applet: grammar nit Co-authored-by: Benjamin Staffin --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1618e5909b7a..dfd87ad72900 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1330,7 +1330,7 @@ mapAliases { redoc-cli = throw "'redoc-cli' been removed because it has been marked as broken since at least November 2024. Consider using 'redocly' instead."; # Added 2025-10-01 redocly-cli = throw "'redocly-cli' has been renamed to/replaced by 'redocly'"; # Converted to throw 2025-10-27 redpanda = throw "'redpanda' has been renamed to/replaced by 'redpanda-client'"; # Converted to throw 2025-10-27 - redshift-plasma-applet = throw "'redshift-plasma-applet' has been removed as it is obsolete and lack maintenance upstream."; # Added 2025-11-09 + redshift-plasma-applet = throw "'redshift-plasma-applet' has been removed as it is obsolete and lacks maintenance upstream."; # Added 2025-11-09 remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11 responsively-app = throw "'responsively-app' has been removed due to lack of maintainance upstream."; # Added 2025-06-25 retroarchBare = throw "'retroarchBare' has been renamed to/replaced by 'retroarch-bare'"; # Converted to throw 2025-10-27