mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
treewide: remove __recurseIntoDerivationForReleaseJobs
This attribute was supposed to be set on derivations, to make the release tools recurse into them. The remaining uses were all on regular attrsets, though, so this is safe to remove.
This commit is contained in:
@@ -21,20 +21,6 @@
|
||||
}:
|
||||
let
|
||||
|
||||
# The intended semantics are that an attrpath rooted at pkgs is
|
||||
# part of the (unfiltered) release jobset iff both of the following
|
||||
# are true:
|
||||
#
|
||||
# 1. The attrpath leads to a value for which lib.isDerivation is true
|
||||
#
|
||||
# 2. Any proper prefix of the attrpath at which lib.isDerivation
|
||||
# is true also has __recurseIntoDerivationForReleaseJobs=true.
|
||||
#
|
||||
# The second condition is unfortunately necessary because there are
|
||||
# Hydra release jobnames which have proper prefixes which are
|
||||
# attrnames of derivations (!). We should probably restructure
|
||||
# the job tree so that this is not the case.
|
||||
#
|
||||
# TODO: Use mapAttrsToListRecursiveCond when this PR lands:
|
||||
# https://github.com/NixOS/nixpkgs/pull/395160
|
||||
justAttrNames =
|
||||
@@ -43,12 +29,7 @@ let
|
||||
result =
|
||||
if path == [ "AAAAAASomeThingsFailToEvaluate" ] || !(lib.isAttrs value) then
|
||||
[ ]
|
||||
else if
|
||||
lib.isDerivation value
|
||||
&&
|
||||
# in some places we have *derivations* with jobsets as subattributes, ugh
|
||||
!(value.__recurseIntoDerivationForReleaseJobs or false)
|
||||
then
|
||||
else if lib.isDerivation value then
|
||||
[ path ]
|
||||
else
|
||||
lib.pipe value [
|
||||
|
||||
@@ -152,9 +152,7 @@ with pkgs;
|
||||
|
||||
php = recurseIntoAttrs (callPackages ./php { });
|
||||
|
||||
pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }) // {
|
||||
__recurseIntoDerivationForReleaseJobs = true;
|
||||
};
|
||||
pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { });
|
||||
|
||||
buildRustCrate = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { });
|
||||
importCargoLock = recurseIntoAttrs (callPackage ../build-support/rust/test/import-cargo-lock { });
|
||||
|
||||
@@ -5177,10 +5177,7 @@ with pkgs;
|
||||
haskell.packages.ghc96
|
||||
else
|
||||
haskell.packages.ghc98
|
||||
)
|
||||
// {
|
||||
__recurseIntoDerivationForReleaseJobs = true;
|
||||
};
|
||||
);
|
||||
|
||||
# haskellPackages.ghc is build->host (it exposes the compiler used to build the
|
||||
# set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more
|
||||
@@ -8868,22 +8865,18 @@ with pkgs;
|
||||
}
|
||||
);
|
||||
|
||||
libsForQt5 =
|
||||
(recurseIntoAttrs (
|
||||
import ./qt5-packages.nix {
|
||||
inherit
|
||||
lib
|
||||
config
|
||||
__splicedPackages
|
||||
makeScopeWithSplicing'
|
||||
generateSplicesForMkScope
|
||||
pkgsHostTarget
|
||||
;
|
||||
}
|
||||
))
|
||||
// {
|
||||
__recurseIntoDerivationForReleaseJobs = true;
|
||||
};
|
||||
libsForQt5 = recurseIntoAttrs (
|
||||
import ./qt5-packages.nix {
|
||||
inherit
|
||||
lib
|
||||
config
|
||||
__splicedPackages
|
||||
makeScopeWithSplicing'
|
||||
generateSplicesForMkScope
|
||||
pkgsHostTarget
|
||||
;
|
||||
}
|
||||
);
|
||||
|
||||
# plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
|
||||
plasma5Packages = libsForQt5;
|
||||
|
||||
@@ -789,7 +789,6 @@ in
|
||||
linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre);
|
||||
|
||||
linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre);
|
||||
__recurseIntoDerivationForReleaseJobs = true;
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
|
||||
|
||||
@@ -22,7 +22,5 @@ let
|
||||
};
|
||||
in
|
||||
lib.recurseIntoAttrs {
|
||||
defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { } // {
|
||||
__recurseIntoDerivationForReleaseJobs = true;
|
||||
};
|
||||
defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { };
|
||||
}
|
||||
|
||||
@@ -36,11 +36,7 @@ let
|
||||
res = builtins.tryEval (
|
||||
if isDerivation value then
|
||||
value.meta.isBuildPythonPackage or [ ]
|
||||
else if
|
||||
value.recurseForDerivations or false
|
||||
|| value.recurseForRelease or false
|
||||
|| value.__recurseIntoDerivationForReleaseJobs or false
|
||||
then
|
||||
else if value.recurseForDerivations or false || value.recurseForRelease or false then
|
||||
packagePython value
|
||||
else
|
||||
[ ]
|
||||
|
||||
@@ -69,11 +69,7 @@ let
|
||||
value.meta.hydraPlatforms
|
||||
or (lib.subtractLists (value.meta.badPlatforms or [ ]) (value.meta.platforms or [ "x86_64-linux" ]))
|
||||
)
|
||||
else if
|
||||
value.recurseForDerivations or false
|
||||
|| value.recurseForRelease or false
|
||||
|| value.__recurseIntoDerivationForReleaseJobs or false
|
||||
then
|
||||
else if value.recurseForDerivations or false || value.recurseForRelease or false then
|
||||
# Recurse
|
||||
packagesWith attrPath cond value
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user