Commit ecab3ede authored by Artturin's avatar Artturin
Browse files

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

deprecation was attempted in e51f7360

but had to be reverted in 2a6e4ae4
parent a518c771

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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 {

pkgs/top-level/stage.nix

+0 −9
Original line number Diff line number Diff line
@@ -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