diff options
| author | Artturin <Artturin@artturin.com> | 2023-06-22 20:30:29 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-06-22 23:11:08 +0300 |
| commit | ec7d5c518c3627d9e33b94a79e81d20dadd87510 (patch) | |
| tree | b485cfa640b63dd3a52dd25f3e599aa8a2eb38c3 | |
| parent | d88b362808ae6b84e28618feebb36eae03230980 (diff) | |
| download | nixpkgs-ec7d5c518c3627d9e33b94a79e81d20dadd87510.tar nixpkgs-ec7d5c518c3627d9e33b94a79e81d20dadd87510.tar.gz nixpkgs-ec7d5c518c3627d9e33b94a79e81d20dadd87510.tar.bz2 nixpkgs-ec7d5c518c3627d9e33b94a79e81d20dadd87510.tar.lz nixpkgs-ec7d5c518c3627d9e33b94a79e81d20dadd87510.tar.xz nixpkgs-ec7d5c518c3627d9e33b94a79e81d20dadd87510.tar.zst nixpkgs-ec7d5c518c3627d9e33b94a79e81d20dadd87510.zip | |
splice.nix: finish nativeDrv,crossDrv removal
| -rw-r--r-- | lib/customisation.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/splice.nix | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index fe32e890f35..a9281b1ab69 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -46,12 +46,6 @@ rec { // (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) { __spliced = {} // (lib.mapAttrs (_: sDrv: overrideDerivation sDrv f) drv.__spliced); }); diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index ce536aa1fd2..0a138947e8d 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -45,9 +45,6 @@ let valueHostTarget = pkgsHostTarget.${name} or { }; valueTargetTarget = pkgsTargetTarget.${name} or { }; 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 = (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; }) |