diff options
| author | Artturin <Artturin@artturin.com> | 2023-01-08 23:18:53 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-01-09 05:24:56 +0200 |
| commit | ecab3edeb79a5257974d24acd04e5c9b3c245e6c (patch) | |
| tree | 6e1a8cc693f2faa85d5e9c9f7569a78b10d15331 | |
| parent | a518c77148585023ff56022f09c4b2c418a51ef5 (diff) | |
| download | nixpkgs-ecab3edeb79a5257974d24acd04e5c9b3c245e6c.tar nixpkgs-ecab3edeb79a5257974d24acd04e5c9b3c245e6c.tar.gz nixpkgs-ecab3edeb79a5257974d24acd04e5c9b3c245e6c.tar.bz2 nixpkgs-ecab3edeb79a5257974d24acd04e5c9b3c245e6c.tar.lz nixpkgs-ecab3edeb79a5257974d24acd04e5c9b3c245e6c.tar.xz nixpkgs-ecab3edeb79a5257974d24acd04e5c9b3c245e6c.tar.zst nixpkgs-ecab3edeb79a5257974d24acd04e5c9b3c245e6c.zip | |
top-level: move top-level {build,host,target}Platform to aliases
deprecation was attempted in e51f736076548459f36a1250de4bf6867f880b66 but had to be reverted in 2a6e4ae49a891adc7c0562fda08b17d60beb1b4f
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/stage.nix | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6e7595ea656..4d7a9e3a0d8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1764,6 +1764,7 @@ mapAliases ({ zyn-fusion = zynaddsubfx; # Added 2022-08-05 inherit (stdenv.hostPlatform) system; # Added 2021-10-22 + inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 3669b622e71..e5412c409ed 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -138,14 +138,6 @@ let inherit stdenv; }; - # The old identifiers for cross-compiling. These should eventually be removed, - # and the packages that rely on them refactored accordingly. - platformCompat = self: super: let - inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; - in { - inherit buildPlatform hostPlatform targetPlatform; - }; - splice = self: super: import ./splice.nix lib self (adjacentPackages != null); allPackages = self: super: @@ -282,7 +274,6 @@ let # previous bootstrapping phases which have already been overlayed. toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([ stdenvBootstappingAndPlatforms - platformCompat stdenvAdapters trivialBuilders splice |