cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

top-level: move top-level {build,host,target}Platform to aliases

Browse source 
deprecation was attempted in e51f736076

but had to be reverted in 2a6e4ae49a
This commit is contained in:
Artturin 2023-01-08 23:18:53 +02:00
parent a518c77148
commit ecab3edeb7
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/top-level/aliases.nix
View file

@ -1764,6 +1764,7 @@ mapAliases ({
zyn-fusion = zynaddsubfx; # Added 2022-08-05 zyn-fusion = zynaddsubfx; # Added 2022-08-05
inherit (stdenv.hostPlatform) system; # Added 2021-10-22 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: # LLVM packages for (integration) testing that should not be used inside Nixpkgs:
llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git {

9
pkgs/top-level/stage.nix
View file

@ -138,14 +138,6 @@ let
inherit stdenv; 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); splice = self: super: import ./splice.nix lib self (adjacentPackages != null);
allPackages = self: super: allPackages = self: super:
@ -282,7 +274,6 @@ let
# previous bootstrapping phases which have already been overlayed. # previous bootstrapping phases which have already been overlayed.
toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([ toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([
stdenvBootstappingAndPlatforms stdenvBootstappingAndPlatforms
platformCompat
stdenvAdapters stdenvAdapters
trivialBuilders trivialBuilders
splice splice