movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

splice.nix: finish nativeDrv,crossDrv removal

Browse source
This commit is contained in:
Artturin 2023-06-22 20:30:29 +03:00
parent d88b362808
commit ec7d5c518c
2 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/customisation.nix
View file

@ -46,12 +46,6 @@ rec {
// //
(drv.passthru or {}) (drv.passthru or {})
// //
# TODO(@Artturin): remove before release 23.05 and only have __spliced.
(lib.optionalAttrs (drv ? crossDrv && drv ? nativeDrv) {
crossDrv = overrideDerivation drv.crossDrv f;
nativeDrv = overrideDerivation drv.nativeDrv f;
})
//
lib.optionalAttrs (drv ? __spliced) { lib.optionalAttrs (drv ? __spliced) {
__spliced = {} // (lib.mapAttrs (_: sDrv: overrideDerivation sDrv f) drv.__spliced); __spliced = {} // (lib.mapAttrs (_: sDrv: overrideDerivation sDrv f) drv.__spliced);
}); });

3
pkgs/top-level/splice.nix
View file

@ -45,9 +45,6 @@ let
valueHostTarget = pkgsHostTarget.${name} or { }; valueHostTarget = pkgsHostTarget.${name} or { };
valueTargetTarget = pkgsTargetTarget.${name} or { }; valueTargetTarget = pkgsTargetTarget.${name} or { };
augmentedValue = defaultValue augmentedValue = defaultValue
# TODO(@Artturin): remove before release 23.05 and only have __spliced.
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = lib.warn "use ${name}.__spliced.buildHost instead of ${name}.nativeDrv" valueBuildHost; })
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = lib.warn "use ${name}.__spliced.hostTarget instead of ${name}.crossDrv" valueHostTarget; })
// { // {
__spliced = __spliced =
(lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; }) (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })