Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: Deprecate platform aliases #45717

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkgs/stdenv/generic/default.nix
Original file line number Diff line number Diff line change
@@ -127,8 +127,9 @@ let
"`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead"
hostPlatform.isAarch32;

# The derivation's `system` is `buildPlatform.system`.
inherit (buildPlatform) system;
system = builtins.trace
("`stdenv.system` is deprecated since 18.09. Please use `stdenv.hostPlatform.system`.")
hostPlatform.system;

# Whether we should run paxctl to pax-mark binaries.
needsPax = isLinux;
4 changes: 3 additions & 1 deletion pkgs/top-level/stage.nix
Original file line number Diff line number Diff line change
@@ -89,7 +89,9 @@ let
targetPlatform = lib.warn
"top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`."
super.stdenv.targetPlatform;
inherit (super.stdenv.hostPlatform) system;
system = lib.warn
("top-level `system` is deprecated since 18.09. Please use `stdenv.system` or `stdenv.hostPlatform.system`.")
super.stdenv.hostPlatform.system;
};

splice = self: super: import ./splice.nix lib self (buildPackages != null);