From de664dde49fd94f3c0297f466217b3d4b469d4d9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 28 Sep 2025 10:48:01 +0200 Subject: [PATCH 1/4] freebsd.libspl: fix meta attr --- pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix index f8b4859a68eb..0aed42cbaa40 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix @@ -18,7 +18,7 @@ mkDerivation { alwaysKeepStatic = true; meta = with lib; { - platform = platforms.freebsd; + platforms = platforms.freebsd; license = licenses.cddl; }; } From 4e01dacc84cf329d9ac7ff5210c6b81eb21df1e0 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 28 Sep 2025 10:49:55 +0200 Subject: [PATCH 2/4] rxvt-unicode: filter plugins for derivations --- pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index eec7b86883eb..a161e9544265 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -16,7 +16,7 @@ }: let - availablePlugins = rxvt-unicode-plugins; + availablePlugins = lib.filterAttrs (_: v: lib.isDerivation v) rxvt-unicode-plugins; # Transform the string "self" to the plugin itself. # It's needed for plugins like bidi who depends on the perl From 972730affd94d7ef96ba367a9ec4a37a47462ff7 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 28 Sep 2025 10:53:35 +0200 Subject: [PATCH 3/4] tests.buildRustCrate.test: filter tests for derivations --- pkgs/build-support/rust/build-rust-crate/test/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 208714152c56..c56f153b487e 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -917,6 +917,6 @@ rec { description = "Test cases for buildRustCrate"; maintainers = [ ]; }; - constituents = builtins.attrValues tests; + constituents = builtins.attrValues (lib.filterAttrs (_: v: lib.isDerivation v) tests); }; } From ca0f1b7b98bfa1fb5d9e917a2082c0e5bd0690b5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 28 Sep 2025 10:55:46 +0200 Subject: [PATCH 4/4] various: eval more package sets --- pkgs/applications/editors/eclipse/default.nix | 2 +- .../rust/build-rust-crate/test/default.nix | 5 +- pkgs/data/json-schema/default.nix | 2 +- pkgs/data/misc/nixos-artwork/default.nix | 4 +- pkgs/top-level/all-packages.nix | 56 ++++++++++--------- pkgs/top-level/java-packages.nix | 5 +- 6 files changed, 39 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 1af06cdb0ba8..c43d9cb3179d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -148,6 +148,6 @@ generatedEclipses ### Plugins - plugins = callPackage ./plugins.nix { }; + plugins = lib.recurseIntoAttrs (callPackage ./plugins.nix { }); } diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index c56f153b487e..50e045921387 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -228,7 +228,7 @@ let in rec { - tests = + tests = lib.recurseIntoAttrs ( let cases = rec { libPath = { @@ -910,7 +910,8 @@ rec { test -x '${pkg}/bin/rcgen' && touch $out '' ); - }; + } + ); test = releaseTools.aggregate { name = "buildRustCrate-tests"; meta = { diff --git a/pkgs/data/json-schema/default.nix b/pkgs/data/json-schema/default.nix index f12bab479074..5033e5b1f71b 100644 --- a/pkgs/data/json-schema/default.nix +++ b/pkgs/data/json-schema/default.nix @@ -24,5 +24,5 @@ let in { # Exported to `pkgs` - inherit jsonSchemaCatalogs; + jsonSchemaCatalogs = lib.recurseIntoAttrs jsonSchemaCatalogs; } diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix index 4814232fbfe7..180cc89b8dd7 100644 --- a/pkgs/data/misc/nixos-artwork/default.nix +++ b/pkgs/data/misc/nixos-artwork/default.nix @@ -1,5 +1,5 @@ -{ callPackage }: +{ callPackage, lib }: { - wallpapers = callPackage ./wallpapers.nix { }; + wallpapers = lib.recurseIntoAttrs (callPackage ./wallpapers.nix { }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abeaa1582649..40b7ffbcc588 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1459,9 +1459,11 @@ with pkgs; rxvt-unicode-unwrapped = rxvt-unicode-unwrapped-emoji; }; - rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { - inherit callPackage; - }; + rxvt-unicode-plugins = recurseIntoAttrs ( + import ../applications/terminal-emulators/rxvt-unicode-plugins { + inherit callPackage; + } + ); rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; @@ -1616,7 +1618,7 @@ with pkgs; withDriver = false; }; - fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; + fedora-backgrounds = recurseIntoAttrs (callPackage ../data/misc/fedora-backgrounds { }); coconut = with python312Packages; toPythonApplication coconut; @@ -2449,7 +2451,7 @@ with pkgs; libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { }; - skkDictionaries = callPackages ../tools/inputmethods/skk/skk-dicts { }; + skkDictionaries = recurseIntoAttrs (callPackages ../tools/inputmethods/skk/skk-dicts { }); ibus = callPackage ../tools/inputmethods/ibus { }; @@ -3299,7 +3301,7 @@ with pkgs; buildNpmPackage = callPackage ../build-support/node/build-npm-package { }; - npmHooks = callPackage ../build-support/node/build-npm-package/hooks { }; + npmHooks = recurseIntoAttrs (callPackage ../build-support/node/build-npm-package/hooks { }); inherit (callPackages ../build-support/node/fetch-npm-deps { }) fetchNpmDeps @@ -5822,7 +5824,7 @@ with pkgs; enableQt = true; }; - octave-kernel = callPackage ../applications/editors/jupyter-kernels/octave { }; + octave-kernel = recurseIntoAttrs (callPackage ../applications/editors/jupyter-kernels/octave { }); octavePackages = recurseIntoAttrs octave.pkgs; @@ -5830,8 +5832,8 @@ with pkgs; # # Set default PHP interpreter, extensions and packages php = php84; - phpExtensions = php.extensions; - phpPackages = php.packages; + phpExtensions = recurseIntoAttrs php.extensions; + phpPackages = recurseIntoAttrs php.packages; # Import PHP84 interpreter, extensions and packages php84 = callPackage ../development/interpreters/php/8.4.nix { @@ -8206,7 +8208,9 @@ with pkgs; nv-codec-headers-11 = nv-codec-headers.override { majorVersion = "11"; }; nv-codec-headers-12 = nv-codec-headers.override { majorVersion = "12"; }; - nvidiaCtkPackages = callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix { }; + nvidiaCtkPackages = recurseIntoAttrs ( + callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix { } + ); inherit (nvidiaCtkPackages) nvidia-docker ; @@ -9323,7 +9327,7 @@ with pkgs; icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { }; icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { }; icingaweb2 = callPackage ../servers/icingaweb2 { }; - icingaweb2Modules = { + icingaweb2Modules = recurseIntoAttrs { theme-april = callPackage ../servers/icingaweb2/theme-april { }; theme-lsd = callPackage ../servers/icingaweb2/theme-lsd { }; theme-particles = callPackage ../servers/icingaweb2/theme-particles { }; @@ -9976,7 +9980,7 @@ with pkgs; elegant-sddm = libsForQt5.callPackage ../data/themes/elegant-sddm { }; - error-inject = callPackages ../os-specific/linux/error-inject { }; + error-inject = recurseIntoAttrs (callPackages ../os-specific/linux/error-inject { }); ffado = callPackage ../os-specific/linux/ffado { }; ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; }; @@ -10678,9 +10682,9 @@ with pkgs; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { }; - tex-gyre = callPackages ../data/fonts/tex-gyre { }; + tex-gyre = recurseIntoAttrs (callPackages ../data/fonts/tex-gyre { }); - tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; + tex-gyre-math = recurseIntoAttrs (callPackages ../data/fonts/tex-gyre-math { }); xkeyboard_config = xkeyboard-config; @@ -10893,7 +10897,7 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - deadbeefPlugins = { + deadbeefPlugins = recurseIntoAttrs { headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; @@ -11791,13 +11795,11 @@ with pkgs; moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; - mopidyPackages = - (callPackages ../applications/audio/mopidy { + mopidyPackages = recurseIntoAttrs ( + callPackages ../applications/audio/mopidy { python = python3; - }) - // { - __attrsFailEvaluation = true; - }; + } + ); inherit (mopidyPackages) mopidy @@ -12338,7 +12340,7 @@ with pkgs; cura = libsForQt5.callPackage ../applications/misc/cura { }; - curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; + curaPlugins = recurseIntoAttrs (callPackage ../applications/misc/cura/plugins.nix { }); prusa-slicer = callPackage ../applications/misc/prusa-slicer { # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory @@ -12828,7 +12830,7 @@ with pkgs; xwaylandSupport = false; }; - inherit (windowmaker) dockapps; + dockapps = recurseIntoAttrs windowmaker.dockapps; wofi-pass = callPackage ../../pkgs/tools/security/pass/wofi-pass.nix { }; @@ -12936,7 +12938,7 @@ with pkgs; youtube-viewer = perlPackages.WWWYoutubeViewer; - zathuraPkgs = callPackage ../applications/misc/zathura { }; + zathuraPkgs = recurseIntoAttrs (callPackage ../applications/misc/zathura { }); zathura = zathuraPkgs.zathuraWrapper; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; @@ -14187,7 +14189,7 @@ with pkgs; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { }; - openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; + openlilylib-fonts = recurseIntoAttrs (callPackage ../misc/lilypond/fonts.nix { }); nixDependencies = recurseIntoAttrs ( callPackage ../tools/package-management/nix/dependencies-scope.nix { } @@ -14364,7 +14366,7 @@ with pkgs; nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { }; - nixos-artwork = callPackage ../data/misc/nixos-artwork { }; + nixos-artwork = recurseIntoAttrs (callPackage ../data/misc/nixos-artwork { }); nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { }; @@ -14563,7 +14565,7 @@ with pkgs; buildDartApplication = callPackage ../build-support/dart/build-dart-application { }; - dartHooks = callPackage ../build-support/dart/build-dart-application/hooks { }; + dartHooks = recurseIntoAttrs (callPackage ../build-support/dart/build-dart-application/hooks { }); httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index fd91ab54cda7..c5f7ebd013fa 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -5,7 +5,7 @@ with pkgs; { inherit (pkgs) openjfx17 openjfx21 openjfx23; - compiler = + compiler = lib.recurseIntoAttrs ( let # merge meta.platforms of both packages so that dependent packages and hydra build them mergeMetaPlatforms = @@ -79,7 +79,8 @@ with pkgs; in lib.mapAttrs (name: drv: mkLinuxDarwin drv semeruDarwin.${name}) semeruLinux ); - }; + } + ); } // lib.optionalAttrs config.allowAliases { jogl_2_4_0 = throw "'jogl_2_4_0' is renamed to/replaced by 'jogl'";