Skip to content

treewide: Dont use obsolete platform aliases#45820

Merged
Ericson2314 merged 2 commits intoNixOS:masterfrom
obsidiansystems:dont-use-obsolete-platform-aliases
Aug 31, 2018
Merged

treewide: Dont use obsolete platform aliases#45820
Ericson2314 merged 2 commits intoNixOS:masterfrom
obsidiansystems:dont-use-obsolete-platform-aliases

Conversation

@Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Aug 30, 2018

Motivation for this change

Should be the less controversial part of #45717. Doesn't formally deprecate anything, but rewrites usages of platform-related things I'd like to deprecate, analogous for #44423 for configureFlags.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@Ericson2314
reewide: Purge all uses stdenv.system and top-level system
2c2f1e3 
It is deprecated and will be removed after 18.09.
@Ericson2314
treewide: Remove usage of remaining redundant platform compatability …
0828e2d 
…stuff

Want to get this out of here for 18.09, so it can be deprecated
thereafter.
@Ericson2314 Ericson2314 added the 6.topic: portability General portability concerns, not specific to cross-compilation or a specific platform label Aug 30, 2018
@Ericson2314 Ericson2314 added this to the 18.09 milestone Aug 30, 2018
@Ericson2314 Ericson2314 mentioned this pull request Aug 30, 2018
Closed
9 tasks
@GrahamcOfBorg GrahamcOfBorg added 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: vim Advanced text editor 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Aug 30, 2018
@GrahamcOfBorg GrahamcOfBorg added the 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. label Aug 30, 2018
FRidh
FRidh approved these changes Aug 31, 2018
View reviewed changes
Copy link
Member

@FRidh FRidh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a pity always having to add something like hostPlatform when you don't know/use/care about cross-compilation, but I think it is a small cost for having such feature.

@Ericson2314 Ericson2314 merged commit 2c4a75e into NixOS:master Aug 31, 2018
@Ericson2314 Ericson2314 deleted the dont-use-obsolete-platform-aliases branch August 31, 2018 13:56
@Ericson2314
Copy link
Member Author

Ericson2314 commented Aug 31, 2018 •
edited
Loading

@FRidh yeah I'm going to try to make most of these ones be stdenv.is* over time.

@dezgeg
Copy link
Contributor

dezgeg commented Aug 31, 2018

I definitely agree in having stdenv.fooPlatform is better in place of a top-level fooPlatform reference. The reason being that say, a package foo having:

{ stdenv, hostPlatform, /* whatever */ } :
stdenv.mkDerivation {
   /* whatever that uses hostPlatform */
}

suggests that one might be able to use .override like this:

# WRONG CODE!
foo.override { hostPlatform = /* whatever */; }

But as far as I know the result of that wouldn't do the right thing. (stdenv would still have an unchanged hostPlatform).

@dezgeg
Copy link
Contributor

dezgeg commented Aug 31, 2018

But for the rest... I agree with this:

It's a pity always having to add something like hostPlatform when you don't know/use/care about cross-compilation,

Thus I would prefer things in this order: stdenv.isFoo > stdenv.system == "foo-bar" > stdenv.hostPlatform.system == "foo-bar".

@Ericson2314
Copy link
Member Author

Ericson2314 commented Aug 31, 2018

I'd counter that inspecting system at all is a pretty low-level operation, so full explicitness is warranted.

@dezgeg
Copy link
Contributor

dezgeg commented Aug 31, 2018

No, sometimes you really need an specific platform to choose from (for instance, when downloading for some prebuilt binaries for different architectures).

luigy added a commit to obsidiansystems/nixpkgs that referenced this pull request Sep 1, 2018
@luigy
androidndk: fix eval
c759f7a 
fixup from NixOS#45820

/cc @Ericson2314
@luigy luigy mentioned this pull request Sep 1, 2018
Merged
9 tasks
@vcunat
Copy link
Member

vcunat commented Sep 3, 2018

Yes, this breaks stuff. Have you noticed the windows builds on Hydra? Before:

$ nix eval -f pkgs/top-level/release-cross.nix crossMingw32.boehmgc.x86_64-linux.system
"x86_64-linux"

After:

$ nix eval -f pkgs/top-level/release-cross.nix crossMingw32.boehmgc.x86_64-linux.system
"i686-windows"

@vcunat
Copy link
Member

vcunat commented Sep 3, 2018

I also wonder why Borg detected some aarch64 rebuilds.

@vcunat vcunat mentioned this pull request Sep 3, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@basvandijk basvandijk Awaiting requested review from basvandijk

@edwtjo edwtjo Awaiting requested review from edwtjo

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92

@peti peti Awaiting requested review from peti

@ryantm ryantm Awaiting requested review from ryantm

@rycee rycee Awaiting requested review from rycee

@zimbatm zimbatm Awaiting requested review from zimbatm

@dezgeg dezgeg Awaiting requested review from dezgeg

@vcunat vcunat Awaiting requested review from vcunat

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

1 more reviewer

@FRidh FRidh FRidh approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: portability General portability concerns, not specific to cross-compilation or a specific platform 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: vim Advanced text editor 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

18.09

Development

Successfully merging this pull request may close these issues.

7 participants

@Ericson2314 @dezgeg @vcunat @matthewbauer @Mic92 @FRidh @GrahamcOfBorg