public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "top-level: Deprecate top-level {build,host,target}Platform"

Browse Source 
This reverts commit e51f736076.
This commit is contained in:
Sarah Brofeldt
2018-09-11 13:25:50 +02:00
parent e02575b906
commit 2a6e4ae49a
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/stage.nix
+5 -11
View File
@@ -79,17 +79,11 @@ let
# The old identifiers for cross-compiling. These should eventually be removed,
# and the packages that rely on them refactored accordingly.
platformCompat = self: super: {
buildPlatform = lib.warn
"top-level `buildPlatform` is deprecated since 18.09. Please use `stdenv.buildPlatform`."
super.stdenv.buildPlatform;
hostPlatform = lib.warn
"top-level `hostPlatform` is deprecated since 18.09. Please use `stdenv.hostPlatform`."
super.stdenv.hostPlatform;
targetPlatform = lib.warn
"top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`."
super.stdenv.targetPlatform;
inherit (super.stdenv.hostPlatform) system;
platformCompat = self: super: let
inherit (super.stdenv) buildPlatform hostPlatform targetPlatform;
in {
inherit buildPlatform hostPlatform targetPlatform;
inherit (buildPlatform) system;
};
splice = self: super: import ./splice.nix lib self (buildPackages != null);