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.

Sign up for GitHub

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

Jump to bottom

Backport "Remove default value for nixpkgs.system" to release-19.03 #66273

Merged
merged 1 commit into from Aug 7, 2019
Merged

Backport "Remove default value for nixpkgs.system" to release-19.03 #66273

merged 1 commit into from Aug 7, 2019

Conversation

basvandijk
Copy link
Member

@edolstra, @samueldr, @sphalerite this backports 7eb332a to release-19.03.

Without this, building a custom installation ISO image on MacOS results in a different derivation than when it's build on my Linux-based Hydra. Even when I set the system parameter of <nixpkgs> to "x86_64-linux".

This is happening because the nixpkgs.system NixOS option has the default builtins.currentSystem which means that the generated manual has the string "x86_64-darwin" on my system but "x86_64-linux" on Hydra.

This prevents getting the image from my nix cache.

Backporting this should be save because nixpkgs.system is set to a default anyway in /nixos/lib/eval-config.nix.

Motivation for this change
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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@edolstra @basvandijk
Remove default value for nixpkgs.system
7c37596 
Using "builtins.currentSystem" doesn't work in pure evaluation mode,
and even when it's explicitly set (which it always is, in
nixos/lib/eval-config.nix), it breaks manual generation because the
manual tries to render the default value.

(cherry picked from commit 7eb332a)
@grahamc grahamc requested a review from lheckemann August 7, 2019 13:42
@edolstra edolstra merged commit f8096b2 into NixOS:release-19.03 Aug 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lheckemann lheckemann lheckemann approved these changes

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

@samueldr samueldr Awaiting requested review from samueldr

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@basvandijk @lheckemann @edolstra